From 79de6d708229073c11afe7e80f1b8bef61f4e600 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Wed, 27 Dec 2017 20:17:25 +0100
Subject: [PATCH 001/102] Introduced EditArrowViewModel and ArrowDAO

---
 .idea/misc.xml                                |   8 +-
 app/build.gradle                              |   3 +
 .../features/main/MainActivityTest.kt         |   4 +-
 .../features/arrows/ArrowListFragment.kt      |   3 +-
 .../features/arrows/EditArrowFragment.kt      | 108 ++++---------
 .../features/arrows/EditArrowListFragment.kt  |   3 +-
 .../features/arrows/EditArrowViewModel.kt     | 144 ++++++++++++++++++
 .../features/statistics/ArrowStatistic.kt     |   4 +-
 .../features/statistics/StatisticsActivity.kt |   8 +-
 .../dreier/mytargets/utils/BundleUtils.java   |  30 ++++
 .../mytargets/utils/DataBindingAdapters.kt    |   8 +
 .../databinding/SpinnerBindingAdapters.kt     |  52 +++++++
 .../mytargets/views/selector/ArrowSelector.kt |   8 +-
 .../main/res/layout/fragment_edit_arrow.xml   |  30 ++--
 dependencies.gradle                           |   4 +
 .../mytargets/shared/models/dao/ArrowDAO.kt   |  56 +++++++
 .../mytargets/shared/models/db/Arrow.kt       |  75 ++++-----
 17 files changed, 388 insertions(+), 160 deletions(-)
 create mode 100644 app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
 create mode 100644 app/src/main/java/de/dreier/mytargets/utils/BundleUtils.java
 create mode 100644 app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/shared/models/dao/ArrowDAO.kt

diff --git a/.idea/misc.xml b/.idea/misc.xml
index bdf11315a..6423996f9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,9 +4,11 @@
     <option name="CORE_LIBRARY" value="true" />
   </component>
   <component name="EntryPointsManager">
-    <list size="2">
-      <item index="0" class="java.lang.String" itemvalue="butterknife.OnClick" />
-      <item index="1" class="java.lang.String" itemvalue="butterknife.OnTextChanged" />
+    <list size="4">
+      <item index="0" class="java.lang.String" itemvalue="android.databinding.BindingAdapter" />
+      <item index="1" class="java.lang.String" itemvalue="android.databinding.InverseBindingAdapter" />
+      <item index="2" class="java.lang.String" itemvalue="butterknife.OnClick" />
+      <item index="3" class="java.lang.String" itemvalue="butterknife.OnTextChanged" />
     </list>
   </component>
   <component name="NullableNotNullManager">
diff --git a/app/build.gradle b/app/build.gradle
index a5a5e2ec6..880248496 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -188,6 +188,9 @@ dependencies {
 
     implementation dependencies.signaturePad
 
+    implementation dependencies.archLifecycleExtensions
+    kapt dependencies.archLifecycleCompiler
+
     implementation project(':shared')
     wearApp project(':wearable')
 
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
index 14ba995a5..5c4ea4e4e 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
@@ -46,7 +46,7 @@ import de.dreier.mytargets.features.training.edit.EditTrainingFragment
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.EBowType
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.shared.models.db.Arrow
+import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.targets.models.WAFull
@@ -193,7 +193,7 @@ class MainActivityTest : UITestBase() {
         // openArrow
         onView(withRecyclerView(R.id.recyclerView).atPosition(0))
                 .perform(click())
-        val firstArrow = Arrow.all.sorted().firstOrNull()
+        val firstArrow = ArrowDAO.loadArrows().sorted().firstOrNull()
         intended(allOf(hasClass(EditArrowActivity::class.java),
                 hasExtra<Long>(EditArrowFragment.ARROW_ID, firstArrow!!.id)))
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
index 32db81d1f..4f42affd1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
@@ -19,12 +19,13 @@ import android.os.Bundle
 import de.dreier.mytargets.base.activities.ItemSelectActivity.Companion.ITEM
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.base.fragments.SelectPureListItemFragmentBase
+import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 
 class ArrowListFragment : SelectPureListItemFragmentBase<Arrow>() {
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        val arrows = Arrow.all
+        val arrows = ArrowDAO.loadArrows()
         return {
             adapter!!.setList(arrows.toMutableList())
             val arrow = arguments!!.getParcelable<Arrow>(ITEM)
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
index 824b7b605..48351a2ee 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
@@ -15,115 +15,59 @@
 
 package de.dreier.mytargets.features.arrows
 
+import android.arch.lifecycle.Observer
+import android.arch.lifecycle.ViewModelProviders
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.evernote.android.state.State
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.fragments.EditWithImageFragmentBase
 import de.dreier.mytargets.databinding.FragmentEditArrowBinding
-import de.dreier.mytargets.shared.models.Dimension
-import de.dreier.mytargets.shared.models.Dimension.Unit.INCH
-import de.dreier.mytargets.shared.models.Dimension.Unit.MILLIMETER
-import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.shared.models.db.ArrowImage
+import de.dreier.mytargets.utils.BundleUtils
 import de.dreier.mytargets.utils.ToolbarUtils
-import java.lang.Integer.parseInt
 
 class EditArrowFragment : EditWithImageFragmentBase<ArrowImage>(R.drawable.arrows) {
-    @State
-    lateinit var arrow: Arrow
+
     private lateinit var contentBinding: FragmentEditArrowBinding
+    private lateinit var viewModel: EditArrowViewModel
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val rootView = super.onCreateView(inflater, container, savedInstanceState)
         contentBinding = FragmentEditArrowBinding.inflate(inflater, binding.content, true)
         contentBinding.moreFields.setOnClickListener { contentBinding.showAll = true }
-
-        if (savedInstanceState == null) {
-            val bundle = arguments
-            if (bundle != null && bundle.containsKey(ARROW_ID)) {
-                arrow = Arrow[bundle.getLong(ARROW_ID)]!!
-            } else {
-                // Set to default values
-                arrow = Arrow()
-                arrow.name = getString(R.string.my_arrow)
-            }
-
-            imageFiles = arrow.loadImages()
-            contentBinding.diameterUnit.setSelection(
-                    if (arrow.diameter.unit === MILLIMETER) 0 else 1)
-        }
-        ToolbarUtils.setTitle(this, arrow.name)
-        contentBinding.arrow = arrow
-        contentBinding.showAll = false
-        loadImage(imageFile)
         return rootView
     }
 
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        viewModel = ViewModelProviders.of(this).get(EditArrowViewModel::class.java)
+        viewModel.setArrowId(BundleUtils.getLongOrNull(arguments, ARROW_ID))
+        contentBinding.arrow = viewModel
+        viewModel.arrow.observe(this, Observer { arrow ->
+            if (arrow == null) {
+                return@Observer
+            }
+            ToolbarUtils.setTitle(this@EditArrowFragment, arrow.name)
+        })
+        viewModel.images.observe(this, Observer { images ->
+            if (images != null) {
+                imageFiles = images
+                loadImage(imageFile)
+            }
+        })
+    }
+    
     override fun wrapImage(imageFile: String): List<ArrowImage> {
         return listOf(ArrowImage(fileName = imageFile))
     }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        arrow = buildArrow()
-        super.onSaveInstanceState(outState)
-    }
-
     public override fun onSave() {
         super.onSave()
-        if (!validateInput()) {
-            return
+        if (viewModel.save(thumbnail)) {
+            finish()
         }
-        buildArrow().save()
-        finish()
-    }
-
-    private fun validateInput(): Boolean {
-        val diameterValue: Float
-        try {
-            diameterValue = java.lang.Float.parseFloat(contentBinding.diameter.text.toString())
-        } catch (ignored: NumberFormatException) {
-            contentBinding.diameterTextInputLayout.error = getString(R.string.invalid_decimal_number)
-            return false
-        }
-
-        val selectedUnit = contentBinding.diameterUnit.selectedItemPosition
-        val diameterUnit = if (selectedUnit == 0) MILLIMETER else INCH
-        if (diameterUnit === MILLIMETER) {
-            if (diameterValue < 1 || diameterValue > 20) {
-                contentBinding.diameterTextInputLayout.error = getString(R.string.not_within_expected_range_mm)
-                return false
-            }
-        } else {
-            if (diameterValue < 0 || diameterValue > 1) {
-                contentBinding.diameterTextInputLayout.error = getString(R.string.not_within_expected_range_inch)
-                return false
-            }
-        }
-        contentBinding.diameterTextInputLayout.error = null
-        return true
-    }
-
-    private fun buildArrow(): Arrow {
-        arrow.name = contentBinding.name.text.toString()
-        arrow.maxArrowNumber = parseInt(contentBinding.maxArrowNumber.text.toString())
-        arrow.length = contentBinding.length.text.toString()
-        arrow.material = contentBinding.material.text.toString()
-        arrow.spine = contentBinding.spine.text.toString()
-        arrow.weight = contentBinding.weight.text.toString()
-        arrow.tipWeight = contentBinding.tipWeight.text.toString()
-        arrow.vanes = contentBinding.vanes.text.toString()
-        arrow.nock = contentBinding.nock.text.toString()
-        arrow.comment = contentBinding.comment.text.toString()
-        arrow.images = imageFiles
-        arrow.thumbnail = thumbnail
-        val diameterValue = contentBinding.diameter.text.toString().toFloatOrNull() ?: 5f
-        val selectedUnit = contentBinding.diameterUnit.selectedItemPosition
-        val diameterUnit = if (selectedUnit == 0) MILLIMETER else INCH
-        arrow.diameter = Dimension(diameterValue, diameterUnit)
-        return arrow
     }
 
     companion object {
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
index 9e27fe214..492b96293 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
@@ -28,6 +28,7 @@ import de.dreier.mytargets.base.fragments.ItemActionModeCallback
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.databinding.FragmentArrowsBinding
 import de.dreier.mytargets.databinding.ItemImageDetailsBinding
+import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.utils.DividerItemDecoration
 import de.dreier.mytargets.utils.SlideInItemAnimator
@@ -66,7 +67,7 @@ class EditArrowListFragment : EditableListFragment<Arrow>() {
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        val arrows = Arrow.all
+        val arrows = ArrowDAO.loadArrows()
         return {
             adapter!!.setList(arrows.toMutableList())
             binding.emptyState!!.root.visibility = if (arrows.isEmpty()) View.VISIBLE else View.GONE
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
new file mode 100644
index 000000000..364e5b43d
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2017 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.features.arrows
+
+import android.arch.lifecycle.AndroidViewModel
+import android.arch.lifecycle.LiveData
+import android.arch.lifecycle.MutableLiveData
+import android.arch.lifecycle.Transformations
+import android.databinding.ObservableField
+import android.databinding.ObservableFloat
+import android.databinding.ObservableInt
+import android.text.TextUtils
+import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
+import de.dreier.mytargets.shared.models.Dimension
+import de.dreier.mytargets.shared.models.Dimension.Unit.MILLIMETER
+import de.dreier.mytargets.shared.models.Thumbnail
+import de.dreier.mytargets.shared.models.dao.ArrowDAO
+import de.dreier.mytargets.shared.models.db.Arrow
+import de.dreier.mytargets.shared.models.db.ArrowImage
+
+
+class EditArrowViewModel(app: ApplicationInstance) : AndroidViewModel(app) {
+    val arrowId = MutableLiveData<Long?>()
+
+    val arrow: LiveData<Arrow?>
+    var images: LiveData<List<ArrowImage>>
+
+    var name = ObservableField<String>(getApplication<ApplicationInstance>().getString(R.string.my_arrow))
+    var maxArrowNumber = ObservableInt(12)
+    var length = ObservableField<String>("")
+    var material = ObservableField<String>("")
+    var spine = ObservableField<String>("")
+    var weight = ObservableField<String>("")
+    var tipWeight = ObservableField<String>("")
+    var vanes = ObservableField<String>("")
+    var nock = ObservableField<String>("")
+    var comment = ObservableField<String>("")
+    var diameterValue = ObservableFloat(5f)
+    var diameterUnit = ObservableField<Dimension.Unit>(MILLIMETER)
+
+    var diameterErrorText = ObservableField<String>("")
+
+    private val arrowDAO = ArrowDAO
+
+    init {
+        arrow = Transformations.map(arrowId) { id ->
+            if (id == null) {
+                null
+            } else {
+                val arrow = arrowDAO.loadArrow(id)
+                setFromArrow(arrow)
+                arrow
+            }
+        }
+        images = Transformations.map(arrowId, {
+            id -> if(id == null)
+                mutableListOf()
+            else
+                arrowDAO.loadArrowImages(id)
+        })
+    }
+
+    private fun setFromArrow(arrow: Arrow) {
+        name.set(arrow.name)
+        maxArrowNumber.set(arrow.maxArrowNumber)
+        length.set(arrow.length)
+        material.set(arrow.material)
+        spine.set(arrow.spine)
+        weight.set(arrow.weight)
+        tipWeight.set(arrow.tipWeight)
+        vanes.set(arrow.vanes)
+        nock.set(arrow.nock)
+        comment.set(arrow.comment)
+        diameterValue.set(arrow.diameter.value)
+        diameterUnit.set(arrow.diameter.unit)
+    }
+
+    fun save(thumb: Thumbnail): Boolean {
+        val images = images.value
+        if (!validateInput() || images == null) {
+            return false
+        }
+        val arrow = Arrow()
+        arrow.id = arrowId.value
+        arrow.maxArrowNumber = maxArrowNumber.get()
+        arrow.length = length.get()
+        arrow.material = material.get()
+        arrow.spine = spine.get()
+        arrow.weight = weight.get()
+        arrow.tipWeight = tipWeight.get()
+        arrow.vanes = vanes.get()
+        arrow.nock = nock.get()
+        arrow.comment = comment.get()
+        arrow.thumbnail = thumb
+        arrow.diameter = Dimension(diameterValue.get(), diameterUnit.get())
+        arrowDAO.saveArrow(arrow, images)
+        return true
+    }
+
+    private fun validateInput(): Boolean {
+        if (diameterUnit.get() == MILLIMETER) {
+            if (diameterValue.get() !in 1..20) {
+                diameterErrorText.set(getApplication<ApplicationInstance>().getString(R.string.not_within_expected_range_mm))
+                return false
+            }
+        } else {
+            if (diameterValue.get() !in 0f..1f) {
+                diameterErrorText.set(getApplication<ApplicationInstance>().getString(R.string.not_within_expected_range_inch))
+                return false
+            }
+        }
+        diameterErrorText.set("")
+        return true
+    }
+
+    fun setArrowId(arrowId: Long?) {
+        this.arrowId.value = arrowId
+    }
+
+    fun areAllPropertiesSet(): Boolean {
+        return !TextUtils.isEmpty(length.get()) &&
+                !TextUtils.isEmpty(material.get()) &&
+                !TextUtils.isEmpty(spine.get()) &&
+                !TextUtils.isEmpty(weight.get()) &&
+                !TextUtils.isEmpty(tipWeight.get()) &&
+                !TextUtils.isEmpty(vanes.get()) &&
+                !TextUtils.isEmpty(nock.get()) &&
+                !TextUtils.isEmpty(comment.get())
+    }
+}
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
index 6d4d1387c..fde7609d3 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
@@ -23,7 +23,7 @@ import de.dreier.mytargets.shared.analysis.aggregation.average.Average
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Score
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.shared.models.db.Arrow
+import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.models.sum
@@ -73,7 +73,7 @@ data class ArrowStatistic(
             return rounds
                     .groupBy { r -> r.training.arrowId ?: 0 }
                     .flatMap { t ->
-                        val arrow = Arrow[t.key]
+                        val arrow = ArrowDAO.loadArrowOrNull(t.key)
                         val name = arrow?.name ?: SharedApplicationInstance.getStr(R.string.unknown)
                         t.value.flatMap { it.loadEnds() }
                                 .flatMap { it.loadShots() }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
index b4d4bae4c..6fdb0d600 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
@@ -38,7 +38,7 @@ import de.dreier.mytargets.R
 import de.dreier.mytargets.base.activities.ChildActivityBase
 import de.dreier.mytargets.databinding.ActivityStatisticsBinding
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.shared.models.db.Arrow
+import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
@@ -220,7 +220,7 @@ class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<Li
                 .distinct()
                 .map { aid ->
                     if (aid != null) {
-                        val arrow = Arrow[aid] ?: return@map Tag(aid, "Deleted " + aid)
+                        val arrow = ArrowDAO.loadArrowOrNull(aid) ?: return@map Tag(aid, "Deleted " + aid)
                         Tag(arrow.id, arrow.name, arrow.thumbnail, true)
                     } else {
                         Tag(null, getString(R.string.unknown))
@@ -244,9 +244,9 @@ class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<Li
                 .map { Tag(it.id, it.toString()) }
     }
 
-    public override fun onSaveInstanceState(outState: Bundle?) {
+    public override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        StateSaver.saveInstanceState(this, outState!!)
+        StateSaver.saveInstanceState(this, outState)
     }
 
     override fun onLoaderReset(loader: Loader<List<Pair<Training, Round>>>) {
diff --git a/app/src/main/java/de/dreier/mytargets/utils/BundleUtils.java b/app/src/main/java/de/dreier/mytargets/utils/BundleUtils.java
new file mode 100644
index 000000000..27856648c
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/utils/BundleUtils.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2017 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.utils;
+
+import android.os.Bundle;
+
+import org.jetbrains.annotations.Nullable;
+
+public class BundleUtils {
+    public static Long getLongOrNull(@Nullable Bundle bundle, String key) {
+        if (bundle != null && bundle.containsKey(key)) {
+            return bundle.getLong(key);
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/app/src/main/java/de/dreier/mytargets/utils/DataBindingAdapters.kt b/app/src/main/java/de/dreier/mytargets/utils/DataBindingAdapters.kt
index 3549c968b..6ba1a3808 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/DataBindingAdapters.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/DataBindingAdapters.kt
@@ -16,9 +16,12 @@
 package de.dreier.mytargets.utils
 
 import android.databinding.BindingAdapter
+import android.support.design.widget.TextInputLayout
 import android.view.View
 import android.widget.ImageView
 
+
+
 object DataBindingAdapters {
 
     @JvmStatic
@@ -33,4 +36,9 @@ object DataBindingAdapters {
         val visible = shouldShow && (showAll || !value.isEmpty())
         view.visibility = if (visible) View.VISIBLE else View.GONE
     }
+
+    @BindingAdapter("app:errorText")
+    fun setErrorMessage(view: TextInputLayout, errorMessage: String) {
+        view.error = errorMessage
+    }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt b/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt
new file mode 100644
index 000000000..48c277c7a
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2017 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.utils.databinding
+
+import android.databinding.BindingAdapter
+import android.databinding.InverseBindingAdapter
+import android.databinding.InverseBindingListener
+import android.support.v7.widget.AppCompatSpinner
+import android.view.View
+import android.widget.AdapterView
+
+import de.dreier.mytargets.shared.models.Dimension
+
+import de.dreier.mytargets.shared.models.Dimension.Unit.INCH
+import de.dreier.mytargets.shared.models.Dimension.Unit.MILLIMETER
+
+@Suppress("unused")
+object SpinnerBindingAdapters {
+
+    @BindingAdapter(value = ["selectedUnit", "selectedValueAttrChanged"], requireAll = false)
+    fun bindSpinnerData(pAppCompatSpinner: AppCompatSpinner, newSelectedValue: Dimension.Unit?, newTextAttrChanged: InverseBindingListener) {
+        pAppCompatSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
+                newTextAttrChanged.onChange()
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>) {}
+        }
+        if (newSelectedValue != null) {
+            val pos = if (newSelectedValue == MILLIMETER) 0 else 1
+            pAppCompatSpinner.setSelection(pos, false)
+        }
+    }
+
+    @InverseBindingAdapter(attribute = "selectedUnit", event = "selectedValueAttrChanged")
+    fun captureSelectedValue(pAppCompatSpinner: AppCompatSpinner): Dimension.Unit {
+        return if (pAppCompatSpinner.selectedItemPosition == 0) MILLIMETER else INCH
+    }
+}
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
index 70e2928f3..166ecc325 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
@@ -19,6 +19,10 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.util.AttributeSet
+
+import de.dreier.mytargets.features.arrows.ArrowListActivity
+import de.dreier.mytargets.features.arrows.EditArrowFragment
+import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 
 class ArrowSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ImageSelectorBase<Arrow>(context, attrs, ARROW_REQUEST_CODE) {
@@ -33,10 +37,10 @@ class ArrowSelector @JvmOverloads constructor(context: Context, attrs: Attribute
     fun setItemId(arrowId: Long?) {
         var item: Arrow? = null
         if (arrowId != null) {
-            item = Arrow[arrowId]
+            item = ArrowDAO.loadArrowOrNull(arrowId)
         }
         if (item == null) {
-            val all = Arrow.all
+            val all = ArrowDAO.loadArrows()
             if (all.isNotEmpty()) {
                 item = all[0]
             }
diff --git a/app/src/main/res/layout/fragment_edit_arrow.xml b/app/src/main/res/layout/fragment_edit_arrow.xml
index ae7e97351..267ca9a61 100644
--- a/app/src/main/res/layout/fragment_edit_arrow.xml
+++ b/app/src/main/res/layout/fragment_edit_arrow.xml
@@ -22,7 +22,7 @@
 
         <variable
             name="arrow"
-            type="de.dreier.mytargets.shared.models.db.Arrow"/>
+            type="de.dreier.mytargets.features.arrows.EditArrowViewModel"/>
 
         <variable
             name="showAll"
@@ -54,7 +54,7 @@
                     android:layout_height="wrap_content"
                     android:hint="@string/name"
                     android:inputType="textNoSuggestions"
-                    android:text="@{arrow.name}"/>
+                    android:text="@={arrow.name}"/>
 
             </android.support.design.widget.TextInputLayout>
 
@@ -75,7 +75,7 @@
                     android:layout_height="wrap_content"
                     android:hint="@string/max_arrow_number"
                     android:inputType="number"
-                    android:text="@{String.valueOf(arrow.maxArrowNumber)}"/>
+                    android:text="@={`` + arrow.maxArrowNumber}"/>
 
             </android.support.design.widget.TextInputLayout>
 
@@ -100,7 +100,7 @@
                     android:layout_height="wrap_content"
                     android:hint="@string/length"
                     android:inputType="textNoSuggestions"
-                    android:text="@{arrow.length}"/>
+                    android:text="@={arrow.length}"/>
 
             </android.support.design.widget.TextInputLayout>
 
@@ -125,7 +125,7 @@
                     android:layout_height="wrap_content"
                     android:hint="@string/material"
                     android:inputType="textNoSuggestions"
-                    android:text="@{arrow.material}"/>
+                    android:text="@={arrow.material}"/>
 
             </android.support.design.widget.TextInputLayout>
 
@@ -150,7 +150,7 @@
                     android:layout_height="wrap_content"
                     android:hint="@string/spine"
                     android:inputType="textNoSuggestions"
-                    android:text="@{arrow.spine}"/>
+                    android:text="@={arrow.spine}"/>
 
             </android.support.design.widget.TextInputLayout>
 
@@ -173,7 +173,8 @@
                     android:id="@+id/diameterTextInputLayout"
                     style="@style/propertyTextInputLayout"
                     android:layout_toLeftOf="@+id/diameterUnit"
-                    android:layout_toStartOf="@+id/diameterUnit">
+                    android:layout_toStartOf="@+id/diameterUnit"
+                    app:errorText="@{arrow.diameterErrorText}">
 
                     <de.dreier.mytargets.views.TextInputEditText
                         android:id="@+id/diameter"
@@ -181,7 +182,7 @@
                         android:layout_height="wrap_content"
                         android:hint="@string/diameter"
                         android:inputType="numberDecimal"
-                        android:text="@{String.valueOf(arrow.diameter.value)}"/>
+                        android:text="@={``+arrow.diameter.value}"/>
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -193,7 +194,8 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:drawSelectorOnTop="true"
-                    android:entries="@array/arrow_diameter_units"/>
+                    android:entries="@array/arrow_diameter_units"
+                    app:selectedUnit="@={arrow.diameterUnit}"/>
 
             </RelativeLayout>
 
@@ -218,7 +220,7 @@
                     android:layout_height="wrap_content"
                     android:hint="@string/weight"
                     android:inputType="textNoSuggestions"
-                    android:text="@{arrow.weight}"/>
+                    android:text="@={arrow.weight}"/>
 
             </android.support.design.widget.TextInputLayout>
 
@@ -243,7 +245,7 @@
                     android:layout_height="wrap_content"
                     android:hint="@string/tip_weight"
                     android:inputType="textNoSuggestions"
-                    android:text="@{arrow.tipWeight}"/>
+                    android:text="@={arrow.tipWeight}"/>
 
             </android.support.design.widget.TextInputLayout>
 
@@ -268,7 +270,7 @@
                     android:layout_height="wrap_content"
                     android:hint="@string/vanes"
                     android:inputType="textNoSuggestions"
-                    android:text="@{arrow.vanes}"/>
+                    android:text="@={arrow.vanes}"/>
 
             </android.support.design.widget.TextInputLayout>
 
@@ -293,7 +295,7 @@
                     android:layout_height="wrap_content"
                     android:hint="@string/nock"
                     android:inputType="textNoSuggestions"
-                    android:text="@{arrow.nock}"/>
+                    android:text="@={arrow.nock}"/>
 
             </android.support.design.widget.TextInputLayout>
 
@@ -318,7 +320,7 @@
                     android:layout_height="wrap_content"
                     android:hint="@string/comment"
                     android:inputType="textMultiLine"
-                    android:text="@{arrow.comment}"/>
+                    android:text="@={arrow.comment}"/>
 
             </android.support.design.widget.TextInputLayout>
 
diff --git a/dependencies.gradle b/dependencies.gradle
index 1aeb4c1da..a5e85a31b 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -20,6 +20,7 @@ ext {
             aboutPage            : '1.2.2',
             androidLanguages     : 'v1.0.1',
             androidState         : '1.1.6',
+            architectureComponents: '1.0.0',
             dbFlow               : '4.2.4',
             dexmaker             : '2.2.0',
             discreteSeekbar      : '1.0.1',
@@ -75,6 +76,9 @@ ext {
             supportWearable               : "com.google.android.support:wearable:$libraryVersion.supportWearable",
             wearable                      : "com.google.android.wearable:wearable:$libraryVersion.supportWearable",
 
+            archLifecycleExtensions       : "android.arch.lifecycle:extensions:$libraryVersion.architectureComponents",
+            archLifecycleCompiler         : "android.arch.lifecycle:compiler:$libraryVersion.architectureComponents",
+
             playServicesDrive             : "com.google.android.gms:play-services-drive:$libraryVersion.playService",
             playServicesWearable          : "com.google.android.gms:play-services-wearable:$libraryVersion.playService",
             firebaseCore                  : "com.google.firebase:firebase-core:$libraryVersion.playService",
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/ArrowDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/ArrowDAO.kt
new file mode 100644
index 000000000..8da1463b7
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/ArrowDAO.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2017 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.shared.models.dao
+
+import com.raizlabs.android.dbflow.config.FlowManager
+import com.raizlabs.android.dbflow.sql.language.SQLite
+import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.shared.models.db.Arrow
+import de.dreier.mytargets.shared.models.db.ArrowImage
+import de.dreier.mytargets.shared.models.db.ArrowImage_Table
+import de.dreier.mytargets.shared.models.db.Arrow_Table
+
+object ArrowDAO {
+    fun loadArrows(): List<Arrow> = SQLite.select().from(Arrow::class.java).queryList()
+
+    fun loadArrow(id: Long): Arrow = SQLite.select()
+            .from(Arrow::class.java)
+            .where(Arrow_Table._id.eq(id))
+            .querySingle() ?: throw IllegalStateException("Arrow $id does not exist")
+
+    fun loadArrowOrNull(id: Long): Arrow? = SQLite.select()
+            .from(Arrow::class.java)
+            .where(Arrow_Table._id.eq(id))
+            .querySingle()
+
+    fun loadArrowImages(id: Long): List<ArrowImage> = SQLite.select()
+            .from(ArrowImage::class.java)
+            .where(ArrowImage_Table.arrow.eq(id))
+            .queryList()
+
+    fun saveArrow(arrow: Arrow, images: List<ArrowImage>) {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ db ->
+            arrow.save(db)
+            SQLite.delete(ArrowImage::class.java)
+                    .where(ArrowImage_Table.arrow.eq(arrow.id))
+                    .execute(db)
+            for (image in images) {
+                image.arrowId = arrow.id
+                image.save(db)
+            }
+        })
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
index 42065d685..84644a8c9 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
@@ -19,7 +19,6 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.os.Parcelable
-import android.text.TextUtils
 import com.raizlabs.android.dbflow.annotation.Column
 import com.raizlabs.android.dbflow.annotation.OneToMany
 import com.raizlabs.android.dbflow.annotation.PrimaryKey
@@ -38,42 +37,43 @@ import kotlinx.android.parcel.Parcelize
 @SuppressLint("ParcelCreator")
 @Parcelize
 @Table(database = AppDatabase::class)
-data class Arrow(@Column(name = "_id")
-                 @PrimaryKey(autoincrement = true)
-                 override var id: Long = 0,
+data class Arrow(
+        @Column(name = "_id")
+        @PrimaryKey(autoincrement = true)
+        override var id: Long = 0,
 
-                 @Column
-                 override var name: String = "",
+        @Column
+        override var name: String = "",
 
-                 @Column
-                 var maxArrowNumber: Int = 12,
+        @Column
+        var maxArrowNumber: Int = 12,
 
-                 @Column
-                 var length: String? = "",
+        @Column
+        var length: String? = "",
 
-                 @Column
-                 var material: String? = "",
+        @Column
+        var material: String? = "",
 
-                 @Column
-                 var spine: String? = "",
+        @Column
+        var spine: String? = "",
 
-                 @Column
-                 var weight: String? = "",
+        @Column
+        var weight: String? = "",
 
-                 @Column
-                 var tipWeight: String? = "",
+        @Column
+        var tipWeight: String? = "",
 
-                 @Column
-                 var vanes: String? = "",
+        @Column
+        var vanes: String? = "",
 
-                 @Column
-                 var nock: String? = "",
+        @Column
+        var nock: String? = "",
 
-                 @Column
-                 var comment: String? = "",
+        @Column
+        var comment: String? = "",
 
-                 @Column(typeConverter = DimensionConverter::class)
-                 var diameter: Dimension = Dimension(5f, Dimension.Unit.MILLIMETER),
+        @Column(typeConverter = DimensionConverter::class)
+        var diameter: Dimension = Dimension(5f, Dimension.Unit.MILLIMETER),
 
                  @Column(typeConverter = ThumbnailConverter::class)
                  var thumbnail: Thumbnail? = null) : BaseModel(), IImageProvider, IIdSettable, Comparable<Arrow>, IRecursiveModel, Parcelable {
@@ -134,17 +134,6 @@ data class Arrow(@Column(name = "_id")
 
     override fun compareTo(other: Arrow) = compareBy(Arrow::name, Arrow::id).compare(this, other)
 
-    fun areAllPropertiesSet(): Boolean {
-        return !TextUtils.isEmpty(length) &&
-                !TextUtils.isEmpty(material) &&
-                !TextUtils.isEmpty(spine) &&
-                !TextUtils.isEmpty(weight) &&
-                !TextUtils.isEmpty(tipWeight) &&
-                !TextUtils.isEmpty(vanes) &&
-                !TextUtils.isEmpty(nock) &&
-                !TextUtils.isEmpty(comment)
-    }
-
     override fun saveRecursively() {
         save()
     }
@@ -152,16 +141,4 @@ data class Arrow(@Column(name = "_id")
     override fun saveRecursively(databaseWrapper: DatabaseWrapper) {
         save(databaseWrapper)
     }
-
-    companion object {
-        val all: List<Arrow>
-            get() = SQLite.select().from(Arrow::class.java).queryList()
-
-        operator fun get(id: Long?): Arrow? {
-            return if (id == null) null else SQLite.select()
-                    .from(Arrow::class.java)
-                    .where(Arrow_Table._id.eq(id))
-                    .querySingle()
-        }
-    }
 }

From 3f969353e2836a3affd542932d036a08616b825a Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Tue, 2 Jan 2018 17:25:06 +0100
Subject: [PATCH 002/102] Multiple fixes

---
 .../features/arrows/EditArrowFragment.kt      |  8 ++++---
 .../features/arrows/EditArrowViewModel.kt     |  4 +++-
 .../{BundleUtils.java => BundleUtils.kt}      | 18 ++++++--------
 .../mytargets/utils/DataBindingAdapters.kt    |  3 ++-
 .../databinding/SpinnerBindingAdapters.kt     |  2 ++
 .../main/res/layout/fragment_edit_arrow.xml   | 24 ++++++++-----------
 6 files changed, 29 insertions(+), 30 deletions(-)
 rename app/src/main/java/de/dreier/mytargets/utils/{BundleUtils.java => BundleUtils.kt} (59%)

diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
index 48351a2ee..413b3bad9 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
@@ -25,8 +25,8 @@ import de.dreier.mytargets.R
 import de.dreier.mytargets.base.fragments.EditWithImageFragmentBase
 import de.dreier.mytargets.databinding.FragmentEditArrowBinding
 import de.dreier.mytargets.shared.models.db.ArrowImage
-import de.dreier.mytargets.utils.BundleUtils
 import de.dreier.mytargets.utils.ToolbarUtils
+import de.dreier.mytargets.utils.getLongOrNull
 
 class EditArrowFragment : EditWithImageFragmentBase<ArrowImage>(R.drawable.arrows) {
 
@@ -36,15 +36,17 @@ class EditArrowFragment : EditWithImageFragmentBase<ArrowImage>(R.drawable.arrow
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val rootView = super.onCreateView(inflater, container, savedInstanceState)
         contentBinding = FragmentEditArrowBinding.inflate(inflater, binding.content, true)
-        contentBinding.moreFields.setOnClickListener { contentBinding.showAll = true }
         return rootView
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         viewModel = ViewModelProviders.of(this).get(EditArrowViewModel::class.java)
-        viewModel.setArrowId(BundleUtils.getLongOrNull(arguments, ARROW_ID))
+        viewModel.setArrowId(arguments.getLongOrNull(ARROW_ID))
         contentBinding.arrow = viewModel
+        contentBinding.moreFields.setOnClickListener {
+            viewModel.showAll.set(true)
+        }
         viewModel.arrow.observe(this, Observer { arrow ->
             if (arrow == null) {
                 return@Observer
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
index 364e5b43d..25e453771 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
@@ -19,6 +19,7 @@ import android.arch.lifecycle.AndroidViewModel
 import android.arch.lifecycle.LiveData
 import android.arch.lifecycle.MutableLiveData
 import android.arch.lifecycle.Transformations
+import android.databinding.ObservableBoolean
 import android.databinding.ObservableField
 import android.databinding.ObservableFloat
 import android.databinding.ObservableInt
@@ -52,6 +53,7 @@ class EditArrowViewModel(app: ApplicationInstance) : AndroidViewModel(app) {
     var diameterValue = ObservableFloat(5f)
     var diameterUnit = ObservableField<Dimension.Unit>(MILLIMETER)
 
+    var showAll = ObservableBoolean(false)
     var diameterErrorText = ObservableField<String>("")
 
     private val arrowDAO = ArrowDAO
@@ -95,7 +97,7 @@ class EditArrowViewModel(app: ApplicationInstance) : AndroidViewModel(app) {
             return false
         }
         val arrow = Arrow()
-        arrow.id = arrowId.value
+        arrow.id = arrowId.value ?: 0
         arrow.maxArrowNumber = maxArrowNumber.get()
         arrow.length = length.get()
         arrow.material = material.get()
diff --git a/app/src/main/java/de/dreier/mytargets/utils/BundleUtils.java b/app/src/main/java/de/dreier/mytargets/utils/BundleUtils.kt
similarity index 59%
rename from app/src/main/java/de/dreier/mytargets/utils/BundleUtils.java
rename to app/src/main/java/de/dreier/mytargets/utils/BundleUtils.kt
index 27856648c..ffc9c9ce9 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/BundleUtils.java
+++ b/app/src/main/java/de/dreier/mytargets/utils/BundleUtils.kt
@@ -13,18 +13,14 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.utils;
+package de.dreier.mytargets.utils
 
-import android.os.Bundle;
+import android.os.Bundle
 
-import org.jetbrains.annotations.Nullable;
-
-public class BundleUtils {
-    public static Long getLongOrNull(@Nullable Bundle bundle, String key) {
-        if (bundle != null && bundle.containsKey(key)) {
-            return bundle.getLong(key);
-        } else {
-            return null;
-        }
+fun Bundle?.getLongOrNull(key: String): Long? {
+    return if (this != null && containsKey(key)) {
+        getLong(key)
+    } else {
+        null
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/utils/DataBindingAdapters.kt b/app/src/main/java/de/dreier/mytargets/utils/DataBindingAdapters.kt
index 6ba1a3808..ec8fa7f38 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/DataBindingAdapters.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/DataBindingAdapters.kt
@@ -37,7 +37,8 @@ object DataBindingAdapters {
         view.visibility = if (visible) View.VISIBLE else View.GONE
     }
 
-    @BindingAdapter("app:errorText")
+    @JvmStatic
+    @BindingAdapter("errorText")
     fun setErrorMessage(view: TextInputLayout, errorMessage: String) {
         view.error = errorMessage
     }
diff --git a/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt b/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt
index 48c277c7a..6f119a23d 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt
@@ -30,6 +30,7 @@ import de.dreier.mytargets.shared.models.Dimension.Unit.MILLIMETER
 @Suppress("unused")
 object SpinnerBindingAdapters {
 
+    @JvmStatic
     @BindingAdapter(value = ["selectedUnit", "selectedValueAttrChanged"], requireAll = false)
     fun bindSpinnerData(pAppCompatSpinner: AppCompatSpinner, newSelectedValue: Dimension.Unit?, newTextAttrChanged: InverseBindingListener) {
         pAppCompatSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
@@ -45,6 +46,7 @@ object SpinnerBindingAdapters {
         }
     }
 
+    @JvmStatic
     @InverseBindingAdapter(attribute = "selectedUnit", event = "selectedValueAttrChanged")
     fun captureSelectedValue(pAppCompatSpinner: AppCompatSpinner): Dimension.Unit {
         return if (pAppCompatSpinner.selectedItemPosition == 0) MILLIMETER else INCH
diff --git a/app/src/main/res/layout/fragment_edit_arrow.xml b/app/src/main/res/layout/fragment_edit_arrow.xml
index 267ca9a61..41d32e5d2 100644
--- a/app/src/main/res/layout/fragment_edit_arrow.xml
+++ b/app/src/main/res/layout/fragment_edit_arrow.xml
@@ -24,10 +24,6 @@
             name="arrow"
             type="de.dreier.mytargets.features.arrows.EditArrowViewModel"/>
 
-        <variable
-            name="showAll"
-            type="boolean"/>
-
     </data>
 
     <LinearLayout
@@ -84,7 +80,7 @@
         <FrameLayout
             style="@style/propertyFrameLayout"
             app:propertyShouldShow="@{true}"
-            app:propertyShowAll="@{showAll}"
+            app:propertyShowAll="@{arrow.showAll}"
             app:propertyValue="@{arrow.length}">
 
             <ImageView
@@ -109,7 +105,7 @@
         <FrameLayout
             style="@style/propertyFrameLayout"
             app:propertyShouldShow="@{true}"
-            app:propertyShowAll="@{showAll}"
+            app:propertyShowAll="@{arrow.showAll}"
             app:propertyValue="@{arrow.material}">
 
             <ImageView
@@ -134,7 +130,7 @@
         <FrameLayout
             style="@style/propertyFrameLayout"
             app:propertyShouldShow="@{true}"
-            app:propertyShowAll="@{showAll}"
+            app:propertyShowAll="@{arrow.showAll}"
             app:propertyValue="@{arrow.spine}">
 
             <ImageView
@@ -182,7 +178,7 @@
                         android:layout_height="wrap_content"
                         android:hint="@string/diameter"
                         android:inputType="numberDecimal"
-                        android:text="@={``+arrow.diameter.value}"/>
+                        android:text="@={``+arrow.diameterValue}"/>
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -204,7 +200,7 @@
         <FrameLayout
             style="@style/propertyFrameLayout"
             app:propertyShouldShow="@{true}"
-            app:propertyShowAll="@{showAll}"
+            app:propertyShowAll="@{arrow.showAll}"
             app:propertyValue="@{arrow.weight}">
 
             <ImageView
@@ -229,7 +225,7 @@
         <FrameLayout
             style="@style/propertyFrameLayout"
             app:propertyShouldShow="@{true}"
-            app:propertyShowAll="@{showAll}"
+            app:propertyShowAll="@{arrow.showAll}"
             app:propertyValue="@{arrow.tipWeight}">
 
             <ImageView
@@ -254,7 +250,7 @@
         <FrameLayout
             style="@style/propertyFrameLayout"
             app:propertyShouldShow="@{true}"
-            app:propertyShowAll="@{showAll}"
+            app:propertyShowAll="@{arrow.showAll}"
             app:propertyValue="@{arrow.vanes}">
 
             <ImageView
@@ -279,7 +275,7 @@
         <FrameLayout
             style="@style/propertyFrameLayout"
             app:propertyShouldShow="@{true}"
-            app:propertyShowAll="@{showAll}"
+            app:propertyShowAll="@{arrow.showAll}"
             app:propertyValue="@{arrow.nock}">
 
             <ImageView
@@ -304,7 +300,7 @@
         <FrameLayout
             style="@style/propertyFrameLayout"
             app:propertyShouldShow="@{true}"
-            app:propertyShowAll="@{showAll}"
+            app:propertyShowAll="@{arrow.showAll}"
             app:propertyValue="@{arrow.comment}">
 
             <ImageView
@@ -330,7 +326,7 @@
             android:id="@+id/moreFields"
             style="@style/propertyAddButton"
             android:text="@string/more_fields"
-            android:visibility="@{showAll || arrow.areAllPropertiesSet ? View.GONE : View.VISIBLE}"/>
+            android:visibility="@{arrow.showAll || arrow.areAllPropertiesSet ? View.GONE : View.VISIBLE}"/>
 
     </LinearLayout>
 

From c52da3c94edbb6b5adaf98f80989c8a5b2ce746a Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Wed, 3 Jan 2018 14:28:32 +0100
Subject: [PATCH 003/102] Fixed data binding adapters

---
 .../{ => databinding}/DataBindingAdapters.kt  |  6 ++---
 .../databinding/SpinnerBindingAdapters.kt     | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)
 rename app/src/main/java/de/dreier/mytargets/utils/{ => databinding}/DataBindingAdapters.kt (94%)

diff --git a/app/src/main/java/de/dreier/mytargets/utils/DataBindingAdapters.kt b/app/src/main/java/de/dreier/mytargets/utils/databinding/DataBindingAdapters.kt
similarity index 94%
rename from app/src/main/java/de/dreier/mytargets/utils/DataBindingAdapters.kt
rename to app/src/main/java/de/dreier/mytargets/utils/databinding/DataBindingAdapters.kt
index ec8fa7f38..0cb6a3a83 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/DataBindingAdapters.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/databinding/DataBindingAdapters.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
@@ -13,15 +13,13 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.utils
+package de.dreier.mytargets.utils.databinding
 
 import android.databinding.BindingAdapter
 import android.support.design.widget.TextInputLayout
 import android.view.View
 import android.widget.ImageView
 
-
-
 object DataBindingAdapters {
 
     @JvmStatic
diff --git a/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt b/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt
index 6f119a23d..d9d5397ba 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt
@@ -21,6 +21,7 @@ import android.databinding.InverseBindingListener
 import android.support.v7.widget.AppCompatSpinner
 import android.view.View
 import android.widget.AdapterView
+import android.widget.Spinner
 
 import de.dreier.mytargets.shared.models.Dimension
 
@@ -46,9 +47,31 @@ object SpinnerBindingAdapters {
         }
     }
 
+    @JvmStatic
+    @BindingAdapter(value = ["selectedUnit", "selectedValueAttrChanged"], requireAll = false)
+    fun bindSpinnerData(pAppCompatSpinner: Spinner, newSelectedValue: Dimension.Unit?, newTextAttrChanged: InverseBindingListener) {
+        pAppCompatSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
+                newTextAttrChanged.onChange()
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>) {}
+        }
+        if (newSelectedValue != null) {
+            val pos = if (newSelectedValue == MILLIMETER) 0 else 1
+            pAppCompatSpinner.setSelection(pos, false)
+        }
+    }
+
     @JvmStatic
     @InverseBindingAdapter(attribute = "selectedUnit", event = "selectedValueAttrChanged")
     fun captureSelectedValue(pAppCompatSpinner: AppCompatSpinner): Dimension.Unit {
         return if (pAppCompatSpinner.selectedItemPosition == 0) MILLIMETER else INCH
     }
+
+    @JvmStatic
+    @InverseBindingAdapter(attribute = "selectedUnit", event = "selectedValueAttrChanged")
+    fun captureSelectedValue(pAppCompatSpinner: Spinner): Dimension.Unit {
+        return if (pAppCompatSpinner.selectedItemPosition == 0) MILLIMETER else INCH
+    }
 }

From 85f8f276d795686ee320d279e452c79064566f37 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Wed, 3 Jan 2018 14:30:43 +0100
Subject: [PATCH 004/102] Got rid of IRecursiveModel

---
 .../base/fragments/EditableListFragment.kt    |  3 +-
 .../fragments/EditableListFragmentBase.kt     | 31 +++++++++----------
 .../features/arrows/EditArrowListFragment.kt  |  8 +++++
 .../features/bows/EditBowListFragment.kt      |  8 +++++
 .../features/training/RoundFragment.kt        |  8 +++++
 .../training/details/TrainingFragment.kt      |  8 +++++
 .../overview/ExpandableListFragment.kt        |  3 +-
 .../training/overview/TrainingsFragment.kt    |  8 +++++
 .../shared/models/IRecursiveModel.kt          | 24 --------------
 .../mytargets/shared/models/dao/ArrowDAO.kt   |  4 +--
 .../mytargets/shared/models/db/Arrow.kt       | 13 +++++---
 .../dreier/mytargets/shared/models/db/Bow.kt  |  6 ++--
 .../dreier/mytargets/shared/models/db/End.kt  |  7 ++---
 .../mytargets/shared/models/db/Round.kt       |  6 ++--
 .../mytargets/shared/models/db/Training.kt    |  6 ++--
 15 files changed, 78 insertions(+), 65 deletions(-)
 delete mode 100644 shared/src/main/java/de/dreier/mytargets/shared/models/IRecursiveModel.kt

diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragment.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragment.kt
index 890e0d00f..d9eeb5045 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragment.kt
@@ -18,9 +18,8 @@ package de.dreier.mytargets.base.fragments
 import android.os.Parcelable
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
 import de.dreier.mytargets.shared.models.IIdSettable
-import de.dreier.mytargets.shared.models.IRecursiveModel
 
-abstract class EditableListFragment<T> : EditableListFragmentBase<T, SimpleListAdapterBase<T>>() where T : IIdSettable, T : IRecursiveModel, T : Parcelable, T : Comparable<T> {
+abstract class EditableListFragment<T> : EditableListFragmentBase<T, SimpleListAdapterBase<T>>() where T : IIdSettable, T : Parcelable, T : Comparable<T> {
 
     override fun onSelected(item: T) {
         if (listener == null) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
index 5f88f2424..ae37e3ee9 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
@@ -22,7 +22,6 @@ import com.google.firebase.analytics.FirebaseAnalytics
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.adapters.ListAdapterBase
 import de.dreier.mytargets.shared.models.IIdSettable
-import de.dreier.mytargets.shared.models.IRecursiveModel
 import de.dreier.mytargets.utils.multiselector.MultiSelector
 import de.dreier.mytargets.utils.multiselector.OnItemLongClickListener
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
@@ -30,7 +29,7 @@ import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 /**
  * @param <T> Model of the item which is managed within the fragment.
 </T> */
-abstract class EditableListFragmentBase<T, U : ListAdapterBase<*, T>> : ListFragmentBase<T, U>(), OnItemLongClickListener<T> where T : IIdSettable, T : IRecursiveModel {
+abstract class EditableListFragmentBase<T, U : ListAdapterBase<*, T>> : ListFragmentBase<T, U>(), OnItemLongClickListener<T> where T : IIdSettable {
 
     var selector = MultiSelector()
 
@@ -62,39 +61,37 @@ abstract class EditableListFragmentBase<T, U : ListAdapterBase<*, T>> : ListFrag
     fun onDelete(deletedIds: List<Long>) {
         FirebaseAnalytics.getInstance(context!!).logEvent("delete", null)
         val deleted = deleteItems(deletedIds)
-        val message = resources.getQuantityString(itemTypeDelRes, deleted.size, deleted.size)
+        val message = resources
+                .getQuantityString(itemTypeDelRes, deleted.size, deleted.size)
         val coordinatorLayout = view!!.findViewById<View>(R.id.coordinatorLayout)
         Snackbar.make(coordinatorLayout, message, Snackbar.LENGTH_LONG)
-                .setAction(R.string.undo) { undoDeletion(deleted) }
+                .setAction(R.string.undo) {
+                    undoDeletion(undoDeletions)
+                }
                 .show()
     }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putBundle(KEY_SELECTOR, selector.saveSelectionStates())
-
-    }
-
     private fun deleteItems(deletedIds: List<Long>): MutableList<T> {
         val deleted = deletedIds
                 .map { id -> adapter!!.getItemById(id) }
                 .filter { item -> item != null }
                 .map { it!! }
                 .toMutableList()
+        val undoActions = mutableListOf<() -> T>()
         for (item in deleted) {
             adapter!!.removeItem(item)
-            item.delete()
+            undoActions.add(deleteItem(item))
         }
         adapter!!.notifyDataSetChanged()
         reloadData()
-        return deleted
+        return undoActions
     }
 
-    private fun undoDeletion(deleted: MutableList<T>) {
-        for (item in deleted) {
-            item.saveRecursively()
-            adapter!!.addItem(item)
-        }
+    protected abstract fun deleteItem(item: T): () -> T
+
+    private fun undoDeletion(deleted: MutableList<() -> T>) {
+        deleted.map { it.invoke() }
+                .forEach { adapter!!.addItem(it) }
         reloadData()
         deleted.clear()
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
index 492b96293..1cb748962 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
@@ -84,6 +84,14 @@ class EditArrowListFragment : EditableListFragment<Arrow>() {
                 .start()
     }
 
+    override fun deleteItem(item: Arrow): () -> Arrow {
+        item.delete()
+        return {
+            item.saveRecursively()
+            item
+        }
+    }
+
     private inner class ArrowAdapter : SimpleListAdapterBase<Arrow>() {
 
         public override fun onCreateViewHolder(parent: ViewGroup): ViewHolder {
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
index a80f997d0..8a145061d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
@@ -89,6 +89,14 @@ class EditBowListFragment : EditableListFragment<Bow>() {
         navigationController.navigateToEditBow(item.id)
     }
 
+    override fun deleteItem(item: Bow): () -> Bow {
+        item.delete()
+        return {
+            item.saveRecursively()
+            item
+        }
+    }
+
     companion object {
         internal var bowTypeMap = SparseArray<EBowType>()
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
index 1fe73746f..2e534848c 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
@@ -161,6 +161,14 @@ class RoundFragment : EditableListFragment<End>() {
                 .start()
     }
 
+    override fun deleteItem(item: End): () -> End {
+        item.delete()
+        return {
+            item.saveRecursively()
+            item
+        }
+    }
+
     private inner class EndAdapter : SimpleListAdapterBase<End>() {
 
         override fun onCreateViewHolder(parent: ViewGroup): SelectableViewHolder<End> {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index 010191a5e..7b9ac8c29 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -183,6 +183,14 @@ open class TrainingFragment : EditableListFragment<Round>() {
         navigationController.navigateToStatistics(ids)
     }
 
+    override fun deleteItem(item: Round): () -> Round {
+        item.delete()
+        return {
+            item.saveRecursively()
+            item
+        }
+    }
+
     private inner class RoundAdapter : SimpleListAdapterBase<Round>() {
 
         override fun onCreateViewHolder(parent: ViewGroup): SelectableViewHolder<Round> {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/ExpandableListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/ExpandableListFragment.kt
index a05cb8636..7d8447622 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/overview/ExpandableListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/ExpandableListFragment.kt
@@ -19,12 +19,11 @@ import de.dreier.mytargets.base.adapters.header.ExpandableListAdapter
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase
 import de.dreier.mytargets.shared.models.IIdProvider
 import de.dreier.mytargets.shared.models.IIdSettable
-import de.dreier.mytargets.shared.models.IRecursiveModel
 
 /**
  * Shows all rounds of one training day
  */
-abstract class ExpandableListFragment<H : IIdProvider, C> : EditableListFragmentBase<C, ExpandableListAdapter<H, C>>() where C : IIdSettable, C : IRecursiveModel {
+abstract class ExpandableListFragment<H : IIdProvider, C> : EditableListFragmentBase<C, ExpandableListAdapter<H, C>>() where C : IIdSettable {
 
     private var savedInstanceState: Bundle? = null
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
index 33fa17407..3c7d8be29 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
@@ -150,6 +150,14 @@ open class TrainingsFragment : ExpandableListFragment<Header, Training>() {
         navigationController.navigateToEditTraining(itemId)
     }
 
+    override fun deleteItem(item: Training): () -> Training {
+        item.delete()
+        return {
+            item.saveRecursively()
+            item
+        }
+    }
+
     override fun onLoad(args: Bundle?): LoaderUICallback {
         val trainings = Training.all
         return {
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/IRecursiveModel.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/IRecursiveModel.kt
deleted file mode 100644
index d8f0e59be..000000000
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/IRecursiveModel.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2017 Florian Dreier
- *
- * This file is part of MyTargets.
- *
- * MyTargets is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * MyTargets is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-package de.dreier.mytargets.shared.models
-
-import com.raizlabs.android.dbflow.structure.Model
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
-
-interface IRecursiveModel : Model {
-    fun saveRecursively()
-    fun saveRecursively(databaseWrapper: DatabaseWrapper)
-}
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/ArrowDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/ArrowDAO.kt
index 8da1463b7..0b077a805 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/ArrowDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/ArrowDAO.kt
@@ -42,7 +42,7 @@ object ArrowDAO {
             .queryList()
 
     fun saveArrow(arrow: Arrow, images: List<ArrowImage>) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ db ->
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
             arrow.save(db)
             SQLite.delete(ArrowImage::class.java)
                     .where(ArrowImage_Table.arrow.eq(arrow.id))
@@ -51,6 +51,6 @@ object ArrowDAO {
                 image.arrowId = arrow.id
                 image.save(db)
             }
-        })
+        }
     }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
index 84644a8c9..64082c944 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
@@ -28,7 +28,10 @@ import com.raizlabs.android.dbflow.sql.language.SQLite
 import com.raizlabs.android.dbflow.structure.BaseModel
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
-import de.dreier.mytargets.shared.models.*
+import de.dreier.mytargets.shared.models.Dimension
+import de.dreier.mytargets.shared.models.IIdSettable
+import de.dreier.mytargets.shared.models.IImageProvider
+import de.dreier.mytargets.shared.models.Thumbnail
 import de.dreier.mytargets.shared.utils.typeconverters.DimensionConverter
 import de.dreier.mytargets.shared.utils.typeconverters.ThumbnailConverter
 import kotlinx.android.parcel.IgnoredOnParcel
@@ -75,8 +78,8 @@ data class Arrow(
         @Column(typeConverter = DimensionConverter::class)
         var diameter: Dimension = Dimension(5f, Dimension.Unit.MILLIMETER),
 
-                 @Column(typeConverter = ThumbnailConverter::class)
-                 var thumbnail: Thumbnail? = null) : BaseModel(), IImageProvider, IIdSettable, Comparable<Arrow>, IRecursiveModel, Parcelable {
+        @Column(typeConverter = ThumbnailConverter::class)
+        var thumbnail: Thumbnail? = null) : BaseModel(), IImageProvider, IIdSettable, Comparable<Arrow>, Parcelable {
 
     @IgnoredOnParcel
     var images: List<ArrowImage>? = null
@@ -134,11 +137,11 @@ data class Arrow(
 
     override fun compareTo(other: Arrow) = compareBy(Arrow::name, Arrow::id).compare(this, other)
 
-    override fun saveRecursively() {
+    fun saveRecursively() {
         save()
     }
 
-    override fun saveRecursively(databaseWrapper: DatabaseWrapper) {
+    fun saveRecursively(databaseWrapper: DatabaseWrapper) {
         save(databaseWrapper)
     }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
index 02557ba07..dd56169c8 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
@@ -111,7 +111,7 @@ data class Bow(
 
         @Column(typeConverter = ThumbnailConverter::class)
         var thumbnail: Thumbnail? = null
-) : BaseModel(), IImageProvider, IIdSettable, Comparable<Bow>, IRecursiveModel, Parcelable {
+) : BaseModel(), IImageProvider, IIdSettable, Comparable<Bow>, Parcelable {
 
     @IgnoredOnParcel
     var images: List<BowImage>? = null
@@ -220,11 +220,11 @@ data class Bow(
                 !TextUtils.isEmpty(description)
     }
 
-    override fun saveRecursively() {
+    fun saveRecursively() {
         save()
     }
 
-    override fun saveRecursively(databaseWrapper: DatabaseWrapper) {
+    fun saveRecursively(databaseWrapper: DatabaseWrapper) {
         save(databaseWrapper)
     }
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
index ae8364615..05f355536 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
@@ -25,7 +25,6 @@ import com.raizlabs.android.dbflow.structure.BaseModel
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.IIdSettable
-import de.dreier.mytargets.shared.models.IRecursiveModel
 import de.dreier.mytargets.shared.models.SelectableZone
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.utils.typeconverters.LocalTimeConverter
@@ -57,7 +56,7 @@ data class End(
 
         @Column
         var comment: String? = ""
-) : BaseModel(), IIdSettable, Comparable<End>, IRecursiveModel, Parcelable {
+) : BaseModel(), IIdSettable, Comparable<End>, Parcelable {
 
     @IgnoredOnParcel
     var images: MutableList<EndImage>? = null
@@ -158,11 +157,11 @@ data class End(
 
     override fun compareTo(other: End) = compareBy(End::index).compare(this, other)
 
-    override fun saveRecursively() {
+    fun saveRecursively() {
         FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ this.saveRecursively(it) })
     }
 
-    override fun saveRecursively(databaseWrapper: DatabaseWrapper) {
+    fun saveRecursively(databaseWrapper: DatabaseWrapper) {
         val round = Round[roundId!!]
         val ends = round!!.loadEnds(databaseWrapper).toMutableList()
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
index c1fe963bd..821b2d0a8 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
@@ -64,7 +64,7 @@ data class Round(
 
         @Column(typeConverter = DimensionConverter::class)
         var targetDiameter: Dimension = Dimension.UNKNOWN
-) : BaseModel(), IIdSettable, Comparable<Round>, IRecursiveModel, Parcelable {
+) : BaseModel(), IIdSettable, Comparable<Round>, Parcelable {
 
     @IgnoredOnParcel
     var ends: MutableList<End>? = null
@@ -158,7 +158,7 @@ data class Round(
         return index - other.index
     }
 
-    override fun saveRecursively() {
+    fun saveRecursively() {
         FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ this.saveRecursively(it) })
     }
 
@@ -167,7 +167,7 @@ data class Round(
      * Gets called when deletion of a round has been canceled by the user via undo
      * or when deleting a training has been canceled.
      */
-    override fun saveRecursively(databaseWrapper: DatabaseWrapper) {
+    fun saveRecursively(databaseWrapper: DatabaseWrapper) {
         val training = Training[trainingId!!]!!
         val rounds = training.loadRounds(databaseWrapper).toMutableList()
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
index 4a49bc942..5df193a08 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
@@ -82,7 +82,7 @@ data class Training(
 
         @ForeignKey(tableClass = Signature::class, references = [(ForeignKeyReference(columnName = "witnessSignature", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.SET_NULL)
         var witnessSignatureId: Long? = null
-) : BaseModel(), IIdSettable, Comparable<Training>, IRecursiveModel, Parcelable {
+) : BaseModel(), IIdSettable, Comparable<Training>, Parcelable {
 
     @IgnoredOnParcel
     var rounds: MutableList<Round>? = null
@@ -203,11 +203,11 @@ data class Training(
         return true
     }
 
-    override fun saveRecursively() {
+    fun saveRecursively() {
         FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ this.saveRecursively(it) })
     }
 
-    override fun saveRecursively(databaseWrapper: DatabaseWrapper) {
+    fun saveRecursively(databaseWrapper: DatabaseWrapper) {
         super.save(databaseWrapper)
         loadRounds().forEach { s ->
             s.trainingId = id

From 66a4b6c4f98efb0b21d72f188f4da9bb288b79ff Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Wed, 3 Jan 2018 15:57:50 +0100
Subject: [PATCH 005/102] Replaced default reverse GeoCoder for Environment

---
 .../features/training/environment/Locator.kt  | 35 +++++++++----------
 .../views/selector/EnvironmentSelector.kt     | 33 ++++++++++++++---
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt
index 74dd2d298..c383743d4 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt
@@ -17,6 +17,7 @@ package de.dreier.mytargets.features.training.environment
 
 import android.Manifest.permission.ACCESS_COARSE_LOCATION
 import android.Manifest.permission.ACCESS_FINE_LOCATION
+import android.annotation.SuppressLint
 import android.content.Context
 import android.location.Location
 import android.location.LocationListener
@@ -31,7 +32,7 @@ import timber.log.Timber
  * @author emil http://stackoverflow.com/users/220710/emil
  */
 class Locator(private val context: Context) : LocationListener {
-    private val locationManager: LocationManager?
+    private val locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
     private var method: Locator.Method? = null
     private var callback: Locator.Listener? = null
 
@@ -41,17 +42,14 @@ class Locator(private val context: Context) : LocationListener {
         NETWORK_THEN_GPS
     }
 
-    init {
-        this.locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
-    }
-
-    @RequiresPermission(anyOf = arrayOf(ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION))
+    @SuppressLint("MissingPermission", "SupportAnnotationUsage")
+    @RequiresPermission(anyOf = [ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION])
     fun getLocation(method: Locator.Method, callback: Locator.Listener) {
         this.method = method
         this.callback = callback
         when (this.method) {
             Locator.Method.NETWORK, Locator.Method.NETWORK_THEN_GPS -> {
-                val networkLocation = locationManager!!
+                val networkLocation = locationManager
                         .getLastKnownLocation(LocationManager.NETWORK_PROVIDER)
                 if (networkLocation != null) {
                     Timber.d("Last known location found for network provider : %s", networkLocation
@@ -63,7 +61,7 @@ class Locator(private val context: Context) : LocationListener {
                 }
             }
             Locator.Method.GPS -> {
-                val gpsLocation = this.locationManager!!
+                val gpsLocation = this.locationManager
                         .getLastKnownLocation(LocationManager.GPS_PROVIDER)
                 if (gpsLocation != null) {
                     Timber.d("Last known location found for GPS provider : %s", gpsLocation
@@ -77,28 +75,30 @@ class Locator(private val context: Context) : LocationListener {
         }
     }
 
+    @SuppressLint("MissingPermission", "SupportAnnotationUsage")
+    @RequiresPermission(anyOf = [ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION])
     private fun requestUpdates(provider: String) {
-        if (this.locationManager!!.isProviderEnabled(provider)) {
+        if (locationManager.isProviderEnabled(provider)) {
             if (provider.contentEquals(LocationManager.NETWORK_PROVIDER) && Connectivity.isConnected(this.context)) {
                 Timber.d("Network connected, start listening : %s", provider)
-                this.locationManager
+                locationManager
                         .requestLocationUpdates(provider, TIME_INTERVAL.toLong(), DISTANCE_INTERVAL.toFloat(), this)
             } else if (provider.contentEquals(LocationManager.GPS_PROVIDER) && Connectivity.isConnectedMobile(this.context)) {
                 Timber.d("Mobile network connected, start listening : %s", provider)
-                this.locationManager
+                locationManager
                         .requestLocationUpdates(provider, TIME_INTERVAL.toLong(), DISTANCE_INTERVAL.toFloat(), this)
             } else {
                 Timber.d("Proper network not connected for provider : %s", provider)
-                this.onProviderDisabled(provider)
+                onProviderDisabled(provider)
             }
         } else {
-            this.onProviderDisabled(provider)
+            onProviderDisabled(provider)
         }
     }
 
     fun cancel() {
         Timber.d("Locating canceled.")
-        locationManager!!.removeUpdates(this)
+        locationManager.removeUpdates(this)
     }
 
     override fun onLocationChanged(location: Location) {
@@ -107,7 +107,7 @@ class Locator(private val context: Context) : LocationListener {
             " : +- ${location.accuracy} meters"
         else
             "")
-        locationManager!!.removeUpdates(this)
+        locationManager.removeUpdates(this)
         callback!!.onLocationFound(location)
     }
 
@@ -118,7 +118,7 @@ class Locator(private val context: Context) : LocationListener {
             Timber.d("Request updates from GPS provider, network provider disabled.")
             this.requestUpdates(LocationManager.GPS_PROVIDER)
         } else {
-            this.locationManager!!.removeUpdates(this)
+            this.locationManager.removeUpdates(this)
             this.callback!!.onLocationNotFound()
         }
     }
@@ -132,8 +132,7 @@ class Locator(private val context: Context) : LocationListener {
     }
 
     interface Listener {
-        fun onLocationFound(location: Location?)
-
+        fun onLocationFound(location: Location)
         fun onLocationNotFound()
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
index cdd1da02e..3d9c0c0df 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
@@ -21,6 +21,7 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.pm.PackageManager
+import android.location.Geocoder
 import android.location.Location
 import android.support.annotation.RequiresPermission
 import android.support.v4.app.Fragment
@@ -29,13 +30,14 @@ import android.util.AttributeSet
 import de.dreier.mytargets.R
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.features.training.environment.CurrentWeather
-import de.dreier.mytargets.features.training.environment.EnvironmentActivity
 import de.dreier.mytargets.features.training.environment.Locator
 import de.dreier.mytargets.features.training.environment.WeatherService
 import de.dreier.mytargets.shared.models.Environment
+import de.dreier.mytargets.utils.Utils
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import java.io.IOException
 
 class EnvironmentSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null
 ) : ImageSelectorBase<Environment>(context, attrs, ENVIRONMENT_REQUEST_CODE, R.string.environment) {
@@ -72,19 +74,21 @@ class EnvironmentSelector @JvmOverloads constructor(context: Context, attrs: Att
     }
 
     // Start getting weather for current location
-    @SuppressLint("MissingPermission")
+    @SuppressLint("MissingPermission", "SupportAnnotationUsage")
     @RequiresPermission(anyOf = [ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION])
     private fun queryWeatherInfo(context: Context?) {
         setItem(null)
         Locator(context!!).getLocation(Locator.Method.NETWORK_THEN_GPS, object : Locator.Listener {
-            override fun onLocationFound(location: Location?) {
+            override fun onLocationFound(location: Location) {
+                val locationStr = getAddressFromLocation(location.latitude, location.longitude)
                 val weatherService = WeatherService()
                 val weatherCall = weatherService
-                        .fetchCurrentWeather(location!!.longitude, location.latitude)
+                        .fetchCurrentWeather(location.longitude, location.latitude)
                 weatherCall.enqueue(object : Callback<CurrentWeather> {
                     override fun onResponse(call: Call<CurrentWeather>, response: Response<CurrentWeather>) {
                         if (response.isSuccessful && response.body()!!.httpCode == 200) {
-                            setItem(response.body()!!.toEnvironment())
+                            val toEnvironment = response.body()!!.toEnvironment()
+                            setItem(toEnvironment.copy(location = locationStr ?: toEnvironment.location))
                         } else {
                             setDefaultWeather()
                         }
@@ -102,6 +106,25 @@ class EnvironmentSelector @JvmOverloads constructor(context: Context, attrs: Att
         })
     }
 
+    private fun getAddressFromLocation(latitude: Double, longitude: Double): String? {
+        val geoCoder = Geocoder(context, Utils.getCurrentLocale(context))
+
+        return try {
+            val addresses = geoCoder.getFromLocation(latitude, longitude, 1)
+
+            if (addresses.size > 0) {
+                val fetchedAddress = addresses[0]
+                "${fetchedAddress.locality}, ${fetchedAddress.subLocality}"
+            } else {
+                null
+            }
+        } catch (e: IOException) {
+            e.printStackTrace()
+            null
+        }
+
+    }
+
     private fun setDefaultWeather() {
         setItem(Environment.getDefault(SettingsManager.indoor))
     }

From c7156d4e4226f7c8bcc1787c470132a20c15f5cd Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Thu, 4 Jan 2018 10:36:06 +0100
Subject: [PATCH 006/102] Got rid of static FileUtils methods

---
 .../test/utils/ImageCaptureStubbingUtils.kt   |  9 ++--
 .../fragments/EditWithImageFragmentBase.kt    |  5 +-
 .../mytargets/base/gallery/GalleryActivity.kt |  4 +-
 .../de/dreier/mytargets/shared/AppDatabase.kt |  8 +--
 .../mytargets/shared/utils/FileUtils.kt       | 49 +++++--------------
 5 files changed, 23 insertions(+), 52 deletions(-)

diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/ImageCaptureStubbingUtils.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/ImageCaptureStubbingUtils.kt
index f956c2668..6b8a76e62 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/ImageCaptureStubbingUtils.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/ImageCaptureStubbingUtils.kt
@@ -22,7 +22,6 @@ import android.content.Intent
 import android.net.Uri
 import android.provider.MediaStore
 import android.support.test.runner.intent.IntentStubberRegistry
-import de.dreier.mytargets.shared.utils.FileUtils
 import java.io.IOException
 
 object ImageCaptureStubbingUtils {
@@ -46,11 +45,11 @@ object ImageCaptureStubbingUtils {
 
     private fun saveMockToUri(context: Context, mockedImage: Int, uriToSaveImage: Uri) {
         try {
-            val testRes = context.resources
-            val ts = testRes.openRawResource(mockedImage)
-            val stream = context.contentResolver
+            val testResources = context.resources
+            val inputStream = testResources.openRawResource(mockedImage)
+            val outputStream = context.contentResolver
                     .openOutputStream(uriToSaveImage)
-            FileUtils.copy(ts, stream!!)
+            inputStream.copyTo(outputStream)
         } catch (e: IOException) {
             e.printStackTrace()
         }
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
index 789887480..62fa1b1e6 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
@@ -34,7 +34,7 @@ import de.dreier.mytargets.R
 import de.dreier.mytargets.databinding.FragmentEditImageBinding
 import de.dreier.mytargets.shared.models.Thumbnail
 import de.dreier.mytargets.shared.models.db.Image
-import de.dreier.mytargets.shared.utils.FileUtils
+import de.dreier.mytargets.shared.utils.moveTo
 import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.Utils
 import permissions.dispatcher.NeedsPermission
@@ -198,11 +198,10 @@ abstract class EditWithImageFragmentBase<T : Image> protected constructor(
                 oldImageFile = imageFile
                 imageFile = File
                         .createTempFile("img", oldImageFile!!.name, context!!.filesDir)
-                FileUtils.copy(oldImageFile!!, imageFile!!)
+                oldImageFile!!.moveTo(imageFile!!)
             } catch (e: IOException) {
                 e.printStackTrace()
             }
-
         }
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
index 38c18a50a..4a18364f6 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
@@ -34,8 +34,8 @@ import de.dreier.mytargets.base.activities.ChildActivityBase
 import de.dreier.mytargets.base.gallery.adapters.HorizontalListAdapters
 import de.dreier.mytargets.base.gallery.adapters.ViewPagerAdapter
 import de.dreier.mytargets.databinding.ActivityGalleryBinding
-import de.dreier.mytargets.shared.utils.FileUtils
 import de.dreier.mytargets.shared.utils.ImageList
+import de.dreier.mytargets.shared.utils.moveTo
 import de.dreier.mytargets.shared.utils.toUri
 import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.Utils
@@ -229,7 +229,7 @@ class GalleryActivity : ChildActivityBase() {
                     try {
                         val internal = File.createTempFile("img", file.name, filesDir)
                         internalFiles.add(internal.name)
-                        FileUtils.move(file, internal)
+                        file.moveTo(internal)
                     } catch (e: IOException) {
                         e.printStackTrace()
                     }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
index 11f7e1941..f5c331dc0 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
@@ -25,8 +25,8 @@ import de.dreier.mytargets.shared.models.db.ArrowImage
 import de.dreier.mytargets.shared.models.db.BowImage
 import de.dreier.mytargets.shared.models.db.EndImage
 import de.dreier.mytargets.shared.models.db.Image
-import de.dreier.mytargets.shared.utils.FileUtils
 import de.dreier.mytargets.shared.utils.StandardRoundFactory
+import de.dreier.mytargets.shared.utils.moveTo
 import java.io.File
 import java.io.IOException
 
@@ -85,7 +85,7 @@ object AppDatabase {
                     try {
                         imageFile = File
                                 .createTempFile("img", imageFromSomewhere.name, filesDir)
-                        FileUtils.move(imageFromSomewhere, imageFile)
+                        imageFromSomewhere.moveTo(imageFile)
                         image.fileName = imageFile.name
                         image.save(database)
                     } catch (e: IOException) {
@@ -158,7 +158,7 @@ object AppDatabase {
                 val fileName = cur.getString(0)
                 try {
                     val file = File.createTempFile("img_", ".png", filesDir)
-                    FileUtils.copy(File(fileName), file)
+                    File(fileName).copyTo(file)
                     database.execSQL(
                             "UPDATE BOW SET image=\"" + file.name + "\" WHERE image=\"" +
                                     fileName + "\"")
@@ -175,7 +175,7 @@ object AppDatabase {
                 val fileName = cur.getString(0)
                 try {
                     val file = File.createTempFile("img_", ".png", filesDir)
-                    FileUtils.copy(File(fileName), file)
+                    File(fileName).copyTo(file)
                     database.execSQL(
                             "UPDATE ARROW SET image=\"" + file.name + "\" WHERE image=\"" +
                                     fileName + "\"")
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/FileUtils.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/FileUtils.kt
index 9d602306b..5cabf5fa4 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/FileUtils.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/FileUtils.kt
@@ -18,46 +18,19 @@ package de.dreier.mytargets.shared.utils
 import android.content.Context
 import android.net.Uri
 import android.support.v4.content.FileProvider
-import java.io.*
+import java.io.File
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
 
-object FileUtils {
-    @Throws(IOException::class)
-    fun copy(src: File, dst: File) {
-        val inStream = FileInputStream(src)
-        val outStream = FileOutputStream(dst)
-        val inChannel = inStream.channel
-        val outChannel = outStream.channel
-        inChannel.transferTo(0, inChannel.size(), outChannel)
-        inStream.close()
-        outStream.close()
-    }
-
-    @Throws(IOException::class)
-    fun copy(inputStream: InputStream, dst: File) {
-        copy(inputStream, FileOutputStream(dst))
-    }
-
-    @Throws(IOException::class)
-    fun copy(inputStream: InputStream, out: OutputStream) {
-        val buf = ByteArray(1024)
-        var len: Int = inputStream.read(buf)
-        while (len > 0) {
-            out.write(buf, 0, len)
-            len = inputStream.read(buf)
-        }
-        inputStream.close()
-        out.close()
-    }
-
-    @Throws(IOException::class)
-    fun move(from: File, to: File) {
-        val directory = to.parentFile
-        if (!directory.exists()) {
-            directory.mkdir()
-        }
-        copy(from, to)
-        from.delete()
+@Throws(IOException::class)
+fun File.moveTo(to: File) {
+    val directory = to.parentFile
+    if (!directory.exists()) {
+        directory.mkdir()
     }
+    copyTo(to)
+    delete()
 }
 
 fun File.toUri(context: Context): Uri {

From c4f297d74141ffb2282c7a3b1350db5a0b22e175 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Thu, 4 Jan 2018 12:15:30 +0100
Subject: [PATCH 007/102] Git rid of OnItemSelectedListener

Flattened fragment inheritance hirarchy
Moved setResult to NavigationController
---
 .../base/activities/ItemSelectActivity.kt     | 37 -------------
 .../base/fragments/EditFragmentBase.kt        |  4 +-
 .../base/fragments/EditableListFragment.kt    | 34 ------------
 .../fragments/EditableListFragmentBase.kt     |  8 ++-
 .../base/fragments/ItemActionModeCallback.kt  |  4 +-
 .../base/fragments/ListFragmentBase.kt        | 55 -------------------
 .../base/fragments/SelectItemFragmentBase.kt  | 23 +++-----
 .../mytargets/base/gallery/GalleryActivity.kt | 13 +----
 .../base/navigation/NavigationController.kt   | 45 +++++++++++----
 .../features/arrows/ArrowListActivity.kt      |  5 +-
 .../features/arrows/ArrowListFragment.kt      |  2 +-
 .../features/arrows/EditArrowListFragment.kt  |  6 +-
 .../features/bows/BowListActivity.kt          |  5 +-
 .../features/bows/BowListFragment.kt          |  4 +-
 .../features/bows/EditBowFragment.kt          |  9 +--
 .../features/bows/EditBowListFragment.kt      |  7 ++-
 .../features/distance/DistanceActivity.kt     |  5 +-
 .../features/distance/DistanceFragment.kt     |  2 +-
 .../features/distance/DistanceGridFragment.kt |  9 +--
 .../features/training/RoundFragment.kt        |  6 +-
 .../training/details/TrainingFragment.kt      |  5 +-
 .../training/edit/EditTrainingFragment.kt     |  4 +-
 .../environment/EnvironmentActivity.kt        |  5 +-
 .../environment/EnvironmentFragment.kt        | 36 +++---------
 .../environment/WindDirectionActivity.kt      |  5 +-
 .../environment/WindDirectionListFragment.kt  |  2 +-
 .../training/environment/WindSpeedActivity.kt |  5 +-
 .../environment/WindSpeedListFragment.kt      |  2 +-
 .../EditStandardRoundFragment.kt              | 16 +++---
 .../standardround/StandardRoundActivity.kt    |  5 +-
 .../StandardRoundListFragment.kt              |  4 +-
 .../training/target/TargetActivity.kt         |  5 +-
 .../training/target/TargetListFragment.kt     |  2 +-
 .../mytargets/views/selector/SelectorBase.kt  | 18 +++---
 34 files changed, 126 insertions(+), 271 deletions(-)
 delete mode 100644 app/src/main/java/de/dreier/mytargets/base/activities/ItemSelectActivity.kt
 delete mode 100644 app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragment.kt
 delete mode 100644 app/src/main/java/de/dreier/mytargets/base/fragments/ListFragmentBase.kt

diff --git a/app/src/main/java/de/dreier/mytargets/base/activities/ItemSelectActivity.kt b/app/src/main/java/de/dreier/mytargets/base/activities/ItemSelectActivity.kt
deleted file mode 100644
index d0184f346..000000000
--- a/app/src/main/java/de/dreier/mytargets/base/activities/ItemSelectActivity.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2017 Florian Dreier
- *
- * This file is part of MyTargets.
- *
- * MyTargets is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * MyTargets is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-package de.dreier.mytargets.base.activities
-
-import android.app.Activity
-import android.content.Intent
-import android.os.Parcelable
-
-import de.dreier.mytargets.base.fragments.ListFragmentBase
-
-abstract class ItemSelectActivity : SimpleFragmentActivityBase(), ListFragmentBase.OnItemSelectedListener {
-
-    override fun onItemSelected(item: Parcelable) {
-        val data = Intent()
-        data.putExtra(ITEM, item)
-        data.putExtra(INTENT, if (intent != null) intent.extras else null)
-        setResult(Activity.RESULT_OK, data)
-    }
-
-    companion object {
-        const val ITEM = "item"
-        const val INTENT = "intent"
-    }
-
-}
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditFragmentBase.kt
index c9e0ee687..11f8f07e3 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/EditFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/EditFragmentBase.kt
@@ -14,11 +14,9 @@
  */
 package de.dreier.mytargets.base.fragments
 
-import android.app.Activity
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
-
 import de.dreier.mytargets.R
 
 abstract class EditFragmentBase : FragmentBase() {
@@ -29,7 +27,7 @@ abstract class EditFragmentBase : FragmentBase() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == R.id.action_save) {
-            activity!!.setResult(Activity.RESULT_OK)
+            navigationController.setResultSuccess()
             onSave()
             return true
         }
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragment.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragment.kt
deleted file mode 100644
index d9eeb5045..000000000
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragment.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2017 Florian Dreier
- *
- * This file is part of MyTargets.
- *
- * MyTargets is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * MyTargets is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-package de.dreier.mytargets.base.fragments
-
-import android.os.Parcelable
-import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
-import de.dreier.mytargets.shared.models.IIdSettable
-
-abstract class EditableListFragment<T> : EditableListFragmentBase<T, SimpleListAdapterBase<T>>() where T : IIdSettable, T : Parcelable, T : Comparable<T> {
-
-    override fun onSelected(item: T) {
-        if (listener == null) {
-            onItemSelected(item)
-        } else {
-            listener!!.onItemSelected(item)
-            finish()
-        }
-    }
-
-    protected abstract fun onItemSelected(item: T)
-}
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
index ae37e3ee9..1a7a1b6cb 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
@@ -23,13 +23,19 @@ import de.dreier.mytargets.R
 import de.dreier.mytargets.base.adapters.ListAdapterBase
 import de.dreier.mytargets.shared.models.IIdSettable
 import de.dreier.mytargets.utils.multiselector.MultiSelector
+import de.dreier.mytargets.utils.multiselector.OnItemClickListener
 import de.dreier.mytargets.utils.multiselector.OnItemLongClickListener
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 
 /**
  * @param <T> Model of the item which is managed within the fragment.
 </T> */
-abstract class EditableListFragmentBase<T, U : ListAdapterBase<*, T>> : ListFragmentBase<T, U>(), OnItemLongClickListener<T> where T : IIdSettable {
+abstract class EditableListFragmentBase<T, U : ListAdapterBase<*, T>> : FragmentBase(), OnItemClickListener<T>, OnItemLongClickListener<T> where T : IIdSettable {
+
+    /**
+     * Adapter for the fragment's RecyclerView
+     */
+    protected var adapter: U? = null
 
     var selector = MultiSelector()
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/ItemActionModeCallback.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/ItemActionModeCallback.kt
index dc9aa34ac..41ce5d879 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/ItemActionModeCallback.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/ItemActionModeCallback.kt
@@ -32,7 +32,7 @@ typealias DeleteCallback = (List<Long>) -> Unit
 typealias StatisticsCallback = (List<Long>) -> Unit
 
 class ItemActionModeCallback(
-        private val fragment: ListFragmentBase<*, *>,
+        private val fragment: FragmentBase,
         private val selector: MultiSelector,
         @PluralsRes private val itemTitleRes: Int
 ) : ActionMode.Callback {
@@ -92,7 +92,7 @@ class ItemActionModeCallback(
 
     fun longClick(holder: SelectableViewHolder<*>) {
         if (actionMode == null) {
-            val activity = fragment.getActivity() as AppCompatActivity?
+            val activity = fragment.activity as AppCompatActivity?
             activity!!.startSupportActionMode(this)
         }
         selector.setSelected(holder, true)
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/ListFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/ListFragmentBase.kt
deleted file mode 100644
index fc1240a91..000000000
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/ListFragmentBase.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2017 Florian Dreier
- *
- * This file is part of MyTargets.
- *
- * MyTargets is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * MyTargets is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-package de.dreier.mytargets.base.fragments
-
-import android.content.Context
-import android.os.Parcelable
-
-import de.dreier.mytargets.base.adapters.ListAdapterBase
-import de.dreier.mytargets.utils.multiselector.OnItemClickListener
-
-abstract class ListFragmentBase<T, U : ListAdapterBase<*, T>> : FragmentBase(), OnItemClickListener<T> {
-
-    /**
-     * Listener which gets called when item gets selected
-     */
-    protected var listener: OnItemSelectedListener? = null
-
-    /**
-     * Adapter for the fragment's RecyclerView
-     */
-    protected var adapter: U? = null
-
-    override fun onAttach(context: Context?) {
-        super.onAttach(context)
-        activity?.let {
-            if(it is OnItemSelectedListener) {
-                listener = it
-            }
-        }
-    }
-
-    /**
-     * Used for communicating item selection
-     */
-    interface OnItemSelectedListener {
-        /**
-         * Called when a item has been selected.
-         *
-         * @param item Item that has been selected
-         */
-        fun onItemSelected(item: Parcelable)
-    }
-}
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt
index 70001ae1b..607f58c1d 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.base.fragments
 
-import android.content.Context
 import android.os.Bundle
 import android.os.Parcelable
 import android.support.v7.widget.LinearLayoutManager
@@ -25,19 +24,21 @@ import de.dreier.mytargets.base.adapters.ListAdapterBase
 import de.dreier.mytargets.shared.models.IIdProvider
 import de.dreier.mytargets.utils.SingleSelectorBundler
 import de.dreier.mytargets.utils.multiselector.ItemBindingHolder
+import de.dreier.mytargets.utils.multiselector.OnItemClickListener
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 import de.dreier.mytargets.utils.multiselector.SingleSelector
-import junit.framework.Assert
 
 /**
  * Base class for handling single item selection
  *
- *
- * Parent activity must implement [OnItemSelectedListener].
- *
  * @param <T> Model of the item which is managed within the fragment.
 </T> */
-abstract class SelectItemFragmentBase<T, U : ListAdapterBase<out ItemBindingHolder<*>, T>> : ListFragmentBase<T, U>() where T : IIdProvider, T : Comparable<T>, T : Parcelable {
+abstract class SelectItemFragmentBase<T, U : ListAdapterBase<out ItemBindingHolder<*>, T>> : FragmentBase(), OnItemClickListener<T> where T : IIdProvider, T : Comparable<T>, T : Parcelable {
+
+    /**
+     * Adapter for the fragment's RecyclerView
+     */
+    protected var adapter: U? = null
 
     /**
      * Selector which manages the item selection
@@ -79,14 +80,6 @@ abstract class SelectItemFragmentBase<T, U : ListAdapterBase<out ItemBindingHold
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    override fun onAttach(context: Context?) {
-        super.onAttach(context)
-        Assert.assertNotNull(listener)
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -103,7 +96,7 @@ abstract class SelectItemFragmentBase<T, U : ListAdapterBase<out ItemBindingHold
      * Returns the selected item to the calling activity. The item is retrieved by calling onSave().
      */
     protected fun saveItem() {
-        listener!!.onItemSelected(onSave())
+        navigationController.setResultSuccess(onSave())
     }
 
     /**
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
index 4a18364f6..35e24bce0 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
@@ -17,7 +17,6 @@ package de.dreier.mytargets.base.gallery
 
 import android.Manifest
 import android.annotation.SuppressLint
-import android.app.Activity
 import android.content.Intent
 import android.databinding.DataBindingUtil
 import android.os.AsyncTask
@@ -33,6 +32,7 @@ import de.dreier.mytargets.R
 import de.dreier.mytargets.base.activities.ChildActivityBase
 import de.dreier.mytargets.base.gallery.adapters.HorizontalListAdapters
 import de.dreier.mytargets.base.gallery.adapters.ViewPagerAdapter
+import de.dreier.mytargets.base.navigation.NavigationController
 import de.dreier.mytargets.databinding.ActivityGalleryBinding
 import de.dreier.mytargets.shared.utils.ImageList
 import de.dreier.mytargets.shared.utils.moveTo
@@ -170,13 +170,7 @@ class GalleryActivity : ChildActivityBase() {
     }
 
     private fun updateResult() {
-        setResult(Activity.RESULT_OK, wrap(imageList!!))
-    }
-
-    private fun wrap(imageList: ImageList): Intent {
-        val i = Intent()
-        i.putExtra(RESULT_IMAGES, imageList)
-        return i
+        navigationController.setResultSuccess(imageList!!)
     }
 
     public override fun onSaveInstanceState(outState: Bundle?) {
@@ -261,12 +255,11 @@ class GalleryActivity : ChildActivityBase() {
     }
 
     companion object {
-        const val RESULT_IMAGES = "images"
         const val EXTRA_IMAGES = "images"
         const val EXTRA_TITLE = "title"
 
         fun getResult(data: Intent): ImageList {
-            return data.getParcelableExtra(RESULT_IMAGES)
+            return data.getParcelableExtra(NavigationController.ITEM)
         }
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt b/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
index 56de28c56..629742f84 100644
--- a/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
@@ -16,10 +16,11 @@
 package de.dreier.mytargets.base.navigation
 
 import android.app.Activity
+import android.content.Intent
+import android.os.Parcelable
 import android.support.design.widget.FloatingActionButton
 import android.support.v4.app.Fragment
 import android.support.v7.preference.PreferenceFragmentCompat
-import de.dreier.mytargets.base.activities.ItemSelectActivity
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase
 import de.dreier.mytargets.base.gallery.GalleryActivity
 import de.dreier.mytargets.features.arrows.ArrowListActivity
@@ -197,12 +198,12 @@ class NavigationController(
 
     fun navigateToEditStandardRound(item: AugmentedStandardRound): IntentWrapper {
         return IntentWrapper(activity, fragment, EditStandardRoundActivity::class.java)
-                .with(ItemSelectActivity.ITEM, item)
+                .with(ITEM, item)
     }
 
     fun navigateToDistance(item: Dimension, index: Int, requestCode: Int = DistanceSelector.DISTANCE_REQUEST_CODE) {
         IntentWrapper(activity, fragment, DistanceActivity::class.java)
-                .with(ItemSelectActivity.ITEM, item)
+                .with(ITEM, item)
                 .with(SelectorBase.INDEX, index)
                 .forResult(requestCode)
                 .start()
@@ -210,7 +211,7 @@ class NavigationController(
 
     fun navigateToTarget(item: Target, index: Int = -1, requestCode: Int = TargetSelector.TARGET_REQUEST_CODE, fixedType: TargetListFragment.EFixedType = TargetListFragment.EFixedType.NONE) {
         IntentWrapper(activity, fragment, TargetActivity::class.java)
-                .with(ItemSelectActivity.ITEM, item)
+                .with(ITEM, item)
                 .with(SelectorBase.INDEX, index)
                 .with(TargetListFragment.FIXED_TYPE, fixedType.name)
                 .forResult(requestCode)
@@ -219,46 +220,65 @@ class NavigationController(
 
     fun navigateToStandardRoundList(currentSelection: StandardRound, requestCode: Int = StandardRoundSelector.STANDARD_ROUND_REQUEST_CODE) {
         IntentWrapper(activity, fragment, StandardRoundActivity::class.java)
-                .with(ItemSelectActivity.ITEM, currentSelection)
+                .with(ITEM, currentSelection)
                 .forResult(requestCode)
                 .start()
     }
 
     fun navigateToArrowList(currentSelection: Arrow, requestCode: Int = ArrowSelector.ARROW_REQUEST_CODE) {
         IntentWrapper(activity, fragment, ArrowListActivity::class.java)
-                .with(ItemSelectActivity.ITEM, currentSelection)
+                .with(ITEM, currentSelection)
                 .forResult(requestCode)
                 .start()
     }
 
     fun navigateToBowList(currentSelection: Bow, requestCode: Int = BowSelector.BOW_REQUEST_CODE) {
         IntentWrapper(activity, fragment, BowListActivity::class.java)
-                .with(ItemSelectActivity.ITEM, currentSelection)
+                .with(ITEM, currentSelection)
                 .forResult(requestCode)
                 .start()
     }
 
     fun navigateToEnvironment(item: Environment, requestCode: Int = EnvironmentSelector.ENVIRONMENT_REQUEST_CODE) {
         IntentWrapper(activity, fragment, EnvironmentActivity::class.java)
-                .with(ItemSelectActivity.ITEM, item)
+                .with(ITEM, item)
                 .forResult(requestCode)
                 .start()
     }
 
     fun navigateToWindDirection(selectedItem: WindDirection, requestCode: Int = WindDirectionSelector.WIND_DIRECTION_REQUEST_CODE) {
         IntentWrapper(activity, fragment, WindDirectionActivity::class.java)
-                .with(ItemSelectActivity.ITEM, selectedItem)
+                .with(ITEM, selectedItem)
                 .forResult(requestCode)
                 .start()
     }
 
     fun navigateToWindSpeed(selectedItem: WindSpeed, requestCode: Int = WindSpeedSelector.WIND_SPEED_REQUEST_CODE) {
         IntentWrapper(activity, fragment, WindSpeedActivity::class.java)
-                .with(ItemSelectActivity.ITEM, selectedItem)
+                .with(ITEM, selectedItem)
                 .forResult(requestCode)
                 .start()
     }
 
+    fun setResultSuccess() {
+        activity.setResult(Activity.RESULT_OK)
+    }
+
+    fun setResultSuccess(intent: Intent) {
+        activity.setResult(Activity.RESULT_OK, intent)
+    }
+
+    fun setResultSuccess(data: Parcelable) {
+        val intent = Intent()
+        intent.putExtra(ITEM, data)
+        intent.putExtra(INTENT, activity.intent?.extras)
+        setResultSuccess(intent)
+    }
+
+    fun setResult(resultCode: Int) {
+        activity.setResult(resultCode)
+    }
+
 //    fun navigateToSearch() {
 //        val searchFragment = SearchFragment()
 //        fragmentManager.beginTransaction()
@@ -283,4 +303,9 @@ class NavigationController(
 //                .addToBackStack(null)
 //                .commitAllowingStateLoss()
 //    }
+
+    companion object {
+        const val ITEM = "item"
+        const val INTENT = "intent"
+    }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListActivity.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListActivity.kt
index 9a759f57e..bdb46f6d6 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListActivity.kt
@@ -16,10 +16,9 @@
 package de.dreier.mytargets.features.arrows
 
 import android.support.v4.app.Fragment
+import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
-import de.dreier.mytargets.base.activities.ItemSelectActivity
-
-class ArrowListActivity : ItemSelectActivity() {
+class ArrowListActivity : SimpleFragmentActivityBase() {
 
     public override fun instantiateFragment(): Fragment {
         return ArrowListFragment()
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
index 4f42affd1..fc5e0f889 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
@@ -16,9 +16,9 @@
 package de.dreier.mytargets.features.arrows
 
 import android.os.Bundle
-import de.dreier.mytargets.base.activities.ItemSelectActivity.Companion.ITEM
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.base.fragments.SelectPureListItemFragmentBase
+import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
 import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
index 1cb748962..86c25a3cc 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
@@ -23,7 +23,7 @@ import android.view.View
 import android.view.ViewGroup
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
-import de.dreier.mytargets.base.fragments.EditableListFragment
+import de.dreier.mytargets.base.fragments.EditableListFragmentBase
 import de.dreier.mytargets.base.fragments.ItemActionModeCallback
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.databinding.FragmentArrowsBinding
@@ -34,7 +34,7 @@ import de.dreier.mytargets.utils.DividerItemDecoration
 import de.dreier.mytargets.utils.SlideInItemAnimator
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 
-class EditArrowListFragment : EditableListFragment<Arrow>() {
+class EditArrowListFragment : EditableListFragmentBase<Arrow, SimpleListAdapterBase<Arrow>>() {
 
     private lateinit var binding: FragmentArrowsBinding
 
@@ -79,7 +79,7 @@ class EditArrowListFragment : EditableListFragment<Arrow>() {
                 .start()
     }
 
-    override fun onItemSelected(item: Arrow) {
+    override fun onSelected(item: Arrow) {
         navigationController.navigateToEditArrow(item.id)
                 .start()
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowListActivity.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowListActivity.kt
index bc7356115..640b6ed97 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowListActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowListActivity.kt
@@ -16,10 +16,9 @@
 package de.dreier.mytargets.features.bows
 
 import android.support.v4.app.Fragment
+import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
-import de.dreier.mytargets.base.activities.ItemSelectActivity
-
-class BowListActivity : ItemSelectActivity() {
+class BowListActivity : SimpleFragmentActivityBase() {
 
     public override fun instantiateFragment(): Fragment {
         return BowListFragment()
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
index 696e781c4..dbd14c74c 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
@@ -16,10 +16,9 @@
 package de.dreier.mytargets.features.bows
 
 import android.os.Bundle
-import de.dreier.mytargets.base.activities.ItemSelectActivity.Companion.ITEM
-import de.dreier.mytargets.base.fragments.FragmentBase
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.base.fragments.SelectPureListItemFragmentBase
+import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
 import de.dreier.mytargets.shared.models.db.Bow
 
 class BowListFragment : SelectPureListItemFragmentBase<Bow>() {
@@ -32,4 +31,5 @@ class BowListFragment : SelectPureListItemFragmentBase<Bow>() {
             selectItem(binding.recyclerView, bow!!)
         }
     }
+
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
index 4372ed706..a7700a28b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
@@ -27,10 +27,11 @@ import android.view.View
 import android.view.ViewGroup
 import com.evernote.android.state.State
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.activities.ItemSelectActivity
 import de.dreier.mytargets.base.adapters.dynamicitem.DynamicItemAdapter
 import de.dreier.mytargets.base.adapters.dynamicitem.DynamicItemHolder
 import de.dreier.mytargets.base.fragments.EditWithImageFragmentBase
+import de.dreier.mytargets.base.navigation.NavigationController.Companion.INTENT
+import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
 import de.dreier.mytargets.databinding.FragmentEditBowBinding
 import de.dreier.mytargets.databinding.ItemSightMarkBinding
 import de.dreier.mytargets.shared.models.Dimension
@@ -112,9 +113,9 @@ class EditBowFragment : EditWithImageFragmentBase<BowImage>(R.drawable.recurve_b
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (resultCode == Activity.RESULT_OK && requestCode == SimpleDistanceSelector.SIMPLE_DISTANCE_REQUEST_CODE && data != null) {
-            val intentData = data.getBundleExtra(ItemSelectActivity.INTENT)
+            val intentData = data.getBundleExtra(INTENT)
             val index = intentData.getInt(SelectorBase.INDEX)
-            val parcelable = data.getParcelableExtra<Dimension>(ItemSelectActivity.ITEM)
+            val parcelable = data.getParcelableExtra<Dimension>(ITEM)
             sightMarks[index].distance = parcelable
             adapter.notifyItemChanged(index)
         }
@@ -179,7 +180,7 @@ class EditBowFragment : EditWithImageFragmentBase<BowImage>(R.drawable.recurve_b
             binding.distance.setOnClickListener { selectedItem, index ->
                 navigationController.navigateToDistance(selectedItem!!, index, SimpleDistanceSelector.SIMPLE_DISTANCE_REQUEST_CODE)
             }
-            binding.distance.setItemIndex(position)
+            binding.distance.itemIndex = position
             binding.distance.setItem(item.distance)
             binding.sightSetting.setText(item.value)
             binding.removeSightSetting.setOnClickListener(removeListener)
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
index 8a145061d..bbcaff88f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
@@ -23,7 +23,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.fragments.EditableListFragment
+import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
+import de.dreier.mytargets.base.fragments.EditableListFragmentBase
 import de.dreier.mytargets.base.fragments.ItemActionModeCallback
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.databinding.FragmentBowsBinding
@@ -33,7 +34,7 @@ import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.utils.DividerItemDecoration
 import de.dreier.mytargets.utils.SlideInItemAnimator
 
-class EditBowListFragment : EditableListFragment<Bow>() {
+class EditBowListFragment : EditableListFragmentBase<Bow, SimpleListAdapterBase<Bow>>() {
 
     private lateinit var binding: FragmentBowsBinding
 
@@ -85,7 +86,7 @@ class EditBowListFragment : EditableListFragment<Bow>() {
         navigationController.navigateToEditBow(itemId)
     }
 
-    override fun onItemSelected(item: Bow) {
+    override fun onSelected(item: Bow) {
         navigationController.navigateToEditBow(item.id)
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceActivity.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceActivity.kt
index 85c3a254e..0ad81feb1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceActivity.kt
@@ -16,10 +16,9 @@
 package de.dreier.mytargets.features.distance
 
 import android.support.v4.app.Fragment
+import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
-import de.dreier.mytargets.base.activities.ItemSelectActivity
-
-class DistanceActivity : ItemSelectActivity() {
+class DistanceActivity : SimpleFragmentActivityBase() {
     override fun instantiateFragment(): Fragment {
         return DistanceFragment()
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceFragment.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceFragment.kt
index 1185953aa..4c9528263 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceFragment.kt
@@ -22,7 +22,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.activities.ItemSelectActivity.Companion.ITEM
+import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
 import de.dreier.mytargets.databinding.FragmentDistanceBinding
 import de.dreier.mytargets.shared.models.Dimension
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
index 942059b1a..2a62e1199 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
@@ -22,10 +22,10 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.activities.ItemSelectActivity.Companion.ITEM
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.base.fragments.SelectItemFragmentBase
+import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
 import de.dreier.mytargets.databinding.FragmentListBinding
 import de.dreier.mytargets.databinding.ItemDistanceBinding
 import de.dreier.mytargets.shared.models.Dimension
@@ -62,12 +62,11 @@ class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapter
         var distance = this.distance
         try {
             val distanceVal = Integer.parseInt(input.replace("[^0-9]".toRegex(), ""))
-            distance = Dimension(distanceVal.toFloat(), unit)
+            distance = Dimension(distanceVal.toFloat(), unit) //TODO
         } catch (e: NumberFormatException) {
             // leave distance as it is
         }
-
-        listener?.onItemSelected(distance!!)
+        navigationController.setResultSuccess(distance!!)
         finish()
     }
 
@@ -80,7 +79,6 @@ class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapter
     }
 
     private inner class DistanceAdapter : SimpleListAdapterBase<Dimension>() {
-
         public override fun onCreateViewHolder(parent: ViewGroup): ViewHolder {
             val itemView = LayoutInflater.from(parent.context)
                     .inflate(R.layout.item_distance, parent, false)
@@ -109,5 +107,4 @@ class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapter
             return fragment
         }
     }
-
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
index 2e534848c..0541f3b1b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
@@ -24,7 +24,7 @@ import android.view.*
 import com.afollestad.materialdialogs.MaterialDialog
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
-import de.dreier.mytargets.base.fragments.EditableListFragment
+import de.dreier.mytargets.base.fragments.EditableListFragmentBase
 import de.dreier.mytargets.base.fragments.ItemActionModeCallback
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.databinding.FragmentListBinding
@@ -43,7 +43,7 @@ import java.util.*
 /**
  * Shows all ends of one round
  */
-class RoundFragment : EditableListFragment<End>() {
+class RoundFragment : EditableListFragmentBase<End, SimpleListAdapterBase<End>>() {
 
     private var roundId: Long = 0
     private lateinit var binding: FragmentListBinding
@@ -151,7 +151,7 @@ class RoundFragment : EditableListFragment<End>() {
         }
     }
 
-    override fun onItemSelected(item: End) {
+    override fun onSelected(item: End) {
         navigationController.navigateToEditEnd(round!!, item.index)
                 .start()
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index 7b9ac8c29..2337cb906 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -25,7 +25,6 @@ import android.view.*
 import com.afollestad.materialdialogs.MaterialDialog
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
-import de.dreier.mytargets.base.fragments.EditableListFragment
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase
 import de.dreier.mytargets.base.fragments.ItemActionModeCallback
 import de.dreier.mytargets.base.fragments.LoaderUICallback
@@ -43,7 +42,7 @@ import junit.framework.Assert
 /**
  * Shows all rounds of one training.
  */
-open class TrainingFragment : EditableListFragment<Round>() {
+open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterBase<Round>>() {
 
     private val equals = BooleanArray(2)
     private lateinit var binding: FragmentTrainingBinding
@@ -170,7 +169,7 @@ open class TrainingFragment : EditableListFragment<Round>() {
         }
     }
 
-    override fun onItemSelected(item: Round) {
+    override fun onSelected(item: Round) {
         navigationController.navigateToRound(item)
                 .start()
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
index dfc837288..648326080 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
@@ -26,9 +26,9 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.widget.DatePicker
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.activities.ItemSelectActivity
 import de.dreier.mytargets.base.fragments.EditFragmentBase
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase.Companion.ITEM_ID
+import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
 import de.dreier.mytargets.databinding.FragmentEditTrainingBinding
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.features.training.ETrainingType
@@ -317,7 +317,7 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
         binding.bow.onActivityResult(requestCode, resultCode, data)
         binding.environment.onActivityResult(requestCode, resultCode, data)
         if (resultCode == Activity.RESULT_OK && requestCode == SR_TARGET_REQUEST_CODE && data != null) {
-            val target = data.getParcelableExtra<Target>(ItemSelectActivity.ITEM)
+            val target = data.getParcelableExtra<Target>(ITEM)
             val item = binding.standardRound.selectedItem
             item!!.loadRounds().forEach { it.targetTemplate = target }
             binding.standardRound.setItem(item)
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentActivity.kt
index c98f88176..18b5d8061 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentActivity.kt
@@ -16,10 +16,9 @@
 package de.dreier.mytargets.features.training.environment
 
 import android.support.v4.app.Fragment
+import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
-import de.dreier.mytargets.base.activities.ItemSelectActivity
-
-class EnvironmentActivity : ItemSelectActivity() {
+class EnvironmentActivity : SimpleFragmentActivityBase() {
     override fun instantiateFragment(): Fragment {
         return EnvironmentFragment()
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt
index a9afb6721..dd848f550 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt
@@ -14,7 +14,6 @@
  */
 package de.dreier.mytargets.features.training.environment
 
-import android.content.Context
 import android.content.Intent
 import android.databinding.DataBindingUtil
 import android.os.Bundle
@@ -22,22 +21,18 @@ import android.support.v7.widget.SwitchCompat
 import android.view.*
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.widget.ImageButton
 import com.evernote.android.state.State
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.activities.ItemSelectActivity.Companion.ITEM
 import de.dreier.mytargets.base.fragments.FragmentBase
-import de.dreier.mytargets.base.fragments.ListFragmentBase
+import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
 import de.dreier.mytargets.databinding.FragmentEnvironmentBinding
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.EWeather
 import de.dreier.mytargets.shared.models.Environment
 import de.dreier.mytargets.utils.ToolbarUtils
-import junit.framework.Assert
 
 class EnvironmentFragment : FragmentBase() {
 
-    private var listener: ListFragmentBase.OnItemSelectedListener? = null
     @State
     var environment: Environment? = null
     private lateinit var binding: FragmentEnvironmentBinding
@@ -52,15 +47,14 @@ class EnvironmentFragment : FragmentBase() {
         setHasOptionsMenu(true)
 
         // Weather
-        setOnClickWeather(binding.sunny, EWeather.SUNNY)
-        setOnClickWeather(binding.partlyCloudy, EWeather.PARTLY_CLOUDY)
-        setOnClickWeather(binding.cloudy, EWeather.CLOUDY)
-        setOnClickWeather(binding.lightRain, EWeather.LIGHT_RAIN)
-        setOnClickWeather(binding.rain, EWeather.RAIN)
+        binding.sunny.setOnClickListener { setWeather(EWeather.SUNNY) }
+        binding.partlyCloudy.setOnClickListener { setWeather(EWeather.PARTLY_CLOUDY) }
+        binding.cloudy.setOnClickListener { setWeather(EWeather.CLOUDY) }
+        binding.lightRain.setOnClickListener { setWeather(EWeather.LIGHT_RAIN) }
+        binding.rain.setOnClickListener { setWeather(EWeather.RAIN) }
 
         if (savedInstanceState == null) {
-            val i = arguments!!
-            environment = i.getParcelable(ITEM)
+            environment = arguments!!.getParcelable(ITEM)
         }
         setWeather(environment!!.weather)
         binding.windSpeed.setItemId(environment!!.windSpeed.toLong())
@@ -77,10 +71,6 @@ class EnvironmentFragment : FragmentBase() {
         return binding.root
     }
 
-    private fun setOnClickWeather(b: ImageButton, w: EWeather) {
-        b.setOnClickListener { setWeather(w) }
-    }
-
     private fun setWeather(weather: EWeather) {
         environment!!.weather = weather
         binding.sunny.setImageResource(EWeather.SUNNY.getDrawable(weather))
@@ -110,19 +100,11 @@ class EnvironmentFragment : FragmentBase() {
         super.onSaveInstanceState(outState)
     }
 
-    override fun onAttach(context: Context?) {
-        super.onAttach(context)
-        if (context is ListFragmentBase.OnItemSelectedListener) {
-            listener = context
-        }
-        Assert.assertNotNull(listener)
-    }
-
     fun onSave() {
         val e = saveItem()
-        listener?.onItemSelected(e)
-        finish()
         SettingsManager.indoor = e.indoor
+        navigationController.setResultSuccess(e)
+        finish()
     }
 
     private fun saveItem(): Environment {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionActivity.kt
index 04765bf4e..b78b8940a 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionActivity.kt
@@ -16,10 +16,9 @@
 package de.dreier.mytargets.features.training.environment
 
 import android.support.v4.app.Fragment
+import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
-import de.dreier.mytargets.base.activities.ItemSelectActivity
-
-class WindDirectionActivity : ItemSelectActivity() {
+class WindDirectionActivity : SimpleFragmentActivityBase() {
     override fun instantiateFragment(): Fragment {
         return WindDirectionListFragment()
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
index 49cef320e..2ff09c68e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
@@ -19,8 +19,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import de.dreier.mytargets.base.activities.ItemSelectActivity.Companion.ITEM
 import de.dreier.mytargets.base.fragments.SelectPureListItemFragmentBase
+import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
 import de.dreier.mytargets.shared.models.WindDirection
 
 class WindDirectionListFragment : SelectPureListItemFragmentBase<WindDirection>() {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedActivity.kt
index 93db5e03f..44e333012 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedActivity.kt
@@ -16,10 +16,9 @@
 package de.dreier.mytargets.features.training.environment
 
 import android.support.v4.app.Fragment
+import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
-import de.dreier.mytargets.base.activities.ItemSelectActivity
-
-class WindSpeedActivity : ItemSelectActivity() {
+class WindSpeedActivity : SimpleFragmentActivityBase() {
     override fun instantiateFragment(): Fragment {
         return WindSpeedListFragment()
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
index db83e6953..b8672276d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
@@ -19,9 +19,9 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import de.dreier.mytargets.base.activities.ItemSelectActivity.Companion.ITEM
 
 import de.dreier.mytargets.base.fragments.SelectPureListItemFragmentBase
+import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
 import de.dreier.mytargets.shared.models.WindSpeed
 
 class WindSpeedListFragment : SelectPureListItemFragmentBase<WindSpeed>() {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
index 8ad54eb44..f1d39f58f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
@@ -24,11 +24,11 @@ import android.view.View
 import android.view.ViewGroup
 import com.evernote.android.state.State
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.activities.ItemSelectActivity
-import de.dreier.mytargets.base.activities.ItemSelectActivity.Companion.ITEM
 import de.dreier.mytargets.base.adapters.dynamicitem.DynamicItemAdapter
 import de.dreier.mytargets.base.adapters.dynamicitem.DynamicItemHolder
 import de.dreier.mytargets.base.fragments.EditFragmentBase
+import de.dreier.mytargets.base.navigation.NavigationController.Companion.INTENT
+import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
 import de.dreier.mytargets.databinding.FragmentEditStandardRoundBinding
 import de.dreier.mytargets.databinding.ItemRoundTemplateBinding
 import de.dreier.mytargets.features.settings.SettingsManager
@@ -126,7 +126,7 @@ class EditStandardRoundFragment : EditFragmentBase() {
 
     private fun onDeleteStandardRound() {
         standardRound!!.standardRound.delete()
-        activity!!.setResult(RESULT_STANDARD_ROUND_DELETED, null)
+        navigationController.setResult(RESULT_STANDARD_ROUND_DELETED)
         finish()
     }
 
@@ -141,9 +141,7 @@ class EditStandardRoundFragment : EditFragmentBase() {
         SettingsManager.target = round.targetTemplate
         SettingsManager.distance = round.distance
 
-        val data = Intent()
-        data.putExtra(ITEM, standardRound!!.standardRound)
-        activity!!.setResult(Activity.RESULT_OK, data)
+        navigationController.setResultSuccess(standardRound!!.standardRound)
         finish()
     }
 
@@ -151,7 +149,7 @@ class EditStandardRoundFragment : EditFragmentBase() {
         super.onActivityResult(requestCode, resultCode, data)
 
         if (resultCode == Activity.RESULT_OK && data != null) {
-            val intentData = data.getBundleExtra(ItemSelectActivity.INTENT)
+            val intentData = data.getBundleExtra(INTENT)
             val index = intentData.getInt(SelectorBase.INDEX)
             when (requestCode) {
                 DistanceSelector.DISTANCE_REQUEST_CODE -> {
@@ -182,14 +180,14 @@ class EditStandardRoundFragment : EditFragmentBase() {
             binding.distance.setOnClickListener { selectedItem, index ->
                 navigationController.navigateToDistance(selectedItem!!, index, DistanceSelector.DISTANCE_REQUEST_CODE)
             }
-            binding.distance.setItemIndex(position)
+            binding.distance.itemIndex = position
             binding.distance.setItem(item.distance)
 
             // Target round
             binding.target.setOnClickListener { selectedItem, index ->
                 navigationController.navigateToTarget(selectedItem!!, index)
             }
-            binding.target.setItemIndex(position)
+            binding.target.itemIndex = position
             binding.target.setItem(item.targetTemplate)
 
             // Ends
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivity.kt
index 9552ceffc..e55910498 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivity.kt
@@ -15,10 +15,9 @@
 package de.dreier.mytargets.features.training.standardround
 
 import android.support.v4.app.Fragment
+import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
-import de.dreier.mytargets.base.activities.ItemSelectActivity
-
-class StandardRoundActivity : ItemSelectActivity() {
+class StandardRoundActivity : SimpleFragmentActivityBase() {
     override fun instantiateFragment(): Fragment {
         return StandardRoundListFragment()
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
index 690ad38eb..07a43ff88 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
@@ -28,10 +28,10 @@ import android.widget.ImageView
 import com.afollestad.materialdialogs.MaterialDialog
 import com.evernote.android.state.State
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.activities.ItemSelectActivity.Companion.ITEM
 import de.dreier.mytargets.base.adapters.header.HeaderListAdapter
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.base.fragments.SelectItemFragmentBase
+import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
 import de.dreier.mytargets.databinding.FragmentListBinding
 import de.dreier.mytargets.databinding.ItemStandardRoundBinding
 import de.dreier.mytargets.features.settings.SettingsManager
@@ -163,7 +163,7 @@ class StandardRoundListFragment : SelectItemFragmentBase<StandardRound, HeaderLi
         super.onActivityResult(requestCode, resultCode, data)
         if (resultCode == RESULT_OK && requestCode == NEW_STANDARD_ROUND && data != null) {
             persistSelection(data.getParcelableExtra(ITEM))
-            activity!!.setResult(resultCode, data)
+            navigationController.setResultSuccess(data)
             finish()
         } else if (requestCode == EDIT_STANDARD_ROUND && data != null) {
             if (resultCode == RESULT_OK) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetActivity.kt
index 7d5281e28..b9739dd54 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetActivity.kt
@@ -16,10 +16,9 @@
 package de.dreier.mytargets.features.training.target
 
 import android.support.v4.app.Fragment
+import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
-import de.dreier.mytargets.base.activities.ItemSelectActivity
-
-class TargetActivity : ItemSelectActivity() {
+class TargetActivity : SimpleFragmentActivityBase() {
     override fun instantiateFragment(): Fragment {
         return TargetListFragment()
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
index d69a7e09b..80ecfef1e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
@@ -26,10 +26,10 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.Spinner
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.activities.ItemSelectActivity.Companion.ITEM
 import de.dreier.mytargets.base.adapters.header.ExpandableListAdapter
 import de.dreier.mytargets.base.adapters.header.HeaderListAdapter
 import de.dreier.mytargets.base.fragments.SelectItemFragmentBase
+import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
 import de.dreier.mytargets.databinding.FragmentTargetSelectBinding
 import de.dreier.mytargets.databinding.ItemImageSimpleBinding
 import de.dreier.mytargets.features.training.target.TargetListFragment.EFixedType.*
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/SelectorBase.kt b/app/src/main/java/de/dreier/mytargets/views/selector/SelectorBase.kt
index a754a14a3..d0fa6f272 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/SelectorBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/SelectorBase.kt
@@ -28,8 +28,8 @@ import android.widget.LinearLayout
 import com.evernote.android.state.State
 import com.evernote.android.state.StateSaver
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.activities.ItemSelectActivity
-import de.dreier.mytargets.base.activities.ItemSelectActivity.Companion.ITEM
+import de.dreier.mytargets.base.navigation.NavigationController.Companion.INTENT
+import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
 
 typealias OnUpdateListener<T> = (T?) -> Unit
 
@@ -46,7 +46,7 @@ abstract class SelectorBase<T : Parcelable>(
     private var addButton: Button? = null
     private var progress: View? = null
     private var updateListener: OnUpdateListener<T>? = null
-    private var index = -1
+    var itemIndex = -1
 
     override fun onFinishInflate() {
         super.onFinishInflate()
@@ -67,10 +67,6 @@ abstract class SelectorBase<T : Parcelable>(
         selectedItem?.let { bindView(it) }
     }
 
-    fun setItemIndex(index: Int) {
-        this.index = index
-    }
-
     protected abstract fun bindView(item: T)
 
     fun setItem(item: T?) {
@@ -88,13 +84,13 @@ abstract class SelectorBase<T : Parcelable>(
     }
 
     fun setOnClickListener(clickListener: (T?, Int) -> Unit) {
-        view.setOnClickListener { clickListener.invoke(selectedItem, index) }
+        view.setOnClickListener { clickListener.invoke(selectedItem, itemIndex) }
     }
 
     open fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (resultCode == Activity.RESULT_OK && requestCode == this.requestCode && data != null) {
-            val intentData = data.getBundleExtra(ItemSelectActivity.INTENT)
-            if (index == -1 || intentData != null && intentData.getInt(INDEX) == index) {
+            val intentData = data.getBundleExtra(INTENT)
+            if (itemIndex == -1 || intentData != null && intentData.getInt(INDEX) == itemIndex) {
                 setItem(data.getParcelableExtra(ITEM))
             }
         }
@@ -109,6 +105,6 @@ abstract class SelectorBase<T : Parcelable>(
     }
 
     companion object {
-        const val INDEX = "index"
+        const val INDEX = "itemIndex"
     }
 }

From f1504cc8b8a4ca1c62765345d822ea2db84838e4 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Thu, 4 Jan 2018 12:54:55 +0100
Subject: [PATCH 008/102] Moved finish responsibility to NavigationController

---
 .../base/activities/ChildActivityBase.kt      | 15 +------
 .../mytargets/base/fragments/FragmentBase.kt  | 14 ------
 .../base/fragments/SelectItemFragmentBase.kt  |  2 +-
 .../mytargets/base/gallery/GalleryActivity.kt |  2 +-
 .../base/navigation/NavigationController.kt   | 24 +++++++++-
 .../features/arrows/EditArrowFragment.kt      |  2 +-
 .../features/bows/EditBowFragment.kt          |  2 +-
 .../features/distance/DistanceGridFragment.kt |  6 +--
 .../help/licences/LicencesActivity.kt         |  3 +-
 .../features/rounds/EditRoundFragment.kt      |  2 +-
 .../features/settings/SettingsActivity.kt     |  5 +--
 .../features/settings/about/AboutActivity.kt  |  3 +-
 .../features/statistics/StatisticsFragment.kt | 11 ++---
 .../training/details/TrainingFragment.kt      |  2 -
 .../training/edit/DatePickerFragment.kt       |  4 --
 .../training/edit/EditTrainingFragment.kt     |  2 +-
 .../environment/EnvironmentFragment.kt        |  2 +-
 .../EditStandardRoundFragment.kt              |  4 +-
 .../StandardRoundListFragment.kt              |  2 +-
 .../training/target/TargetListFragment.kt     | 44 +++++++++----------
 20 files changed, 66 insertions(+), 85 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/base/activities/ChildActivityBase.kt b/app/src/main/java/de/dreier/mytargets/base/activities/ChildActivityBase.kt
index 79c09ebcb..c99f595fe 100644
--- a/app/src/main/java/de/dreier/mytargets/base/activities/ChildActivityBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/activities/ChildActivityBase.kt
@@ -19,13 +19,9 @@ import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.app.AppCompatDelegate
 import android.view.MenuItem
-
 import com.google.firebase.analytics.FirebaseAnalytics
-
-import de.dreier.mytargets.R
 import de.dreier.mytargets.base.navigation.NavigationController
 import de.dreier.mytargets.features.settings.SettingsManager
-import de.dreier.mytargets.utils.Utils
 import im.delight.android.languages.Language
 
 abstract class ChildActivityBase : AppCompatActivity() {
@@ -50,7 +46,7 @@ abstract class ChildActivityBase : AppCompatActivity() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             android.R.id.home -> {
-                onBackPressed()
+                navigationController.finish()
                 true
             }
             else -> super.onOptionsItemSelected(item)
@@ -58,14 +54,7 @@ abstract class ChildActivityBase : AppCompatActivity() {
     }
 
     override fun onBackPressed() {
-        if (!supportFragmentManager.popBackStackImmediate()) {
-            if (Utils.isLollipop) {
-                finishAfterTransition()
-            } else {
-                finish()
-                overridePendingTransition(R.anim.left_in, R.anim.right_out)
-            }
-        }
+        navigationController.finish()
     }
 
     companion object {
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
index 40dd5af3f..74f263e0c 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
@@ -25,9 +25,7 @@ import android.support.v4.app.LoaderManager
 import android.support.v4.content.AsyncTaskLoader
 import android.support.v4.content.Loader
 import com.evernote.android.state.StateSaver
-import de.dreier.mytargets.R
 import de.dreier.mytargets.base.navigation.NavigationController
-import de.dreier.mytargets.utils.Utils
 
 
 typealias LoaderUICallback = () -> Unit
@@ -52,18 +50,6 @@ abstract class FragmentBase : Fragment(), LoaderManager.LoaderCallbacks<Fragment
         StateSaver.saveInstanceState(this, outState)
     }
 
-    protected fun finish() {
-        val activity = activity
-        if (activity != null) {
-            if (Utils.isLollipop) {
-                activity.finishAfterTransition()
-            } else {
-                activity.finish()
-                activity.overridePendingTransition(R.anim.left_in, R.anim.right_out)
-            }
-        }
-    }
-
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         navigationController = NavigationController(this)
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt
index 607f58c1d..5312d86c5 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt
@@ -88,7 +88,7 @@ abstract class SelectItemFragmentBase<T, U : ListAdapterBase<out ItemBindingHold
         selector.setSelected(holder, true)
         if (alreadySelected || !useDoubleClickSelection) {
             saveItem()
-            finish()
+            navigationController.finish()
         }
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
index 35e24bce0..402157b48 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
@@ -133,7 +133,7 @@ class GalleryActivity : ChildActivityBase() {
                 return true
             }
             android.R.id.home -> {
-                onBackPressed()
+                navigationController.finish()
                 return true
             }
             else -> return super.onOptionsItemSelected(item)
diff --git a/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt b/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
index 629742f84..879730f44 100644
--- a/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
@@ -20,7 +20,9 @@ import android.content.Intent
 import android.os.Parcelable
 import android.support.design.widget.FloatingActionButton
 import android.support.v4.app.Fragment
+import android.support.v7.app.AppCompatActivity
 import android.support.v7.preference.PreferenceFragmentCompat
+import de.dreier.mytargets.R
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase
 import de.dreier.mytargets.base.gallery.GalleryActivity
 import de.dreier.mytargets.features.arrows.ArrowListActivity
@@ -61,16 +63,17 @@ import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
 import de.dreier.mytargets.shared.models.db.*
 import de.dreier.mytargets.shared.utils.ImageList
 import de.dreier.mytargets.utils.IntentWrapper
+import de.dreier.mytargets.utils.Utils
 import de.dreier.mytargets.views.selector.*
 
 class NavigationController(
-        private val activity: Activity,
+        private val activity: AppCompatActivity,
         private val fragment: Fragment? = null//,
 //        private val fragmentManager: FragmentManager,
 //        private val containerId: Int = R.id.container
 ) {
 
-    constructor(fragment: Fragment) : this(fragment.activity!!, fragment)
+    constructor(fragment: Fragment) : this(fragment.activity as AppCompatActivity, fragment)
 
     fun navigateToHelp() {
         return IntentWrapper(activity, fragment, HelpActivity::class.java)
@@ -279,6 +282,23 @@ class NavigationController(
         activity.setResult(resultCode)
     }
 
+    fun finish(animate: Boolean = true) {
+        if (fragment != null || !activity.supportFragmentManager.popBackStackImmediate()) {
+            if (Utils.isLollipop) {
+                if (animate) {
+                    activity.finishAfterTransition()
+                } else {
+                    activity.finish()
+                }
+            } else {
+                activity.finish()
+                if(animate) {
+                    activity.overridePendingTransition(R.anim.left_in, R.anim.right_out)
+                }
+            }
+        }
+    }
+
 //    fun navigateToSearch() {
 //        val searchFragment = SearchFragment()
 //        fragmentManager.beginTransaction()
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
index 413b3bad9..4c3694873 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
@@ -68,7 +68,7 @@ class EditArrowFragment : EditWithImageFragmentBase<ArrowImage>(R.drawable.arrow
     public override fun onSave() {
         super.onSave()
         if (viewModel.save(thumbnail)) {
-            finish()
+            navigationController.finish()
         }
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
index a7700a28b..c0fd32ffc 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
@@ -124,7 +124,7 @@ class EditBowFragment : EditWithImageFragmentBase<BowImage>(R.drawable.recurve_b
     public override fun onSave() {
         super.onSave()
         buildBow().save()
-        finish()
+        navigationController.finish()
     }
 
     private fun buildBow(): Bow {
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
index 2a62e1199..a62f187d6 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
@@ -61,13 +61,13 @@ class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapter
     override fun onOkClickListener(input: String) {
         var distance = this.distance
         try {
-            val distanceVal = Integer.parseInt(input.replace("[^0-9]".toRegex(), ""))
-            distance = Dimension(distanceVal.toFloat(), unit) //TODO
+            val distanceVal = input.replace("[^0-9]".toRegex(), "").toInt()
+            distance = Dimension(distanceVal.toFloat(), unit)
         } catch (e: NumberFormatException) {
             // leave distance as it is
         }
         navigationController.setResultSuccess(distance!!)
-        finish()
+        navigationController.finish()
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
diff --git a/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesActivity.kt b/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesActivity.kt
index 0ab8128cd..9d31095cf 100644
--- a/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesActivity.kt
@@ -26,7 +26,6 @@ class LicencesActivity : SimpleFragmentActivityBase() {
     }
 
     override fun onBackPressed() {
-        super.onBackPressed()
-        overridePendingTransition(0, 0)
+        navigationController.finish(animate = false)
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
index 402f2dc91..09bf4c804 100644
--- a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
@@ -93,7 +93,7 @@ class EditRoundFragment : EditFragmentBase() {
     }
 
     override fun onSave() {
-        finish()
+        navigationController.finish()
         if (roundId == null) {
             val round = onSaveRound()
             navigationController.navigateToRound(round!!)
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsActivity.kt b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsActivity.kt
index d725c05bc..1c85f3ebd 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsActivity.kt
@@ -60,15 +60,14 @@ class SettingsActivity : SimpleFragmentActivityBase(), PreferenceFragmentCompat.
     }
 
     override fun onBackPressed() {
-        super.onBackPressed()
-        overridePendingTransition(0, 0)
+        navigationController.finish(animate = false)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             android.R.id.home -> {
                 if (childFragment is MainSettingsFragment) {
-                    onBackPressed()
+                    navigationController.finish(animate = false)
                 } else {
                     intent.putExtra(ARG_PREFERENCE_ROOT, MAIN.key)
                     val ft = supportFragmentManager.beginTransaction()
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutActivity.kt b/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutActivity.kt
index df5249781..d6a4c2b13 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutActivity.kt
@@ -26,7 +26,6 @@ class AboutActivity : SimpleFragmentActivityBase() {
     }
 
     override fun onBackPressed() {
-        super.onBackPressed()
-        overridePendingTransition(0, 0)
+        navigationController.finish(animate = false)
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
index c5f4af5bc..7d7eafc8d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
@@ -262,7 +262,7 @@ class StatisticsFragment : FragmentBase() {
                             highlight.drawY,
                             circleRadius,
                             mRenderPaint)
-                    colorIndex = colorIndex + 1 % dataSet.circleColorCount
+                    colorIndex = (colorIndex + 1) % dataSet.circleColorCount
                 }
 
                 // draws highlight lines (if enabled)
@@ -388,10 +388,7 @@ class StatisticsFragment : FragmentBase() {
     }
 
     private fun convertToLineData(values: List<Pair<Float, LocalDateTime>>, evaluator: Evaluator): LineDataSet {
-        val seriesEntries = ArrayList<Entry>()
-        for (i in values.indices) {
-            seriesEntries.add(Entry(evaluator.getXValue(values, i).toFloat(), values[i].first))
-        }
+        val seriesEntries = values.indices.map { Entry(evaluator.getXValue(values, it).toFloat(), values[it].first) }
 
         val series = LineDataSet(seriesEntries, "")
         val color = ContextCompat.getColor(context!!, R.color.colorPrimary)
@@ -417,8 +414,8 @@ class StatisticsFragment : FragmentBase() {
         var n = 0
         var sumX = 0.0
         var sumY = 0.0
-        var minX = java.lang.Long.MAX_VALUE
-        var maxX = java.lang.Long.MIN_VALUE
+        var minX = Long.MAX_VALUE
+        var maxX = Long.MIN_VALUE
         for (i in 0 until dataSetSize) {
             x[n] = eval.getXValue(values, i).toDouble()
             y[n] = values[i].first.toDouble()
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index 2337cb906..f9737a722 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -37,7 +37,6 @@ import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.utils.*
 import de.dreier.mytargets.utils.MobileWearableClient.Companion.BROADCAST_UPDATE_TRAINING_FROM_REMOTE
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
-import junit.framework.Assert
 
 /**
  * Shows all rounds of one training.
@@ -89,7 +88,6 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
         binding.recyclerView.adapter = adapter
 
         // Get training
-        Assert.assertNotNull(arguments)
         trainingId = arguments!!.getLong(EditableListFragmentBase.ITEM_ID)
 
         binding.fab.visibility = View.GONE
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/DatePickerFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/DatePickerFragment.kt
index c5e28aa35..8a278c5bc 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/DatePickerFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/DatePickerFragment.kt
@@ -19,9 +19,6 @@ import android.app.DatePickerDialog
 import android.app.Dialog
 import android.os.Bundle
 import android.support.v4.app.DialogFragment
-
-import junit.framework.Assert
-
 import org.threeten.bp.LocalDate
 
 class DatePickerFragment : DialogFragment() {
@@ -29,7 +26,6 @@ class DatePickerFragment : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         // Use the current date as the default date in the picker
         val date = arguments!!.getSerializable(ARG_CURRENT_DATE) as LocalDate
-        Assert.assertNotNull(date)
 
         // Create a new instance of DatePickerDialog and return it
         val listener = targetFragment as DatePickerDialog.OnDateSetListener?
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
index 648326080..aa2d87aa2 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
@@ -271,7 +271,7 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
 
     override fun onSave() {
         val training = AugmentedTraining(training)
-        finish()
+        navigationController.finish()
 
         if (trainingId == null) {
             if (trainingType == FREE_TRAINING) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt
index dd848f550..e465f6f15 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt
@@ -104,7 +104,7 @@ class EnvironmentFragment : FragmentBase() {
         val e = saveItem()
         SettingsManager.indoor = e.indoor
         navigationController.setResultSuccess(e)
-        finish()
+        navigationController.finish()
     }
 
     private fun saveItem(): Environment {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
index f1d39f58f..1b3fb5dc0 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
@@ -127,7 +127,7 @@ class EditStandardRoundFragment : EditFragmentBase() {
     private fun onDeleteStandardRound() {
         standardRound!!.standardRound.delete()
         navigationController.setResult(RESULT_STANDARD_ROUND_DELETED)
-        finish()
+        navigationController.finish()
     }
 
     override fun onSave() {
@@ -142,7 +142,7 @@ class EditStandardRoundFragment : EditFragmentBase() {
         SettingsManager.distance = round.distance
 
         navigationController.setResultSuccess(standardRound!!.standardRound)
-        finish()
+        navigationController.finish()
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
index 07a43ff88..ff10a48fc 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
@@ -164,7 +164,7 @@ class StandardRoundListFragment : SelectItemFragmentBase<StandardRound, HeaderLi
         if (resultCode == RESULT_OK && requestCode == NEW_STANDARD_ROUND && data != null) {
             persistSelection(data.getParcelableExtra(ITEM))
             navigationController.setResultSuccess(data)
-            finish()
+            navigationController.finish()
         } else if (requestCode == EDIT_STANDARD_ROUND && data != null) {
             if (resultCode == RESULT_OK) {
                 currentSelection = data.getParcelableExtra(ITEM)
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
index 80ecfef1e..f87228188 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
@@ -39,19 +39,17 @@ import de.dreier.mytargets.shared.targets.TargetFactory
 import de.dreier.mytargets.utils.SlideInItemAnimator
 import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
-import junit.framework.Assert
 import java.util.*
 
 class TargetListFragment : SelectItemFragmentBase<Target, ExpandableListAdapter<HeaderListAdapter.SimpleHeader, Target>>(), AdapterView.OnItemSelectedListener {
-    private var binding: FragmentTargetSelectBinding? = null
+    private lateinit var binding: FragmentTargetSelectBinding
     private var scoringStyleAdapter: ArrayAdapter<String>? = null
     private var targetSizeAdapter: ArrayAdapter<String>? = null
 
     private val themedSpinnerAdapter: ArrayAdapter<String>
         get() {
-            val actionBar = (activity as AppCompatActivity).supportActionBar
-            Assert.assertNotNull(actionBar)
-            val themedContext = actionBar!!.themedContext
+            val actionBar = (activity as AppCompatActivity).supportActionBar!!
+            val themedContext = actionBar.themedContext
             val spinnerAdapter = ArrayAdapter(themedContext,
                     android.R.layout.simple_spinner_item, ArrayList<String>())
             spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
@@ -62,14 +60,14 @@ class TargetListFragment : SelectItemFragmentBase<Target, ExpandableListAdapter<
         binding = DataBindingUtil
                 .inflate(inflater, R.layout.fragment_target_select, container, false)
         adapter = TargetAdapter()
-        binding!!.recyclerView.itemAnimator = SlideInItemAnimator()
-        binding!!.recyclerView.adapter = adapter
+        binding.recyclerView.itemAnimator = SlideInItemAnimator()
+        binding.recyclerView.adapter = adapter
 
         useDoubleClickSelection = true
-        ToolbarUtils.setSupportActionBar(this, binding!!.toolbar)
+        ToolbarUtils.setSupportActionBar(this, binding.toolbar)
         ToolbarUtils.showHomeAsUp(this)
         setHasOptionsMenu(true)
-        return binding!!.root
+        return binding.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -77,24 +75,24 @@ class TargetListFragment : SelectItemFragmentBase<Target, ExpandableListAdapter<
 
         // Needs activity context
         scoringStyleAdapter = themedSpinnerAdapter
-        binding!!.scoringStyle.adapter = scoringStyleAdapter
+        binding.scoringStyle.adapter = scoringStyleAdapter
         targetSizeAdapter = themedSpinnerAdapter
-        binding!!.targetSize.adapter = targetSizeAdapter
+        binding.targetSize.adapter = targetSizeAdapter
 
         // Process passed arguments
-        val target = arguments!!.getParcelable<Target>(ITEM)
+        val target = arguments!!.getParcelable<Target>(ITEM)!!
         val fixedType = EFixedType
                 .valueOf(arguments!!.getString(FIXED_TYPE, NONE.name))
         val list = when (fixedType) {
             NONE -> TargetFactory.getList()
-            TARGET -> listOf(target!!.model)
-            GROUP -> TargetFactory.getList(target!!)
+            TARGET -> listOf(target.model)
+            GROUP -> TargetFactory.getList(target)
         }
         val targets = list
                 .map { value -> Target(value.id, 0) }
                 .toMutableList()
         adapter!!.setList(targets)
-        selectItem(binding!!.recyclerView, target!!)
+        selectItem(binding.recyclerView, target)
 
         updateSettings()
 
@@ -102,8 +100,8 @@ class TargetListFragment : SelectItemFragmentBase<Target, ExpandableListAdapter<
         val diameters = target.model.diameters
         val diameterIndex = diameters.indices.firstOrNull { diameters[it] == target.diameter } ?: -1
 
-        setSelectionWithoutEvent(binding!!.scoringStyle, target.scoringStyleIndex)
-        setSelectionWithoutEvent(binding!!.targetSize, diameterIndex)
+        setSelectionWithoutEvent(binding.scoringStyle, target.scoringStyleIndex)
+        setSelectionWithoutEvent(binding.targetSize, diameterIndex)
     }
 
     override fun selectItem(recyclerView: RecyclerView, item: Target) {
@@ -124,15 +122,15 @@ class TargetListFragment : SelectItemFragmentBase<Target, ExpandableListAdapter<
         // Init scoring styles
         val target = adapter!!.getItemById(selector.getSelectedId()!!)
         val styles = target!!.model.scoringStyles.map { it.toString() }
-        updateAdapter(binding!!.scoringStyle, scoringStyleAdapter!!, styles)
+        updateAdapter(binding.scoringStyle, scoringStyleAdapter!!, styles)
 
         // Init target size spinner
         val diameters = diameterToList(target.model.diameters)
-        updateAdapter(binding!!.targetSize, targetSizeAdapter!!, diameters)
+        updateAdapter(binding.targetSize, targetSizeAdapter!!, diameters)
         if (diameters.size > 1) {
-            binding!!.targetSize.visibility = View.VISIBLE
+            binding.targetSize.visibility = View.VISIBLE
         } else {
-            binding!!.targetSize.visibility = View.GONE
+            binding.targetSize.visibility = View.GONE
         }
     }
 
@@ -156,9 +154,9 @@ class TargetListFragment : SelectItemFragmentBase<Target, ExpandableListAdapter<
 
     override fun onSave(): Target {
         val target = super.onSave()
-        target.scoringStyleIndex = binding!!.scoringStyle.selectedItemPosition
+        target.scoringStyleIndex = binding.scoringStyle.selectedItemPosition
         val diameters = target.model.diameters
-        target.diameter = diameters[binding!!.targetSize.selectedItemPosition]
+        target.diameter = diameters[binding.targetSize.selectedItemPosition]
         arguments!!.putParcelable(ITEM, target)
         return target
     }

From a4e447dc1b4c18960527656455e6ae3e57b9f356 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Thu, 4 Jan 2018 14:27:07 +0100
Subject: [PATCH 009/102] Fixed EditArrowFragment

---
 .../mytargets/app/ApplicationInstance.kt      |  3 ++
 .../fragments/EditWithImageFragmentBase.kt    | 21 ++++++-------
 .../mytargets/base/fragments/FragmentBase.kt  |  3 +-
 .../base/viewmodel/ViewModelFactory.kt        | 31 +++++++++++++++++++
 .../features/arrows/EditArrowFragment.kt      |  6 ++--
 .../features/arrows/EditArrowViewModel.kt     |  8 ++---
 6 files changed, 52 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt

diff --git a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
index c3bde7cab..72dc61930 100644
--- a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
+++ b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
@@ -47,6 +47,7 @@ class ApplicationInstance : SharedApplicationInstance() {
     }
 
     override fun onCreate() {
+        instance = this
         Language.setFromPreference(this, SettingsManager.KEY_LANGUAGE)
         if (BuildConfig.DEBUG) {
             enableDebugLogging()
@@ -101,6 +102,8 @@ class ApplicationInstance : SharedApplicationInstance() {
 
     companion object {
 
+        lateinit var instance: ApplicationInstance
+
         lateinit var wearableClient: MobileWearableClient
 
         val lastSharedPreferences: SharedPreferences
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
index 62fa1b1e6..5741b616f 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
@@ -47,7 +47,7 @@ import java.io.IOException
 @RuntimePermissions
 abstract class EditWithImageFragmentBase<T : Image> protected constructor(
         private val defaultDrawable: Int
-) : EditFragmentBase(), View.OnFocusChangeListener {
+) : EditFragmentBase() {
 
     protected lateinit var binding: FragmentEditImageBinding
 
@@ -107,17 +107,14 @@ abstract class EditWithImageFragmentBase<T : Image> protected constructor(
                 setFocusListenerForAllEditText(viewGroup.getChildAt(i))
             }
         } else if (view is EditText) {
-            view.onFocusChangeListener = this
-        }
-    }
-
-    override fun onFocusChange(v: View, hasFocus: Boolean) {
-        if (hasFocus) {
-            val params = binding.appBarLayout
-                    .layoutParams as CoordinatorLayout.LayoutParams
-            val behavior = params.behavior as AppBarLayout.Behavior?
-            behavior?.onNestedFling(binding.coordinatorLayout, binding.appBarLayout, v, 0f,
-                    v.bottom.toFloat(), true)
+            view.onFocusChangeListener = View.OnFocusChangeListener { v, hasFocus ->
+                if (hasFocus) {
+                    val params = binding.appBarLayout.layoutParams as CoordinatorLayout.LayoutParams
+                    val behavior = params.behavior as AppBarLayout.Behavior?
+                    behavior?.onNestedFling(binding.coordinatorLayout, binding.appBarLayout, v, 0f,
+                            v.bottom.toFloat(), true)
+                }
+            }
         }
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
index 74f263e0c..505282333 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
@@ -32,8 +32,7 @@ typealias LoaderUICallback = () -> Unit
 
 /**
  * Generic fragment class used as base for most fragments.
- * Has Icepick build in to save state on orientation change
- * and animates activity when #finish gets called.
+ * Has Icepick build in to save state on orientation change.
  */
 abstract class FragmentBase : Fragment(), LoaderManager.LoaderCallbacks<FragmentBase.LoaderUICallbackHelper> {
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt b/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt
new file mode 100644
index 000000000..7459b20ff
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.viewmodel
+
+import android.arch.lifecycle.ViewModel
+import android.arch.lifecycle.ViewModelProvider
+import de.dreier.mytargets.app.ApplicationInstance
+import de.dreier.mytargets.features.arrows.EditArrowViewModel
+
+internal class ViewModelFactory : ViewModelProvider.Factory {
+    @Suppress("UNCHECKED_CAST")
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return when(modelClass) {
+            EditArrowViewModel::class.java -> EditArrowViewModel(ApplicationInstance.instance) as T
+            else -> throw Exception("No implementation for $modelClass provided")
+        }
+    }
+}
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
index 4c3694873..57d87b126 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
@@ -23,6 +23,7 @@ import android.view.View
 import android.view.ViewGroup
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.fragments.EditWithImageFragmentBase
+import de.dreier.mytargets.base.viewmodel.ViewModelFactory
 import de.dreier.mytargets.databinding.FragmentEditArrowBinding
 import de.dreier.mytargets.shared.models.db.ArrowImage
 import de.dreier.mytargets.utils.ToolbarUtils
@@ -32,6 +33,7 @@ class EditArrowFragment : EditWithImageFragmentBase<ArrowImage>(R.drawable.arrow
 
     private lateinit var contentBinding: FragmentEditArrowBinding
     private lateinit var viewModel: EditArrowViewModel
+    private val factory = ViewModelFactory()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val rootView = super.onCreateView(inflater, container, savedInstanceState)
@@ -41,7 +43,7 @@ class EditArrowFragment : EditWithImageFragmentBase<ArrowImage>(R.drawable.arrow
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        viewModel = ViewModelProviders.of(this).get(EditArrowViewModel::class.java)
+        viewModel = ViewModelProviders.of(this, factory).get(EditArrowViewModel::class.java)
         viewModel.setArrowId(arguments.getLongOrNull(ARROW_ID))
         contentBinding.arrow = viewModel
         contentBinding.moreFields.setOnClickListener {
@@ -67,7 +69,7 @@ class EditArrowFragment : EditWithImageFragmentBase<ArrowImage>(R.drawable.arrow
 
     public override fun onSave() {
         super.onSave()
-        if (viewModel.save(thumbnail)) {
+        if (viewModel.save(thumbnail, imageFiles)) {
             navigationController.finish()
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
index 25e453771..f2b7fc95f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
@@ -91,13 +91,13 @@ class EditArrowViewModel(app: ApplicationInstance) : AndroidViewModel(app) {
         diameterUnit.set(arrow.diameter.unit)
     }
 
-    fun save(thumb: Thumbnail): Boolean {
-        val images = images.value
-        if (!validateInput() || images == null) {
+    fun save(thumb: Thumbnail, imageFiles: List<ArrowImage>): Boolean {
+        if (!validateInput()) {
             return false
         }
         val arrow = Arrow()
         arrow.id = arrowId.value ?: 0
+        arrow.name = name.get()
         arrow.maxArrowNumber = maxArrowNumber.get()
         arrow.length = length.get()
         arrow.material = material.get()
@@ -109,7 +109,7 @@ class EditArrowViewModel(app: ApplicationInstance) : AndroidViewModel(app) {
         arrow.comment = comment.get()
         arrow.thumbnail = thumb
         arrow.diameter = Dimension(diameterValue.get(), diameterUnit.get())
-        arrowDAO.saveArrow(arrow, images)
+        arrowDAO.saveArrow(arrow, imageFiles)
         return true
     }
 

From 11e6c7d8debdcc095f033b52aa58d50188315458 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Thu, 4 Jan 2018 14:54:30 +0100
Subject: [PATCH 010/102] Added dbFlow extensions to get Arrow model clean

---
 .../features/arrows/EditArrowListFragment.kt  |  5 +-
 dependencies.gradle                           |  1 +
 shared/build.gradle                           |  1 +
 .../mytargets/shared/models/dao/ArrowDAO.kt   | 11 ++++
 .../mytargets/shared/models/db/Arrow.kt       | 63 +------------------
 .../dreier/mytargets/shared/models/db/Bow.kt  |  1 -
 6 files changed, 17 insertions(+), 65 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
index 86c25a3cc..2670250d3 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
@@ -85,9 +85,10 @@ class EditArrowListFragment : EditableListFragmentBase<Arrow, SimpleListAdapterB
     }
 
     override fun deleteItem(item: Arrow): () -> Arrow {
-        item.delete()
+        val images = ArrowDAO.loadArrowImages(item.id)
+        ArrowDAO.deleteArrow(item)
         return {
-            item.saveRecursively()
+            ArrowDAO.saveArrow(item, images)
             item
         }
     }
diff --git a/dependencies.gradle b/dependencies.gradle
index a5e85a31b..9f369a571 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -120,6 +120,7 @@ ext {
             materialIntroScreen           : "agency.tango.android:material-intro-screen:$libraryVersion.materialIntroScreen",
 
             dbFlowProcessor               : "com.github.Raizlabs.DBFlow:dbflow-processor:$libraryVersion.dbFlow",
+            dbFlowKotlinExtensions        : "com.github.Raizlabs.DBFlow:dbflow-kotlinextensions:$libraryVersion.dbFlow",
             dbFlowCore                    : "com.github.Raizlabs.DBFlow:dbflow-core:$libraryVersion.dbFlow",
             dbFlow                        : "com.github.Raizlabs.DBFlow:dbflow:$libraryVersion.dbFlow",
 
diff --git a/shared/build.gradle b/shared/build.gradle
index acb1473f5..747b400ea 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -58,6 +58,7 @@ dependencies {
     kapt dependencies.dbFlowProcessor
     implementation dependencies.dbFlowCore
     implementation dependencies.dbFlow
+    implementation dependencies.dbFlowKotlinExtensions
 
     implementation dependencies.androidState
     kapt dependencies.androidStateProcessor
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/ArrowDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/ArrowDAO.kt
index 0b077a805..b4363662a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/ArrowDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/ArrowDAO.kt
@@ -16,6 +16,8 @@
 package de.dreier.mytargets.shared.models.dao
 
 import com.raizlabs.android.dbflow.config.FlowManager
+import com.raizlabs.android.dbflow.kotlinextensions.delete
+import com.raizlabs.android.dbflow.kotlinextensions.save
 import com.raizlabs.android.dbflow.sql.language.SQLite
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.db.Arrow
@@ -53,4 +55,13 @@ object ArrowDAO {
             }
         }
     }
+
+    fun deleteArrow(arrow: Arrow) {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
+                    SQLite.delete(ArrowImage::class.java)
+                            .where(ArrowImage_Table.arrow.eq(arrow.id))
+                            .execute(db)
+                    arrow.delete(db)
+                }
+    }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
index 64082c944..e5ea0574d 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
@@ -20,13 +20,8 @@ import android.content.Context
 import android.graphics.drawable.Drawable
 import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.Column
-import com.raizlabs.android.dbflow.annotation.OneToMany
 import com.raizlabs.android.dbflow.annotation.PrimaryKey
 import com.raizlabs.android.dbflow.annotation.Table
-import com.raizlabs.android.dbflow.config.FlowManager
-import com.raizlabs.android.dbflow.sql.language.SQLite
-import com.raizlabs.android.dbflow.structure.BaseModel
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.IIdSettable
@@ -34,7 +29,6 @@ import de.dreier.mytargets.shared.models.IImageProvider
 import de.dreier.mytargets.shared.models.Thumbnail
 import de.dreier.mytargets.shared.utils.typeconverters.DimensionConverter
 import de.dreier.mytargets.shared.utils.typeconverters.ThumbnailConverter
-import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
 
 @SuppressLint("ParcelCreator")
@@ -79,69 +73,14 @@ data class Arrow(
         var diameter: Dimension = Dimension(5f, Dimension.Unit.MILLIMETER),
 
         @Column(typeConverter = ThumbnailConverter::class)
-        var thumbnail: Thumbnail? = null) : BaseModel(), IImageProvider, IIdSettable, Comparable<Arrow>, Parcelable {
-
-    @IgnoredOnParcel
-    var images: List<ArrowImage>? = null
+        var thumbnail: Thumbnail? = null) : IImageProvider, IIdSettable, Comparable<Arrow>, Parcelable {
 
     val drawable: Drawable
         get() = thumbnail!!.roundDrawable
 
-    @OneToMany(methods = [], variableName = "images")
-    fun loadImages(): List<ArrowImage> {
-        if (images == null) {
-            images = if (id == 0L) mutableListOf() else SQLite.select()
-                    .from(ArrowImage::class.java)
-                    .where(ArrowImage_Table.arrow.eq(id))
-                    .queryList()
-        }
-        return images!!
-    }
-
     override fun getDrawable(context: Context): Drawable {
         return drawable
     }
 
-    override fun save(): Boolean {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { this.save(it) }
-        return true
-    }
-
-    override fun save(databaseWrapper: DatabaseWrapper): Boolean {
-        super.save(databaseWrapper)
-        if (images != null) {
-            SQLite.delete(ArrowImage::class.java)
-                    .where(ArrowImage_Table.arrow.eq(id))
-                    .execute(databaseWrapper)
-            // TODO Replace this super ugly workaround by stubbed Relationship in version 4 of dbFlow
-            for (image in images!!) {
-                image.arrowId = id
-                image.save(databaseWrapper)
-            }
-        }
-        return true
-    }
-
-    override fun delete(): Boolean {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { this.delete(it) }
-        return true
-    }
-
-    override fun delete(databaseWrapper: DatabaseWrapper): Boolean {
-        for (arrowImage in loadImages()) {
-            arrowImage.delete(databaseWrapper)
-        }
-        super.delete(databaseWrapper)
-        return true
-    }
-
     override fun compareTo(other: Arrow) = compareBy(Arrow::name, Arrow::id).compare(this, other)
-
-    fun saveRecursively() {
-        save()
-    }
-
-    fun saveRecursively(databaseWrapper: DatabaseWrapper) {
-        save(databaseWrapper)
-    }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
index dd56169c8..86c84e7f6 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
@@ -135,7 +135,6 @@ data class Bow(
         return ArrayList(sightMarks) //TODO remove
     }
 
-    @OneToMany(methods = [], variableName = "images")
     fun loadImages(): List<BowImage> {
         if (images == null) {
             images = if (id == 0L) mutableListOf() else SQLite.select()

From b26394ca266042a29736d96245b1fa5713b1f34f Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Thu, 4 Jan 2018 16:53:45 +0100
Subject: [PATCH 011/102] Pulled out dependencies on Comparable

---
 .../base/adapters/SimpleListAdapterBase.kt    | 21 ++++++++-----------
 .../base/fragments/SelectItemFragmentBase.kt  |  2 +-
 .../SelectPureListItemFragmentBase.kt         |  6 ++++--
 .../features/arrows/ArrowListFragment.kt      |  2 +-
 .../features/arrows/EditArrowListFragment.kt  | 12 +++++------
 .../mytargets/features/bows/BowAdapter.kt     |  6 +++++-
 .../features/bows/BowListFragment.kt          |  2 +-
 .../features/distance/DistanceGridFragment.kt |  2 +-
 .../features/training/RoundFragment.kt        |  2 +-
 .../training/details/TrainingFragment.kt      |  2 +-
 .../environment/WindDirectionListFragment.kt  |  2 +-
 .../environment/WindSpeedListFragment.kt      |  2 +-
 .../mytargets/shared/models/db/Arrow.kt       |  4 +---
 .../dreier/mytargets/shared/models/db/Bow.kt  |  8 +------
 14 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/SimpleListAdapterBase.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/SimpleListAdapterBase.kt
index 9081a2d08..a7b0185f8 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/SimpleListAdapterBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/SimpleListAdapterBase.kt
@@ -23,12 +23,14 @@ import java.util.*
 /**
  * The list is automatically sorted in natural order.
  */
-abstract class SimpleListAdapterBase<T> : ListAdapterBase<SelectableViewHolder<T>, T>() where T : IIdProvider, T : Comparable<T> {
+abstract class SimpleListAdapterBase<T>(
+        private val comparator: Comparator<T>
+) : ListAdapterBase<SelectableViewHolder<T>, T>() where T : IIdProvider {
 
     private var list: MutableList<T> = ArrayList()
 
     init {
-        setHasStableIds(true)
+        super.setHasStableIds(true)
     }
 
     override fun getItemId(position: Int): Long {
@@ -54,7 +56,7 @@ abstract class SimpleListAdapterBase<T> : ListAdapterBase<SelectableViewHolder<T
     }
 
     override fun setList(list: MutableList<T>) {
-        Collections.sort(list)
+        list.sortWith(comparator)
         this.list = list
         notifyDataSetChanged()
     }
@@ -64,7 +66,7 @@ abstract class SimpleListAdapterBase<T> : ListAdapterBase<SelectableViewHolder<T
     }
 
     override fun addItem(item: T) {
-        val pos = Collections.binarySearch(list, item)
+        val pos = list.binarySearch(item, comparator)
         if (pos < 0) {
             list.add(-pos - 1, item)
             notifyItemInserted(-pos - 1)
@@ -75,7 +77,7 @@ abstract class SimpleListAdapterBase<T> : ListAdapterBase<SelectableViewHolder<T
     }
 
     override fun getItemPosition(item: T): Int {
-        val pos = Collections.binarySearch(list, item)
+        val pos = list.binarySearch(item, comparator)
         return if (pos >= 0) {
             pos
         } else {
@@ -84,7 +86,7 @@ abstract class SimpleListAdapterBase<T> : ListAdapterBase<SelectableViewHolder<T
     }
 
     override fun removeItem(item: T) {
-        val pos = Collections.binarySearch(list, item)
+        val pos = list.binarySearch(item, comparator)
         if (pos < 0) {
             throw IllegalArgumentException("Item has already been removed!")
         }
@@ -93,11 +95,6 @@ abstract class SimpleListAdapterBase<T> : ListAdapterBase<SelectableViewHolder<T
     }
 
     override fun getItemById(id: Long): T? {
-        for (item in list) {
-            if (item.id == id) {
-                return item
-            }
-        }
-        return null
+        return list.firstOrNull { it.id == id }
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt
index 5312d86c5..d4fe9ca0e 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt
@@ -33,7 +33,7 @@ import de.dreier.mytargets.utils.multiselector.SingleSelector
  *
  * @param <T> Model of the item which is managed within the fragment.
 </T> */
-abstract class SelectItemFragmentBase<T, U : ListAdapterBase<out ItemBindingHolder<*>, T>> : FragmentBase(), OnItemClickListener<T> where T : IIdProvider, T : Comparable<T>, T : Parcelable {
+abstract class SelectItemFragmentBase<T, U : ListAdapterBase<out ItemBindingHolder<*>, T>> : FragmentBase(), OnItemClickListener<T> where T : IIdProvider, T : Parcelable {
 
     /**
      * Adapter for the fragment's RecyclerView
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt
index 42d57f504..d0fc9f3ec 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt
@@ -34,7 +34,9 @@ import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 /**
  *
  */
-abstract class SelectPureListItemFragmentBase<T> : SelectItemFragmentBase<T, SimpleListAdapterBase<T>>() where T : IIdProvider, T: Comparable<T>, T : IImageProvider, T: Parcelable {
+abstract class SelectPureListItemFragmentBase<T>(
+        private val comparator: Comparator<T>
+) : SelectItemFragmentBase<T, SimpleListAdapterBase<T>>() where T : IIdProvider, T : IImageProvider, T : Parcelable {
 
     protected lateinit var binding: FragmentListBinding
 
@@ -49,7 +51,7 @@ abstract class SelectPureListItemFragmentBase<T> : SelectItemFragmentBase<T, Sim
         return binding.root
     }
 
-    private inner class ListAdapter : SimpleListAdapterBase<T>() {
+    private inner class ListAdapter : SimpleListAdapterBase<T>(comparator) {
 
         public override fun onCreateViewHolder(parent: ViewGroup): SelectableViewHolder<T> {
             val inflater = LayoutInflater.from(parent.context)
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
index fc5e0f889..92380fa9e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
@@ -22,7 +22,7 @@ import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
 import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 
-class ArrowListFragment : SelectPureListItemFragmentBase<Arrow>() {
+class ArrowListFragment : SelectPureListItemFragmentBase<Arrow>(compareBy(Arrow::name, Arrow::id)) {
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
         val arrows = ArrowDAO.loadArrows()
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
index 2670250d3..7ec5c070e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
@@ -37,6 +37,7 @@ import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 class EditArrowListFragment : EditableListFragmentBase<Arrow, SimpleListAdapterBase<Arrow>>() {
 
     private lateinit var binding: FragmentArrowsBinding
+    private val arrowDAO = ArrowDAO
 
     init {
         itemTypeDelRes = R.plurals.arrow_deleted
@@ -67,7 +68,7 @@ class EditArrowListFragment : EditableListFragmentBase<Arrow, SimpleListAdapterB
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        val arrows = ArrowDAO.loadArrows()
+        val arrows = arrowDAO.loadArrows()
         return {
             adapter!!.setList(arrows.toMutableList())
             binding.emptyState!!.root.visibility = if (arrows.isEmpty()) View.VISIBLE else View.GONE
@@ -85,16 +86,15 @@ class EditArrowListFragment : EditableListFragmentBase<Arrow, SimpleListAdapterB
     }
 
     override fun deleteItem(item: Arrow): () -> Arrow {
-        val images = ArrowDAO.loadArrowImages(item.id)
-        ArrowDAO.deleteArrow(item)
+        val images = arrowDAO.loadArrowImages(item.id)
+        arrowDAO.deleteArrow(item)
         return {
-            ArrowDAO.saveArrow(item, images)
+            arrowDAO.saveArrow(item, images)
             item
         }
     }
 
-    private inner class ArrowAdapter : SimpleListAdapterBase<Arrow>() {
-
+    private inner class ArrowAdapter : SimpleListAdapterBase<Arrow>(compareBy(Arrow::name, Arrow::id)) {
         public override fun onCreateViewHolder(parent: ViewGroup): ViewHolder {
             val itemView = LayoutInflater.from(parent.context)
                     .inflate(R.layout.item_image_details, parent, false)
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
index 6b9f96e51..2c47ddc8c 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
@@ -30,7 +30,11 @@ import de.dreier.mytargets.utils.multiselector.OnItemClickListener
 import de.dreier.mytargets.utils.multiselector.OnItemLongClickListener
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 
-internal class BowAdapter(private val selector: MultiSelector, private val clickListener: OnItemClickListener<Bow>, private val longClickListener: OnItemLongClickListener<Bow>) : SimpleListAdapterBase<Bow>() {
+internal class BowAdapter(
+        private val selector: MultiSelector,
+        private val clickListener: OnItemClickListener<Bow>,
+        private val longClickListener: OnItemLongClickListener<Bow>
+) : SimpleListAdapterBase<Bow>(compareBy(Bow::name, Bow::id)) {
 
     public override fun onCreateViewHolder(parent: ViewGroup): ViewHolder {
         val itemView = LayoutInflater.from(parent.context)
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
index dbd14c74c..f447fe221 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
@@ -21,7 +21,7 @@ import de.dreier.mytargets.base.fragments.SelectPureListItemFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
 import de.dreier.mytargets.shared.models.db.Bow
 
-class BowListFragment : SelectPureListItemFragmentBase<Bow>() {
+class BowListFragment : SelectPureListItemFragmentBase<Bow>(compareBy(Bow::name, Bow::id)) {
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
         val bows = Bow.all
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
index a62f187d6..7358e3910 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
@@ -78,7 +78,7 @@ class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapter
         }
     }
 
-    private inner class DistanceAdapter : SimpleListAdapterBase<Dimension>() {
+    private inner class DistanceAdapter : SimpleListAdapterBase<Dimension>(compareBy(Dimension::value)) {
         public override fun onCreateViewHolder(parent: ViewGroup): ViewHolder {
             val itemView = LayoutInflater.from(parent.context)
                     .inflate(R.layout.item_distance, parent, false)
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
index 0541f3b1b..4056e1b67 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
@@ -169,7 +169,7 @@ class RoundFragment : EditableListFragmentBase<End, SimpleListAdapterBase<End>>(
         }
     }
 
-    private inner class EndAdapter : SimpleListAdapterBase<End>() {
+    private inner class EndAdapter : SimpleListAdapterBase<End>(compareBy(End::index)) {
 
         override fun onCreateViewHolder(parent: ViewGroup): SelectableViewHolder<End> {
             val itemView = LayoutInflater.from(parent.context)
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index f9737a722..e7038efe0 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -188,7 +188,7 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
         }
     }
 
-    private inner class RoundAdapter : SimpleListAdapterBase<Round>() {
+    private inner class RoundAdapter : SimpleListAdapterBase<Round>(compareBy(Round::index)) {
 
         override fun onCreateViewHolder(parent: ViewGroup): SelectableViewHolder<Round> {
             val itemView = LayoutInflater.from(parent.context)
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
index 2ff09c68e..f6f81f97f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
@@ -23,7 +23,7 @@ import de.dreier.mytargets.base.fragments.SelectPureListItemFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
 import de.dreier.mytargets.shared.models.WindDirection
 
-class WindDirectionListFragment : SelectPureListItemFragmentBase<WindDirection>() {
+class WindDirectionListFragment : SelectPureListItemFragmentBase<WindDirection>(compareBy(WindDirection::id)) {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
index b8672276d..8e011440f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
@@ -24,7 +24,7 @@ import de.dreier.mytargets.base.fragments.SelectPureListItemFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
 import de.dreier.mytargets.shared.models.WindSpeed
 
-class WindSpeedListFragment : SelectPureListItemFragmentBase<WindSpeed>() {
+class WindSpeedListFragment : SelectPureListItemFragmentBase<WindSpeed>(compareBy(WindSpeed::id)) {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
index e5ea0574d..1c183d2cc 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
@@ -73,7 +73,7 @@ data class Arrow(
         var diameter: Dimension = Dimension(5f, Dimension.Unit.MILLIMETER),
 
         @Column(typeConverter = ThumbnailConverter::class)
-        var thumbnail: Thumbnail? = null) : IImageProvider, IIdSettable, Comparable<Arrow>, Parcelable {
+        var thumbnail: Thumbnail? = null) : IImageProvider, IIdSettable, Parcelable {
 
     val drawable: Drawable
         get() = thumbnail!!.roundDrawable
@@ -81,6 +81,4 @@ data class Arrow(
     override fun getDrawable(context: Context): Drawable {
         return drawable
     }
-
-    override fun compareTo(other: Arrow) = compareBy(Arrow::name, Arrow::id).compare(this, other)
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
index 86c84e7f6..f40516eef 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
@@ -111,7 +111,7 @@ data class Bow(
 
         @Column(typeConverter = ThumbnailConverter::class)
         var thumbnail: Thumbnail? = null
-) : BaseModel(), IImageProvider, IIdSettable, Comparable<Bow>, Parcelable {
+) : BaseModel(), IImageProvider, IIdSettable, Parcelable {
 
     @IgnoredOnParcel
     var images: List<BowImage>? = null
@@ -195,8 +195,6 @@ data class Bow(
         return true
     }
 
-    override fun compareTo(other: Bow) = compareBy(Bow::name, Bow::id).compare(this, other)
-
     fun areAllPropertiesSet(): Boolean {
         return !TextUtils.isEmpty(size) &&
                 !TextUtils.isEmpty(drawWeight) &&
@@ -223,10 +221,6 @@ data class Bow(
         save()
     }
 
-    fun saveRecursively(databaseWrapper: DatabaseWrapper) {
-        save(databaseWrapper)
-    }
-
     companion object {
         val all: List<Bow>
             get() = SQLite.select().from(Bow::class.java).queryList()

From 54e17701c3e601802a701c212197191078130d5d Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Thu, 4 Jan 2018 16:54:59 +0100
Subject: [PATCH 012/102] Git rid of IImageProvider and IDetailsProvider

---
 .../SelectPureListItemFragmentBase.kt         | 12 ++++--
 .../features/arrows/ArrowListFragment.kt      |  4 ++
 .../features/arrows/EditArrowListFragment.kt  |  2 +-
 .../features/bows/BowListFragment.kt          |  4 ++
 .../environment/WindDirectionListFragment.kt  |  5 +++
 .../environment/WindSpeedListFragment.kt      |  5 +++
 .../StandardRoundListFragment.kt              |  2 +-
 .../mytargets/views/selector/ArrowSelector.kt | 19 +++++++--
 .../mytargets/views/selector/BowSelector.kt   | 16 ++++++-
 .../views/selector/EnvironmentSelector.kt     | 42 ++++++++++++++++++-
 .../views/selector/ImageSelectorBase.kt       | 27 +-----------
 .../views/selector/StandardRoundSelector.kt   | 16 ++++++-
 .../views/selector/TargetSelector.kt          | 17 +++++++-
 .../views/selector/WindDirectionSelector.kt   | 15 ++++++-
 .../views/selector/WindSpeedSelector.kt       | 15 ++++++-
 .../mytargets/shared/models/Environment.kt    | 29 +------------
 .../shared/models/IDetailProvider.kt          | 22 ----------
 .../mytargets/shared/models/IImageProvider.kt | 24 -----------
 .../dreier/mytargets/shared/models/Target.kt  | 12 ++----
 .../mytargets/shared/models/WindDirection.kt  | 10 +----
 .../mytargets/shared/models/WindSpeed.kt      | 10 +----
 .../mytargets/shared/models/db/Arrow.kt       | 15 +------
 .../dreier/mytargets/shared/models/db/Bow.kt  | 14 +++----
 .../shared/models/db/StandardRound.kt         | 16 ++-----
 24 files changed, 178 insertions(+), 175 deletions(-)
 delete mode 100644 shared/src/main/java/de/dreier/mytargets/shared/models/IDetailProvider.kt
 delete mode 100644 shared/src/main/java/de/dreier/mytargets/shared/models/IImageProvider.kt

diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt
index d0fc9f3ec..8b156154c 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt
@@ -16,6 +16,7 @@
 package de.dreier.mytargets.base.fragments
 
 import android.databinding.DataBindingUtil
+import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.LayoutInflater
@@ -26,7 +27,6 @@ import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
 import de.dreier.mytargets.databinding.FragmentListBinding
 import de.dreier.mytargets.databinding.ItemImageSimpleBinding
 import de.dreier.mytargets.shared.models.IIdProvider
-import de.dreier.mytargets.shared.models.IImageProvider
 import de.dreier.mytargets.utils.SlideInItemAnimator
 import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
@@ -36,7 +36,7 @@ import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
  */
 abstract class SelectPureListItemFragmentBase<T>(
         private val comparator: Comparator<T>
-) : SelectItemFragmentBase<T, SimpleListAdapterBase<T>>() where T : IIdProvider, T : IImageProvider, T : Parcelable {
+) : SelectItemFragmentBase<T, SimpleListAdapterBase<T>>() where T : IIdProvider, T : Parcelable {
 
     protected lateinit var binding: FragmentListBinding
 
@@ -51,6 +51,10 @@ abstract class SelectPureListItemFragmentBase<T>(
         return binding.root
     }
 
+    abstract fun getName(item: T): String
+
+    abstract fun getDrawable(item: T): Drawable
+
     private inner class ListAdapter : SimpleListAdapterBase<T>(comparator) {
 
         public override fun onCreateViewHolder(parent: ViewGroup): SelectableViewHolder<T> {
@@ -67,8 +71,8 @@ abstract class SelectPureListItemFragmentBase<T>(
         internal var binding: ItemImageSimpleBinding = DataBindingUtil.bind(itemView)
 
         override fun bindItem(item: T) {
-            binding.name.text = item.name
-            binding.image.setImageDrawable(item.getDrawable(context!!))
+            binding.name.text = getName(item)
+            binding.image.setImageDrawable(getDrawable(item))
         }
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
index 92380fa9e..e8312755e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
@@ -32,4 +32,8 @@ class ArrowListFragment : SelectPureListItemFragmentBase<Arrow>(compareBy(Arrow:
             selectItem(binding.recyclerView, arrow!!)
         }
     }
+
+    override fun getName(item: Arrow) = item.name
+
+    override fun getDrawable(item: Arrow) = item.thumbnail!!.roundDrawable
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
index 7ec5c070e..cadf17d24 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
@@ -107,7 +107,7 @@ class EditArrowListFragment : EditableListFragmentBase<Arrow, SimpleListAdapterB
 
         override fun bindItem(item: Arrow) {
             binding.name.text = item.name
-            binding.image.setImageDrawable(item.drawable)
+            binding.image.setImageDrawable(item.thumbnail!!.roundDrawable)
         }
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
index f447fe221..ae105770d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
@@ -32,4 +32,8 @@ class BowListFragment : SelectPureListItemFragmentBase<Bow>(compareBy(Bow::name,
         }
     }
 
+    override fun getName(item: Bow) = item.name
+
+    override fun getDrawable(item: Bow) = item.thumbnail!!.roundDrawable
+
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
index f6f81f97f..e5434498f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
@@ -16,6 +16,7 @@
 package de.dreier.mytargets.features.training.environment
 
 import android.os.Bundle
+import android.support.v4.content.ContextCompat
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -32,4 +33,8 @@ class WindDirectionListFragment : SelectPureListItemFragmentBase<WindDirection>(
         selectItem(binding.recyclerView, windDirection!!)
         return binding.root
     }
+
+    override fun getName(item: WindDirection) = item.name
+
+    override fun getDrawable(item: WindDirection) = ContextCompat.getDrawable(context!!, item.drawable)!!
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
index 8e011440f..b3049b08a 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
@@ -16,6 +16,7 @@
 package de.dreier.mytargets.features.training.environment
 
 import android.os.Bundle
+import android.support.v4.content.ContextCompat
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -33,4 +34,8 @@ class WindSpeedListFragment : SelectPureListItemFragmentBase<WindSpeed>(compareB
         selectItem(binding.recyclerView, windSpeed!!)
         return binding.root
     }
+
+    override fun getName(item: WindSpeed) = item.name
+
+    override fun getDrawable(item: WindSpeed) = ContextCompat.getDrawable(context!!, item.drawable)!!
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
index ff10a48fc..40b9ed8be 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
@@ -202,7 +202,7 @@ class StandardRoundListFragment : SelectItemFragmentBase<StandardRound, HeaderLi
         } else {
             HeaderListAdapter.SimpleHeader(1L, "")
         }
-    }, compareBy({ usedIds.get(it.id) ?: 0 }, { it })) {
+    }, compareBy({ usedIds.get(it.id) ?: 0 }, StandardRound::name, StandardRound::id)) {
 
         override fun getSecondLevelViewHolder(parent: ViewGroup): ViewHolder {
             val itemView = LayoutInflater.from(parent.context)
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
index 166ecc325..f1bc19691 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
@@ -18,14 +18,25 @@ package de.dreier.mytargets.views.selector
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.databinding.DataBindingUtil
 import android.util.AttributeSet
-
-import de.dreier.mytargets.features.arrows.ArrowListActivity
-import de.dreier.mytargets.features.arrows.EditArrowFragment
+import de.dreier.mytargets.R
+import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
 import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 
-class ArrowSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ImageSelectorBase<Arrow>(context, attrs, ARROW_REQUEST_CODE) {
+class ArrowSelector @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null
+) : SelectorBase<Arrow>(context, attrs, R.layout.selector_item_image_details, ARROW_REQUEST_CODE) {
+
+    private lateinit var binding: SelectorItemImageDetailsBinding
+
+    override fun bindView(item: Arrow) {
+        binding = DataBindingUtil.bind(view)
+        binding.name.text = item.name
+        binding.image.setImageDrawable(item.thumbnail!!.roundDrawable)
+    }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
index a126296d1..6bc4e1030 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
@@ -18,10 +18,24 @@ package de.dreier.mytargets.views.selector
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.databinding.DataBindingUtil
 import android.util.AttributeSet
+import de.dreier.mytargets.R
+import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
 import de.dreier.mytargets.shared.models.db.Bow
 
-class BowSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ImageSelectorBase<Bow>(context, attrs, BOW_REQUEST_CODE) {
+class BowSelector @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null
+) : SelectorBase<Bow>(context, attrs, R.layout.selector_item_image_details, BOW_REQUEST_CODE) {
+
+    private lateinit var binding: SelectorItemImageDetailsBinding
+
+    override fun bindView(item: Bow) {
+        binding = DataBindingUtil.bind(view)
+        binding.name.text = item.name
+        binding.image.setImageDrawable(item.getDrawable(context))
+    }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
index 3d9c0c0df..eb47e4c64 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
@@ -21,13 +21,16 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.pm.PackageManager
+import android.databinding.DataBindingUtil
 import android.location.Geocoder
 import android.location.Location
 import android.support.annotation.RequiresPermission
 import android.support.v4.app.Fragment
 import android.support.v4.content.ContextCompat
 import android.util.AttributeSet
+import android.view.View
 import de.dreier.mytargets.R
+import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.features.training.environment.CurrentWeather
 import de.dreier.mytargets.features.training.environment.Locator
@@ -40,7 +43,9 @@ import retrofit2.Response
 import java.io.IOException
 
 class EnvironmentSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null
-) : ImageSelectorBase<Environment>(context, attrs, ENVIRONMENT_REQUEST_CODE, R.string.environment) {
+) : SelectorBase<Environment>(context, attrs, R.layout.selector_item_image_details, ENVIRONMENT_REQUEST_CODE) {
+
+    private lateinit var binding: SelectorItemImageDetailsBinding
 
     override var selectedItem: Environment?
         get() = if (super.selectedItem == null) {
@@ -50,6 +55,38 @@ class EnvironmentSelector @JvmOverloads constructor(context: Context, attrs: Att
             super.selectedItem = value
         }
 
+    override fun bindView(item: Environment) {
+        binding = DataBindingUtil.bind(view)
+
+        if (item.indoor) {
+            binding.name.setText(de.dreier.mytargets.shared.R.string.indoor)
+            binding.image.setImageResource(de.dreier.mytargets.shared.R.drawable.ic_house_24dp)
+        } else {
+            binding.name.text = item.weather.getName()
+            binding.image.setImageResource(item.weather.drawable)
+        }
+        binding.details.visibility = View.VISIBLE
+        binding.details.text = getDetails(context, item)
+        binding.title.visibility = View.VISIBLE
+        binding.title.setText(R.string.environment)
+    }
+
+    private fun getDetails(context: Context, item: Environment): String {
+        var description: String
+        if (item.indoor) {
+            description = ""
+            if (!item.location.isEmpty()) {
+                description += "${context.getString(de.dreier.mytargets.shared.R.string.location)}: ${item.location}"
+            }
+        } else {
+            description = "${context.getString(de.dreier.mytargets.shared.R.string.wind)}: ${item.getWindSpeed(context)}"
+            if (!item.location.isEmpty()) {
+                description += "\n${context.getString(de.dreier.mytargets.shared.R.string.location)}: ${item.location}"
+            }
+        }
+        return description
+    }
+
     fun queryWeather(fragment: Fragment, request_code: Int) {
         if (isTestMode) {
             setDefaultWeather()
@@ -88,7 +125,8 @@ class EnvironmentSelector @JvmOverloads constructor(context: Context, attrs: Att
                     override fun onResponse(call: Call<CurrentWeather>, response: Response<CurrentWeather>) {
                         if (response.isSuccessful && response.body()!!.httpCode == 200) {
                             val toEnvironment = response.body()!!.toEnvironment()
-                            setItem(toEnvironment.copy(location = locationStr ?: toEnvironment.location))
+                            setItem(toEnvironment.copy(location = locationStr
+                                    ?: toEnvironment.location))
                         } else {
                             setDefaultWeather()
                         }
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/ImageSelectorBase.kt b/app/src/main/java/de/dreier/mytargets/views/selector/ImageSelectorBase.kt
index a17d6cd7d..994c2e722 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/ImageSelectorBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/ImageSelectorBase.kt
@@ -16,35 +16,12 @@
 package de.dreier.mytargets.views.selector
 
 import android.content.Context
-import android.databinding.DataBindingUtil
 import android.os.Parcelable
 import android.util.AttributeSet
-import android.view.View
 import de.dreier.mytargets.R
-import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
-import de.dreier.mytargets.shared.models.IDetailProvider
-import de.dreier.mytargets.shared.models.IImageProvider
 
 abstract class ImageSelectorBase<T> @JvmOverloads constructor(
         context: Context,
         attrs: AttributeSet?,
-        requestCode: Int,
-        val title: Int? = null
-) : SelectorBase<T>(context, attrs, R.layout.selector_item_image_details, requestCode) where T : IImageProvider, T : Parcelable {
-
-    protected lateinit var binding: SelectorItemImageDetailsBinding
-
-    override fun bindView(item: T) {
-        binding = DataBindingUtil.bind(view)
-        binding.name.text = item.name
-        if (selectedItem is IDetailProvider) {
-            binding.details.visibility = View.VISIBLE
-            binding.details.text = (item as IDetailProvider).getDetails(context)
-        }
-        binding.image.setImageDrawable(item.getDrawable(context))
-        title?.let {
-            binding.title.visibility = View.VISIBLE
-            binding.title.setText(it)
-        }
-    }
-}
+        requestCode: Int
+) : SelectorBase<T>(context, attrs, R.layout.selector_item_image_details, requestCode) where T : Parcelable
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
index 836eabbc1..92dd753f1 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
@@ -16,11 +16,25 @@
 package de.dreier.mytargets.views.selector
 
 import android.content.Context
+import android.databinding.DataBindingUtil
 import android.util.AttributeSet
+import android.view.View
+import de.dreier.mytargets.R
+import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
 import de.dreier.mytargets.shared.models.db.StandardRound
 
 class StandardRoundSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null)
-    : ImageSelectorBase<StandardRound>(context, attrs, STANDARD_ROUND_REQUEST_CODE) {
+    : SelectorBase<StandardRound>(context, attrs, R.layout.selector_item_image_details, STANDARD_ROUND_REQUEST_CODE) {
+
+    private lateinit var binding: SelectorItemImageDetailsBinding
+
+    override fun bindView(item: StandardRound) {
+        binding = DataBindingUtil.bind(view)
+        binding.name.text = item.name
+        binding.details.visibility = View.VISIBLE
+        binding.details.text = item.getDescription(context)
+        binding.image.setImageDrawable(item.targetDrawable)
+    }
 
     fun setItemId(standardRoundId: Long?) {
         var standardRound = StandardRound[standardRoundId!!]
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/TargetSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/TargetSelector.kt
index 3e8279f6d..9fb0ffe23 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/TargetSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/TargetSelector.kt
@@ -16,12 +16,27 @@
 package de.dreier.mytargets.views.selector
 
 import android.content.Context
+import android.databinding.DataBindingUtil
 import android.util.AttributeSet
+import android.view.View
 import de.dreier.mytargets.R
+import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
 import de.dreier.mytargets.shared.models.Target
 
 class TargetSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null)
-    : ImageSelectorBase<Target>(context, attrs, TARGET_REQUEST_CODE, R.string.target_face) {
+    : SelectorBase<Target>(context, attrs, R.layout.selector_item_image_details, TARGET_REQUEST_CODE) {
+
+    private lateinit var binding: SelectorItemImageDetailsBinding
+
+    override fun bindView(item: Target) {
+        binding = DataBindingUtil.bind(view)
+        binding.name.text = item.name
+        binding.details.visibility = View.VISIBLE
+        binding.details.text = item.getDetails()
+        binding.image.setImageDrawable(item.drawable)
+        binding.title.visibility = View.VISIBLE
+        binding.title.setText(R.string.target_face)
+    }
 
     companion object {
         const val TARGET_REQUEST_CODE = 12
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/WindDirectionSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/WindDirectionSelector.kt
index 01d538a09..bb0ba1472 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/WindDirectionSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/WindDirectionSelector.kt
@@ -16,12 +16,25 @@
 package de.dreier.mytargets.views.selector
 
 import android.content.Context
+import android.databinding.DataBindingUtil
 import android.util.AttributeSet
+import android.view.View
 import de.dreier.mytargets.R
+import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
 import de.dreier.mytargets.shared.models.WindDirection
 
 class WindDirectionSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null
-) : ImageSelectorBase<WindDirection>(context, attrs, WIND_DIRECTION_REQUEST_CODE, R.string.wind_direction) {
+) : SelectorBase<WindDirection>(context, attrs, R.layout.selector_item_image_details, WIND_DIRECTION_REQUEST_CODE) {
+
+    private lateinit var binding: SelectorItemImageDetailsBinding
+
+    override fun bindView(item: WindDirection) {
+        binding = DataBindingUtil.bind(view)
+        binding.name.text = item.name
+        binding.image.setImageResource(item.drawable)
+        binding.title.visibility = View.VISIBLE
+        binding.title.setText(R.string.wind_direction)
+    }
 
     fun setItemId(direction: Long) {
         setItem(WindDirection.getList(context)[direction.toInt()])
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/WindSpeedSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/WindSpeedSelector.kt
index 36df8b33f..dfa44b0e6 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/WindSpeedSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/WindSpeedSelector.kt
@@ -16,12 +16,25 @@
 package de.dreier.mytargets.views.selector
 
 import android.content.Context
+import android.databinding.DataBindingUtil
 import android.util.AttributeSet
+import android.view.View
 import de.dreier.mytargets.R
+import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
 import de.dreier.mytargets.shared.models.WindSpeed
 
 class WindSpeedSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null
-) : ImageSelectorBase<WindSpeed>(context, attrs, WIND_SPEED_REQUEST_CODE, R.string.wind_speed) {
+) : SelectorBase<WindSpeed>(context, attrs, R.layout.selector_item_image_details, WIND_SPEED_REQUEST_CODE) {
+
+    private lateinit var binding: SelectorItemImageDetailsBinding
+
+    override fun bindView(item: WindSpeed) {
+        binding = DataBindingUtil.bind(view)
+        binding.name.text = item.name
+        binding.image.setImageResource(item.drawable)
+        binding.title.visibility = View.VISIBLE
+        binding.title.setText(R.string.wind_speed)
+    }
 
     fun setItemId(speed: Long) {
         setItem(WindSpeed.getList(context)[speed.toInt()])
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Environment.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Environment.kt
index 61ca17886..5020f23c9 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Environment.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Environment.kt
@@ -34,10 +34,7 @@ data class Environment(
         var windSpeed: Int = 0,
         var windDirection: Int = 0,
         var location: String = ""
-) : IImageProvider, IDetailProvider, Parcelable {
-
-    override val name: String
-        get() = if (indoor) SharedApplicationInstance.getStr(R.string.indoor) else weather.getName()
+) : Parcelable {
 
     val colorDrawable: Int
         @DrawableRes
@@ -47,34 +44,10 @@ data class Environment(
             weather.colorDrawable
         }
 
-    override fun getDetails(context: Context): String {
-        var description: String
-        if (indoor) {
-            description = ""
-            if (!TextUtils.isEmpty(location)) {
-                description += context.getString(R.string.location) + ": " + location
-            }
-        } else {
-            description = context.getString(R.string.wind) + ": " + getWindSpeed(context)
-            if (!TextUtils.isEmpty(location)) {
-                description += "\n" + context.getString(R.string.location) + ": " + location
-            }
-        }
-        return description
-    }
-
     fun getWindSpeed(context: Context): String {
         return windSpeed.toString() + " Bft " + WindDirection.getList(context)[windDirection].name
     }
 
-    override fun getDrawable(context: Context): Drawable {
-        return if (indoor) {
-            ContextCompat.getDrawable(context, R.drawable.ic_house_24dp)!!
-        } else {
-            ContextCompat.getDrawable(context, weather.drawable)!!
-        }
-    }
-
     companion object {
         fun getDefault(indoor: Boolean): Environment {
             return Environment(indoor = indoor)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/IDetailProvider.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/IDetailProvider.kt
deleted file mode 100644
index b24eccba9..000000000
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/IDetailProvider.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2017 Florian Dreier
- *
- * This file is part of MyTargets.
- *
- * MyTargets is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * MyTargets is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-package de.dreier.mytargets.shared.models
-
-import android.content.Context
-
-interface IDetailProvider {
-    fun getDetails(context: Context): String
-}
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/IImageProvider.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/IImageProvider.kt
deleted file mode 100644
index 42bc6c182..000000000
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/IImageProvider.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2017 Florian Dreier
- *
- * This file is part of MyTargets.
- *
- * MyTargets is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * MyTargets is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-package de.dreier.mytargets.shared.models
-
-import android.content.Context
-import android.graphics.drawable.Drawable
-
-interface IImageProvider {
-    val name: String
-    fun getDrawable(context: Context): Drawable
-}
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
index 78b7542d2..d09c68943 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
@@ -16,8 +16,6 @@
 package de.dreier.mytargets.shared.models
 
 import android.annotation.SuppressLint
-import android.content.Context
-import android.graphics.drawable.Drawable
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.targets.TargetFactory
@@ -38,7 +36,7 @@ data class Target(
         override var id: Long = 0,
         var scoringStyleIndex: Int = 0,
         var diameter: Dimension = Dimension.UNKNOWN
-) : IIdProvider, IImageProvider, IDetailProvider, Comparable<Target>, Parcelable {
+) : IIdProvider, Comparable<Target>, Parcelable {
 
     @IgnoredOnParcel
     val model: TargetModelBase by lazy { TargetFactory.getTarget(id.toInt()) }
@@ -53,7 +51,7 @@ data class Target(
         this.diameter = model.diameters[0]
     }
 
-    override val name: String
+    val name: String
         get() = String.format("%s (%s)", toString(), diameter.toString())
 
     fun zoneToString(zone: Int, arrow: Int): String {
@@ -64,11 +62,7 @@ data class Target(
         return getScoringStyle().getPointsByScoringRing(zone, arrow)
     }
 
-    override fun getDrawable(context: Context): Drawable {
-        return drawable
-    }
-
-    override fun getDetails(context: Context): String {
+    fun getDetails(): String {
         return model.scoringStyles[scoringStyleIndex].toString()
     }
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/WindDirection.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/WindDirection.kt
index 5f3c8a280..5efd2d868 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/WindDirection.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/WindDirection.kt
@@ -16,9 +16,7 @@ package de.dreier.mytargets.shared.models
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.graphics.drawable.Drawable
 import android.os.Parcelable
-import android.support.v4.content.ContextCompat
 import de.dreier.mytargets.shared.R
 import kotlinx.android.parcel.Parcelize
 import java.util.*
@@ -27,13 +25,9 @@ import java.util.*
 @Parcelize
 data class WindDirection internal constructor(
         override var id: Long,
-        override val name: String,
+        val name: String,
         var drawable: Int
-) : IIdProvider, IImageProvider, Comparable<WindDirection>, Parcelable {
-
-    override fun getDrawable(context: Context): Drawable {
-        return ContextCompat.getDrawable(context, drawable)!!
-    }
+) : IIdProvider, Comparable<WindDirection>, Parcelable {
 
     override fun compareTo(other: WindDirection) = compareBy(WindDirection::id).compare(this, other)
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/WindSpeed.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/WindSpeed.kt
index 205b11419..ec3052328 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/WindSpeed.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/WindSpeed.kt
@@ -16,9 +16,7 @@ package de.dreier.mytargets.shared.models
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.graphics.drawable.Drawable
 import android.os.Parcelable
-import android.support.v4.content.ContextCompat
 import de.dreier.mytargets.shared.R
 import kotlinx.android.parcel.Parcelize
 import java.util.*
@@ -27,13 +25,9 @@ import java.util.*
 @Parcelize
 data class WindSpeed(
         override var id: Long,
-        override var name: String,
+        var name: String,
         var drawable: Int
-) : IIdProvider, IImageProvider, Comparable<WindSpeed>, Parcelable {
-
-    override fun getDrawable(context: Context): Drawable {
-        return ContextCompat.getDrawable(context, drawable)!!
-    }
+) : IIdProvider, Comparable<WindSpeed>, Parcelable {
 
     override fun compareTo(other: WindSpeed) = compareBy(WindSpeed::id).compare(this, other)
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
index 1c183d2cc..2148a751b 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
@@ -16,8 +16,6 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
-import android.content.Context
-import android.graphics.drawable.Drawable
 import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.Column
 import com.raizlabs.android.dbflow.annotation.PrimaryKey
@@ -25,7 +23,6 @@ import com.raizlabs.android.dbflow.annotation.Table
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.IIdSettable
-import de.dreier.mytargets.shared.models.IImageProvider
 import de.dreier.mytargets.shared.models.Thumbnail
 import de.dreier.mytargets.shared.utils.typeconverters.DimensionConverter
 import de.dreier.mytargets.shared.utils.typeconverters.ThumbnailConverter
@@ -40,7 +37,7 @@ data class Arrow(
         override var id: Long = 0,
 
         @Column
-        override var name: String = "",
+        var name: String = "",
 
         @Column
         var maxArrowNumber: Int = 12,
@@ -73,12 +70,4 @@ data class Arrow(
         var diameter: Dimension = Dimension(5f, Dimension.Unit.MILLIMETER),
 
         @Column(typeConverter = ThumbnailConverter::class)
-        var thumbnail: Thumbnail? = null) : IImageProvider, IIdSettable, Parcelable {
-
-    val drawable: Drawable
-        get() = thumbnail!!.roundDrawable
-
-    override fun getDrawable(context: Context): Drawable {
-        return drawable
-    }
-}
+        var thumbnail: Thumbnail? = null) : IIdSettable, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
index f40516eef..92c688c52 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
@@ -16,7 +16,6 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
-import android.content.Context
 import android.graphics.drawable.Drawable
 import android.os.Parcelable
 import android.text.TextUtils
@@ -29,7 +28,10 @@ import com.raizlabs.android.dbflow.sql.language.SQLite
 import com.raizlabs.android.dbflow.structure.BaseModel
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
-import de.dreier.mytargets.shared.models.*
+import de.dreier.mytargets.shared.models.Dimension
+import de.dreier.mytargets.shared.models.EBowType
+import de.dreier.mytargets.shared.models.IIdSettable
+import de.dreier.mytargets.shared.models.Thumbnail
 import de.dreier.mytargets.shared.utils.typeconverters.EBowTypeConverter
 import de.dreier.mytargets.shared.utils.typeconverters.ThumbnailConverter
 import kotlinx.android.parcel.IgnoredOnParcel
@@ -44,7 +46,7 @@ data class Bow(
         override var id: Long = 0,
 
         @Column
-        override var name: String = "",
+        var name: String = "",
 
         @Column(typeConverter = EBowTypeConverter::class)
         var type: EBowType? = EBowType.RECURVE_BOW,
@@ -111,7 +113,7 @@ data class Bow(
 
         @Column(typeConverter = ThumbnailConverter::class)
         var thumbnail: Thumbnail? = null
-) : BaseModel(), IImageProvider, IIdSettable, Parcelable {
+) : BaseModel(), IIdSettable, Parcelable {
 
     @IgnoredOnParcel
     var images: List<BowImage>? = null
@@ -145,10 +147,6 @@ data class Bow(
         return images!!
     }
 
-    override fun getDrawable(context: Context): Drawable {
-        return drawable
-    }
-
     fun loadSightSetting(distance: Dimension): SightMark? {
         return loadSightMarks().firstOrNull { s -> s.distance == distance }
     }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
index 79d6314eb..f28185f25 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
@@ -28,9 +28,7 @@ import com.raizlabs.android.dbflow.structure.BaseModel
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.R
-import de.dreier.mytargets.shared.models.IDetailProvider
 import de.dreier.mytargets.shared.models.IIdSettable
-import de.dreier.mytargets.shared.models.IImageProvider
 import de.dreier.mytargets.shared.targets.drawable.CombinedSpot
 import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
@@ -47,8 +45,8 @@ data class StandardRound(
         var club: Int = 0,
 
         @Column
-        override var name: String = ""
-) : BaseModel(), IIdSettable, IImageProvider, IDetailProvider, Comparable<StandardRound>, Parcelable {
+        var name: String = ""
+) : BaseModel(), IIdSettable, Parcelable {
 
     @IgnoredOnParcel
     internal var rounds: MutableList<RoundTemplate>? = null
@@ -92,15 +90,7 @@ data class StandardRound(
         this.rounds = rounds
     }
 
-    override fun getDrawable(context: Context): Drawable {
-        return targetDrawable
-    }
-
-    override fun getDetails(context: Context): String {
-        return getDescription(context)
-    }
-
-    override fun compareTo(other: StandardRound) = compareBy(StandardRound::name, StandardRound::id).compare(this, other)
+//    override fun compareTo(other: StandardRound) = compareBy(StandardRound::name, StandardRound::id).compare(this, other)
 
     override fun save(): Boolean {
         FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ this.save(it) })

From bd9d8505ff9f00ff40d087bf9181d5320d73c17a Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Thu, 4 Jan 2018 18:31:14 +0100
Subject: [PATCH 013/102] Pulled out BowDAO

---
 .../de/dreier/mytargets/app/MigrationTest.kt  |   8 +-
 .../features/main/MainActivityTest.kt         |   4 +-
 .../test/utils/rules/DbTestRuleBase.kt        |   8 +-
 .../mytargets/features/bows/BowAdapter.kt     |   5 +-
 .../features/bows/BowListFragment.kt          |   3 +-
 .../features/bows/EditBowFragment.kt          |  15 +-
 .../features/bows/EditBowListFragment.kt      |   9 +-
 .../features/statistics/StatisticsActivity.kt |   4 +-
 .../features/training/input/InputActivity.kt  |  11 +-
 .../mytargets/views/selector/BowSelector.kt   |   7 +-
 .../mytargets/shared/models/dao/BowDAO.kt     |  79 ++++++++++
 .../dreier/mytargets/shared/models/db/Bow.kt  | 140 +++---------------
 .../mytargets/shared/models/db/Image.kt       |   5 +-
 13 files changed, 144 insertions(+), 154 deletions(-)
 create mode 100644 shared/src/main/java/de/dreier/mytargets/shared/models/dao/BowDAO.kt

diff --git a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
index 55caabc12..2a7b1d18a 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
@@ -32,7 +32,7 @@ import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Dimension.Unit.CENTIMETER
 import de.dreier.mytargets.shared.models.Dimension.Unit.METER
 import de.dreier.mytargets.shared.models.EWeather
-import de.dreier.mytargets.shared.models.db.Bow
+import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.test.base.InstrumentedTestBase
@@ -92,8 +92,8 @@ class MigrationTest : InstrumentedTestBase() {
         assertTraining1(trainings[0])
         assertTraining2(trainings[1])
 
-        val bows = Bow.all
-        Truth.assertThat(bows[0].loadImages()[0].fileName)
+        val bows = BowDAO.loadBows()
+        Truth.assertThat(BowDAO.loadBowImages(bows[0].id)[0].fileName)
                 .isEqualTo("img175420839671886584-0f61-43a6-bc1e-dbcd8526056c794370927.jpg")
     }
 
@@ -190,7 +190,7 @@ class MigrationTest : InstrumentedTestBase() {
         val newSchema = extractSchema(newDb)
 
         Truth.assertThat(upgradedSchema).isEqualTo(newSchema)
-        Truth.assertThat(upgradedSchema.size > 0)
+        Truth.assertThat(upgradedSchema.isNotEmpty())
     }
 
     private fun extractSchema(db: DatabaseWrapper): Set<String> {
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
index 5c4ea4e4e..86ce65786 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
@@ -47,7 +47,7 @@ import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.EBowType
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.dao.ArrowDAO
-import de.dreier.mytargets.shared.models.db.Bow
+import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.targets.models.WAFull
 import de.dreier.mytargets.shared.views.TargetViewBase.EInputMethod
@@ -181,7 +181,7 @@ class MainActivityTest : UITestBase() {
         // openBow
         onView(withRecyclerView(R.id.recyclerView).atPosition(0))
                 .perform(click())
-        val firstBow = Bow.all.sorted().firstOrNull()
+        val firstBow = BowDAO.loadBows().sorted().firstOrNull()
         intended(allOf(hasClass(EditBowActivity::class.java),
                 hasExtra<Long>(EditBowFragment.BOW_ID, firstBow!!.id)))
 
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
index 5618d0678..7076894f3 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
@@ -26,6 +26,8 @@ import de.dreier.mytargets.shared.models.EWeather
 import de.dreier.mytargets.shared.models.Thumbnail
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
+import de.dreier.mytargets.shared.models.dao.ArrowDAO
+import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.shared.models.db.Training
@@ -93,9 +95,8 @@ abstract class DbTestRuleBase : TestRule {
         bow.size = "64\""
         bow.braceHeight = "6 3/8\""
         bow.type = EBowType.COMPOUND_BOW
-        bow.images = emptyList()
         bow.thumbnail = Thumbnail.from(context, R.drawable.recurve_bow)
-        bow.save()
+        BowDAO.saveBow(bow, emptyList(), emptyList())
         return bow
     }
 
@@ -106,9 +107,8 @@ abstract class DbTestRuleBase : TestRule {
         arrow.comment = "some comment"
         arrow.diameter = Dimension(4f, Dimension.Unit.MILLIMETER)
         arrow.nock = "Awesome nock"
-        arrow.images = emptyList()
         arrow.thumbnail = Thumbnail.from(context, R.drawable.arrows)
-        arrow.save()
+        ArrowDAO.saveArrow(arrow, emptyList())
         return arrow
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
index 2c47ddc8c..3f6368c45 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
@@ -23,6 +23,7 @@ import de.dreier.mytargets.R
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
 import de.dreier.mytargets.databinding.ItemImageDetailsBinding
 import de.dreier.mytargets.features.training.details.HtmlInfoBuilder
+import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.utils.Utils
 import de.dreier.mytargets.utils.multiselector.MultiSelector
@@ -48,7 +49,7 @@ internal class BowAdapter(
 
         override fun bindItem(item: Bow) {
             binding.name.text = item.name
-            binding.image.setImageDrawable(item.drawable)
+            binding.image.setImageDrawable(item.thumbnail!!.roundDrawable)
             binding.details.visibility = View.VISIBLE
 
             val info = HtmlInfoBuilder()
@@ -59,7 +60,7 @@ internal class BowAdapter(
             if (!item.size!!.trim { it <= ' ' }.isEmpty()) {
                 info.addLine(R.string.size, item.size!!)
             }
-            for ((_, _, distance, value) in item.loadSightMarks()) {
+            for ((_, _, distance, value) in BowDAO.loadSightMarks(item.id)) {
                 info.addLine(distance.toString(), value!!)
             }
             binding.details.text = Utils.fromHtml(info.toString())
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
index ae105770d..df9cc092f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
@@ -19,12 +19,13 @@ import android.os.Bundle
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.base.fragments.SelectPureListItemFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
+import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.db.Bow
 
 class BowListFragment : SelectPureListItemFragmentBase<Bow>(compareBy(Bow::name, Bow::id)) {
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        val bows = Bow.all
+        val bows = BowDAO.loadBows()
         return {
             adapter!!.setList(bows.toMutableList())
             val bow = arguments!!.getParcelable<Bow>(ITEM)
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
index c0fd32ffc..1697338bb 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
@@ -36,6 +36,7 @@ import de.dreier.mytargets.databinding.FragmentEditBowBinding
 import de.dreier.mytargets.databinding.ItemSightMarkBinding
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.EBowType
+import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.shared.models.db.BowImage
 import de.dreier.mytargets.shared.models.db.SightMark
@@ -54,6 +55,8 @@ class EditBowFragment : EditWithImageFragmentBase<BowImage>(R.drawable.recurve_b
     private lateinit var contentBinding: FragmentEditBowBinding
     private lateinit var adapter: SightMarksAdapter
 
+    private val bowDAO = BowDAO
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val rootView = super.onCreateView(inflater, container, savedInstanceState)
 
@@ -68,16 +71,17 @@ class EditBowFragment : EditWithImageFragmentBase<BowImage>(R.drawable.recurve_b
             val bundle = arguments
             if (bundle != null && bundle.containsKey(BOW_ID)) {
                 // Load data from database
-                bow = Bow[bundle.getLong(BOW_ID)]!!
-                sightMarks = bow.loadSightMarks()
+                bow = bowDAO.loadBow(bundle.getLong(BOW_ID))
+                sightMarks = bowDAO.loadSightMarks(bow.id)
+                imageFiles = bowDAO.loadBowImages(bow.id)
             } else {
                 // Set to default values
                 bow = Bow()
                 bow.name = getString(R.string.my_bow)
                 bow.type = bowType
                 sightMarks.add(SightMark())
+                imageFiles = emptyList()
             }
-            imageFiles = bow.loadImages()
         }
         ToolbarUtils.setTitle(this, bow.name)
         contentBinding.bow = bow
@@ -123,7 +127,8 @@ class EditBowFragment : EditWithImageFragmentBase<BowImage>(R.drawable.recurve_b
 
     public override fun onSave() {
         super.onSave()
-        buildBow().save()
+        buildBow()
+        bowDAO.saveBow(bow, imageFiles, sightMarks)
         navigationController.finish()
     }
 
@@ -149,9 +154,7 @@ class EditBowFragment : EditWithImageFragmentBase<BowImage>(R.drawable.recurve_b
         bow.restStiffness = contentBinding.restStiffness.text.toString()
         bow.camSetting = contentBinding.cam.text.toString()
         bow.scopeMagnification = contentBinding.scopeMagnification.text.toString()
-        bow.images = imageFiles
         bow.thumbnail = thumbnail
-        bow.sightMarks = sightMarks
         return bow
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
index bbcaff88f..2f11eddae 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
@@ -30,6 +30,7 @@ import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.databinding.FragmentBowsBinding
 import de.dreier.mytargets.shared.models.EBowType
 import de.dreier.mytargets.shared.models.EBowType.*
+import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.utils.DividerItemDecoration
 import de.dreier.mytargets.utils.SlideInItemAnimator
@@ -75,7 +76,7 @@ class EditBowListFragment : EditableListFragmentBase<Bow, SimpleListAdapterBase<
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        val bows = Bow.all
+        val bows = BowDAO.loadBows()
         return {
             adapter!!.setList(bows.toMutableList())
             binding.emptyState!!.root.visibility = if (bows.isEmpty()) View.VISIBLE else View.GONE
@@ -91,9 +92,11 @@ class EditBowListFragment : EditableListFragmentBase<Bow, SimpleListAdapterBase<
     }
 
     override fun deleteItem(item: Bow): () -> Bow {
-        item.delete()
+        val images = BowDAO.loadBowImages(item.id)
+        val sightMarks = BowDAO.loadSightMarks(item.id)
+        BowDAO.deleteBow(item)
         return {
-            item.saveRecursively()
+            BowDAO.saveBow(item, images, sightMarks)
             item
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
index 6fdb0d600..b63546b1b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
@@ -39,7 +39,7 @@ import de.dreier.mytargets.base.activities.ChildActivityBase
 import de.dreier.mytargets.databinding.ActivityStatisticsBinding
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.dao.ArrowDAO
-import de.dreier.mytargets.shared.models.db.Bow
+import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.utils.toSparseArray
@@ -206,7 +206,7 @@ class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<Li
                 .distinct()
                 .map { bid ->
                     if (bid != null) {
-                        val bow = Bow[bid] ?: return@map Tag(bid, "Deleted " + bid)
+                        val bow = BowDAO.loadBowOrNull(bid) ?: return@map Tag(bid, "Deleted " + bid)
                         Tag(bow.id, bow.name, bow.thumbnail, true)
                     } else {
                         Tag(null, getString(R.string.unknown))
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
index 6518796f2..731bd3997 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
@@ -47,6 +47,7 @@ import de.dreier.mytargets.databinding.ActivityInputBinding
 import de.dreier.mytargets.features.settings.ESettingsScreens
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
+import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
@@ -437,7 +438,12 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
         StateSaver.saveInstanceState(this, outState!!)
     }
 
-    private class UITaskAsyncTaskLoader(context: Context, private val trainingId: Long, private val roundId: Long, private val endIndex: Int) : AsyncTaskLoader<LoaderResult>(context) {
+    private class UITaskAsyncTaskLoader(
+            context: Context,
+            private val trainingId: Long,
+            private val roundId: Long,
+            private val endIndex: Int
+    ) : AsyncTaskLoader<LoaderResult>(context) {
 
         override fun loadInBackground(): LoaderResult? {
             val training = Training[trainingId]
@@ -453,7 +459,8 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
             }
             val bow = training.bow
             if (bow != null) {
-                result.sightMark = bow.loadSightSetting(result.distance!!)
+                result.sightMark = BowDAO.loadSightMarks(bow.id)
+                        .firstOrNull { it.distance == result.distance!! }
             }
             return result
         }
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
index 6bc4e1030..e7457af91 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
@@ -22,6 +22,7 @@ import android.databinding.DataBindingUtil
 import android.util.AttributeSet
 import de.dreier.mytargets.R
 import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
+import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.db.Bow
 
 class BowSelector @JvmOverloads constructor(
@@ -34,7 +35,7 @@ class BowSelector @JvmOverloads constructor(
     override fun bindView(item: Bow) {
         binding = DataBindingUtil.bind(view)
         binding.name.text = item.name
-        binding.image.setImageDrawable(item.getDrawable(context))
+        binding.image.setImageDrawable(item.thumbnail!!.roundDrawable)
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -47,10 +48,10 @@ class BowSelector @JvmOverloads constructor(
     fun setItemId(bow: Long?) {
         var item: Bow? = null
         if (bow != null) {
-            item = Bow[bow]
+            item = BowDAO.loadBowOrNull(bow)
         }
         if (item == null) {
-            item = Bow.all.firstOrNull()
+            item = BowDAO.loadBows().firstOrNull()
         }
         setItem(item)
     }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/BowDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/BowDAO.kt
new file mode 100644
index 000000000..a5826c016
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/BowDAO.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.shared.models.dao
+
+import com.raizlabs.android.dbflow.config.FlowManager
+import com.raizlabs.android.dbflow.sql.language.SQLite
+import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.shared.models.db.*
+
+object BowDAO {
+    fun loadBows(): List<Bow> = SQLite.select().from(Bow::class.java).queryList()
+
+    fun loadBow(id: Long): Bow = SQLite.select()
+            .from(Bow::class.java)
+            .where(Bow_Table._id.eq(id))
+            .querySingle() ?: throw IllegalStateException("Bow $id does not exist")
+
+    fun loadBowOrNull(id: Long): Bow? = SQLite.select()
+            .from(Bow::class.java)
+            .where(Bow_Table._id.eq(id))
+            .querySingle()
+
+    fun loadBowImages(id: Long): List<BowImage> = SQLite.select()
+            .from(BowImage::class.java)
+            .where(BowImage_Table.bow.eq(id))
+            .queryList()
+
+    fun loadSightMarks(id: Long): ArrayList<SightMark> = ArrayList(SQLite.select()
+            .from(SightMark::class.java)
+            .where(SightMark_Table.bow.eq(id))
+            .queryList()
+            .sortedBy { sightMark -> sightMark.distance }
+            .toMutableList())
+
+    fun saveBow(bow: Bow, images: List<BowImage>, sightMarks: List<SightMark>) {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
+                    bow.save(db)
+                    SQLite.delete(BowImage::class.java)
+                            .where(BowImage_Table.bow.eq(bow.id))
+                            .execute(db)
+                    for (image in images) {
+                        image.bowId = bow.id
+                        image.save(db)
+                    }
+                    SQLite.delete(SightMark::class.java)
+                            .where(SightMark_Table.bow.eq(bow.id))
+                            .execute(db)
+                    for (sightMark in sightMarks) {
+                        sightMark.bowId = bow.id
+                        sightMark.save(db)
+                    }
+                }
+    }
+
+    fun deleteBow(bow: Bow) {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
+                    SQLite.delete(BowImage::class.java)
+                            .where(BowImage_Table.bow.eq(bow.id))
+                            .execute(db)
+                    SQLite.delete(SightMark::class.java)
+                            .where(SightMark_Table.bow.eq(bow.id))
+                            .execute(db)
+                    bow.delete(db)
+                }
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
index 92c688c52..695b422d2 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
@@ -16,25 +16,17 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
-import android.graphics.drawable.Drawable
 import android.os.Parcelable
-import android.text.TextUtils
 import com.raizlabs.android.dbflow.annotation.Column
-import com.raizlabs.android.dbflow.annotation.OneToMany
 import com.raizlabs.android.dbflow.annotation.PrimaryKey
 import com.raizlabs.android.dbflow.annotation.Table
-import com.raizlabs.android.dbflow.config.FlowManager
-import com.raizlabs.android.dbflow.sql.language.SQLite
 import com.raizlabs.android.dbflow.structure.BaseModel
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
-import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.EBowType
 import de.dreier.mytargets.shared.models.IIdSettable
 import de.dreier.mytargets.shared.models.Thumbnail
 import de.dreier.mytargets.shared.utils.typeconverters.EBowTypeConverter
 import de.dreier.mytargets.shared.utils.typeconverters.ThumbnailConverter
-import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
 
 @SuppressLint("ParcelCreator")
@@ -115,119 +107,25 @@ data class Bow(
         var thumbnail: Thumbnail? = null
 ) : BaseModel(), IIdSettable, Parcelable {
 
-    @IgnoredOnParcel
-    var images: List<BowImage>? = null
-
-    @IgnoredOnParcel
-    var sightMarks: MutableList<SightMark>? = null
-
-    val drawable: Drawable
-        get() = thumbnail!!.roundDrawable
-
-    @OneToMany(methods = [], variableName = "sightMarks")
-    fun loadSightMarks(): ArrayList<SightMark> {
-        if (sightMarks == null) {
-            sightMarks = if (id == 0L) mutableListOf() else SQLite.select()
-                    .from(SightMark::class.java)
-                    .where(SightMark_Table.bow.eq(id))
-                    .queryList()
-                    .sortedBy { sightMark -> sightMark.distance }
-                    .toMutableList()
-        }
-        return ArrayList(sightMarks) //TODO remove
-    }
-
-    fun loadImages(): List<BowImage> {
-        if (images == null) {
-            images = if (id == 0L) mutableListOf() else SQLite.select()
-                    .from(BowImage::class.java)
-                    .where(BowImage_Table.bow.eq(id))
-                    .queryList()
-        }
-        return images!!
-    }
-
-    fun loadSightSetting(distance: Dimension): SightMark? {
-        return loadSightMarks().firstOrNull { s -> s.distance == distance }
-    }
-
-    override fun save(): Boolean {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { this.save(it) }
-        return true
-    }
-
-    override fun save(databaseWrapper: DatabaseWrapper): Boolean {
-        super.save(databaseWrapper)
-        if (images != null) {
-            SQLite.delete(BowImage::class.java)
-                    .where(BowImage_Table.bow.eq(id))
-                    .execute(databaseWrapper)
-            // TODO Replace this super ugly workaround by stubbed Relationship in version 4 of dbFlow
-            for (image in images!!) {
-                image.bowId = id
-                image.save(databaseWrapper)
-            }
-        }
-        if (sightMarks != null) {
-            SQLite.delete(SightMark::class.java)
-                    .where(SightMark_Table.bow.eq(id))
-                    .execute(databaseWrapper)
-            // TODO Replace this super ugly workaround by stubbed Relationship in version 4 of dbFlow
-            for (sightMark in sightMarks!!) {
-                sightMark.bowId = id
-                sightMark.save(databaseWrapper)
-            }
-        }
-        return true
-    }
-
-    override fun delete(): Boolean {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ this.delete(it) })
-        return true
-    }
-
-    override fun delete(databaseWrapper: DatabaseWrapper): Boolean {
-        loadSightMarks().forEach { it.delete(databaseWrapper) }
-        loadImages().forEach { it.delete(databaseWrapper) }
-        super.delete(databaseWrapper)
-        return true
-    }
-
     fun areAllPropertiesSet(): Boolean {
-        return !TextUtils.isEmpty(size) &&
-                !TextUtils.isEmpty(drawWeight) &&
-                (!type!!.showLetoffWeight() || !TextUtils.isEmpty(letoffWeight)) &&
-                (!type!!.showArrowRest() || !TextUtils.isEmpty(arrowRest)) &&
-                (!type!!.showArrowRest() || !TextUtils.isEmpty(restVerticalPosition)) &&
-                (!type!!.showArrowRest() || !TextUtils.isEmpty(restHorizontalPosition)) &&
-                (!type!!.showArrowRest() || !TextUtils.isEmpty(restStiffness)) &&
-                (!type!!.showCamSetting() || !TextUtils.isEmpty(camSetting)) &&
-                (!type!!.showTiller() || !TextUtils.isEmpty(tiller)) &&
-                (!type!!.showBraceHeight() || !TextUtils.isEmpty(braceHeight)) &&
-                (!type!!.showLimbs() || !TextUtils.isEmpty(limbs)) &&
-                (!type!!.showSight() || !TextUtils.isEmpty(sight)) &&
-                (!type!!.showScopeMagnification() || !TextUtils.isEmpty(scopeMagnification)) &&
-                (!type!!.showStabilizer() || !TextUtils.isEmpty(stabilizer)) &&
-                (!type!!.showClicker() || !TextUtils.isEmpty(clicker)) &&
-                (!type!!.showNockingPoint() || !TextUtils.isEmpty(nockingPoint)) &&
-                !TextUtils.isEmpty(string) &&
-                (!type!!.showButton() || !TextUtils.isEmpty(button)) &&
-                !TextUtils.isEmpty(description)
-    }
-
-    fun saveRecursively() {
-        save()
-    }
-
-    companion object {
-        val all: List<Bow>
-            get() = SQLite.select().from(Bow::class.java).queryList()
-
-        operator fun get(id: Long): Bow? {
-            return SQLite.select()
-                    .from(Bow::class.java)
-                    .where(Bow_Table._id.eq(id))
-                    .querySingle()
-        }
+        return !size.isNullOrEmpty() &&
+                !drawWeight.isNullOrEmpty() &&
+                (!type!!.showLetoffWeight() || !letoffWeight.isNullOrEmpty()) &&
+                (!type!!.showArrowRest() || !arrowRest.isNullOrEmpty()) &&
+                (!type!!.showArrowRest() || !restVerticalPosition.isNullOrEmpty()) &&
+                (!type!!.showArrowRest() || !restHorizontalPosition.isNullOrEmpty()) &&
+                (!type!!.showArrowRest() || !restStiffness.isNullOrEmpty()) &&
+                (!type!!.showCamSetting() || !camSetting.isNullOrEmpty()) &&
+                (!type!!.showTiller() || !tiller.isNullOrEmpty()) &&
+                (!type!!.showBraceHeight() || !braceHeight.isNullOrEmpty()) &&
+                (!type!!.showLimbs() || !limbs.isNullOrEmpty()) &&
+                (!type!!.showSight() || !sight.isNullOrEmpty()) &&
+                (!type!!.showScopeMagnification() || !scopeMagnification.isNullOrEmpty()) &&
+                (!type!!.showStabilizer() || !stabilizer.isNullOrEmpty()) &&
+                (!type!!.showClicker() || !clicker.isNullOrEmpty()) &&
+                (!type!!.showNockingPoint() || !nockingPoint.isNullOrEmpty()) &&
+                !string.isNullOrEmpty() &&
+                (!type!!.showButton() || !button.isNullOrEmpty()) &&
+                !description.isNullOrEmpty()
     }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Image.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Image.kt
index e563913ac..fda174be2 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Image.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Image.kt
@@ -18,10 +18,7 @@ package de.dreier.mytargets.shared.models.db
 interface Image {
 
     /**
-     * @return The name of the image file, which is placed inside the files directory of the app
-     */
-    /**
-     * @param fileName The name of the image file, which is placed inside the files directory of the app
+     * The name of the image file, which is placed inside the files directory of the app
      */
     var fileName: String
 }

From 744f6ce69c0d304a6172e4b0bde392206df977c2 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Thu, 4 Jan 2018 18:34:07 +0100
Subject: [PATCH 014/102] Made Bow a POJO

---
 .../main/java/de/dreier/mytargets/shared/models/dao/BowDAO.kt  | 2 ++
 .../src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt  | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/BowDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/BowDAO.kt
index a5826c016..658baba5d 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/BowDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/BowDAO.kt
@@ -16,6 +16,8 @@
 package de.dreier.mytargets.shared.models.dao
 
 import com.raizlabs.android.dbflow.config.FlowManager
+import com.raizlabs.android.dbflow.kotlinextensions.delete
+import com.raizlabs.android.dbflow.kotlinextensions.save
 import com.raizlabs.android.dbflow.sql.language.SQLite
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.db.*
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
index 695b422d2..a307c5857 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
@@ -20,7 +20,6 @@ import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.Column
 import com.raizlabs.android.dbflow.annotation.PrimaryKey
 import com.raizlabs.android.dbflow.annotation.Table
-import com.raizlabs.android.dbflow.structure.BaseModel
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.EBowType
 import de.dreier.mytargets.shared.models.IIdSettable
@@ -105,7 +104,7 @@ data class Bow(
 
         @Column(typeConverter = ThumbnailConverter::class)
         var thumbnail: Thumbnail? = null
-) : BaseModel(), IIdSettable, Parcelable {
+) : IIdSettable, Parcelable {
 
     fun areAllPropertiesSet(): Boolean {
         return !size.isNullOrEmpty() &&

From 7b54e17a519b393396ecb99e4388024a339f0847 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Fri, 5 Jan 2018 15:38:43 +0100
Subject: [PATCH 015/102] Converted Image classes to POJOs

---
 .../features/training/details/HtmlUtils.kt    | 10 +++++---
 .../training/details/TrainingFragment.kt      | 10 +++-----
 .../de/dreier/mytargets/shared/AppDatabase.kt | 25 +++++++++++++------
 .../mytargets/shared/models/db/ArrowImage.kt  |  3 +--
 .../mytargets/shared/models/db/BowImage.kt    |  3 +--
 .../dreier/mytargets/shared/models/db/End.kt  |  2 ++
 .../mytargets/shared/models/db/EndImage.kt    |  3 +--
 7 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
index 59c2d0412..66f53498a 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
@@ -16,19 +16,21 @@
 package de.dreier.mytargets.features.training.details
 
 import android.content.Context
+import android.text.Spanned
 import android.text.TextUtils
 import de.dreier.mytargets.R
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.utils.SharedUtils
+import de.dreier.mytargets.utils.Utils
 
 object HtmlUtils {
 
-    fun getTrainingInfoHTML(context: Context, training: Training, rounds: List<Round>, equals: BooleanArray): String {
+    fun getTrainingInfoHTML(context: Context, training: Training, rounds: List<Round>, equals: BooleanArray): Spanned {
         val info = HtmlInfoBuilder()
         addStaticTrainingHeaderInfo(context, info, training)
         addDynamicTrainingHeaderInfo(rounds, equals, info)
-        return info.toString()
+        return Utils.fromHtml(info.toString())
     }
 
     private fun addStaticTrainingHeaderInfo(context: Context, info: HtmlInfoBuilder, training: Training) {
@@ -83,7 +85,7 @@ object HtmlUtils {
         }
     }
 
-    fun getRoundInfo(round: Round, equals: BooleanArray): String {
+    fun getRoundInfo(round: Round, equals: BooleanArray): Spanned {
         val info = HtmlInfoBuilder()
         if (!equals[0]) {
             info.addLine(R.string.distance, round.distance)
@@ -94,6 +96,6 @@ object HtmlUtils {
         if (!round.comment.isEmpty()) {
             info.addLine(R.string.comment, round.comment)
         }
-        return info.toString()
+        return Utils.fromHtml(info.toString())
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index e7038efe0..516d83b88 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -120,8 +120,7 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
 
             // Set round info
             binding.weatherIcon.setImageResource(training!!.environment.colorDrawable)
-            binding.detailRoundInfo.text = Utils
-                    .fromHtml(HtmlUtils.getTrainingInfoHTML(context!!, training!!, rounds, equals))
+            binding.detailRoundInfo.text = HtmlUtils.getTrainingInfoHTML(context!!, training!!, rounds, equals)
             adapter!!.setList(rounds.toMutableList())
 
             activity!!.invalidateOptionsMenu()
@@ -203,15 +202,14 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
         override fun bindItem(item: Round) {
             binding.title.text = resources.getQuantityString(R.plurals.rounds, item
                     .index + 1, item.index + 1)
-            binding.subtitle.text = Utils.fromHtml(HtmlUtils.getRoundInfo(item, equals))
-            if (binding.subtitle.text.toString().isEmpty()) {
+            binding.subtitle.text = HtmlUtils.getRoundInfo(item, equals)
+            if (binding.subtitle.text.isEmpty()) {
                 binding.subtitle.visibility = View.GONE
             } else {
                 binding.subtitle.visibility = View.VISIBLE
             }
             binding.points.text = item.reachedScore
-                    .format(Utils.getCurrentLocale(context!!), SettingsManager
-                            .scoreConfiguration)
+                    .format(Utils.getCurrentLocale(context!!), SettingsManager.scoreConfiguration)
         }
     }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
index f5c331dc0..2305f8763 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
@@ -17,9 +17,10 @@ package de.dreier.mytargets.shared
 
 import com.raizlabs.android.dbflow.annotation.Database
 import com.raizlabs.android.dbflow.annotation.Migration
+import com.raizlabs.android.dbflow.kotlinextensions.delete
+import com.raizlabs.android.dbflow.kotlinextensions.save
 import com.raizlabs.android.dbflow.sql.language.SQLite
 import com.raizlabs.android.dbflow.sql.migration.BaseMigration
-import com.raizlabs.android.dbflow.structure.BaseModel
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.models.db.ArrowImage
 import de.dreier.mytargets.shared.models.db.BowImage
@@ -58,12 +59,20 @@ object AppDatabase {
     class Migration23 : BaseMigration() {
 
         override fun migrate(database: DatabaseWrapper) {
-            removeFilePath(database, EndImage::class.java)
-            removeFilePath(database, BowImage::class.java)
-            removeFilePath(database, ArrowImage::class.java)
+            removeFilePath(database, EndImage::class.java,
+                    { endImage, db -> endImage.save(db) },
+                    { endImage, db -> endImage.delete(db) })
+            removeFilePath(database, BowImage::class.java,
+                    { bowImage, db -> bowImage.save(db) },
+                    { bowImage, db -> bowImage.delete(db) })
+            removeFilePath(database, ArrowImage::class.java,
+                    { arrowImage, db -> arrowImage.save(db) },
+                    { arrowImage, db -> arrowImage.delete(db) })
         }
 
-        private fun <T> removeFilePath(database: DatabaseWrapper, clazz: Class<out T>) where T : BaseModel, T : Image {
+        private fun <T> removeFilePath(database: DatabaseWrapper, clazz: Class<out T>,
+                                       save: (T, DatabaseWrapper) -> Boolean,
+                                       delete: (T, DatabaseWrapper) -> Boolean) where T : Image {
             val images = SQLite.select().from(clazz).queryList(database)
             for (image in images) {
                 val filesDir = SharedApplicationInstance.context.filesDir
@@ -76,7 +85,7 @@ object AppDatabase {
                 // In case the image was already copied to the files, but does still contain the wrong path
                 if (imageFile.exists() || imageFileFromSomewhere.exists()) {
                     image.fileName = imageFile.name
-                    image.save(database)
+                    save(image, database)
                     continue
                 }
 
@@ -87,13 +96,13 @@ object AppDatabase {
                                 .createTempFile("img", imageFromSomewhere.name, filesDir)
                         imageFromSomewhere.moveTo(imageFile)
                         image.fileName = imageFile.name
-                        image.save(database)
+                        save(image, database)
                     } catch (e: IOException) {
                         e.printStackTrace()
                     }
 
                 } else {
-                    image.delete(database)
+                    delete(image, database)
                 }
             }
         }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
index c4fb3fdb3..fcdcffe59 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
@@ -18,7 +18,6 @@ package de.dreier.mytargets.shared.models.db
 import android.annotation.SuppressLint
 import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.*
-import com.raizlabs.android.dbflow.structure.BaseModel
 import de.dreier.mytargets.shared.AppDatabase
 import kotlinx.android.parcel.Parcelize
 
@@ -35,4 +34,4 @@ data class ArrowImage(
 
         @ForeignKey(tableClass = Arrow::class, references = [(ForeignKeyReference(columnName = "arrow", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.CASCADE)
         var arrowId: Long? = null
-) : BaseModel(), Image, Parcelable
+) : Image, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
index 12be9c98a..bf52ed849 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
@@ -18,7 +18,6 @@ package de.dreier.mytargets.shared.models.db
 import android.annotation.SuppressLint
 import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.*
-import com.raizlabs.android.dbflow.structure.BaseModel
 import de.dreier.mytargets.shared.AppDatabase
 import kotlinx.android.parcel.Parcelize
 
@@ -35,4 +34,4 @@ data class BowImage(
 
         @ForeignKey(tableClass = Bow::class, references = [(ForeignKeyReference(columnName = "bow", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.CASCADE)
         var bowId: Long? = null
-) : BaseModel(), Image, Parcelable
+) : Image, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
index 05f355536..4913faa1c 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
@@ -20,6 +20,8 @@ import android.os.Parcelable
 import android.support.v4.util.Pair
 import com.raizlabs.android.dbflow.annotation.*
 import com.raizlabs.android.dbflow.config.FlowManager
+import com.raizlabs.android.dbflow.kotlinextensions.delete
+import com.raizlabs.android.dbflow.kotlinextensions.save
 import com.raizlabs.android.dbflow.sql.language.SQLite
 import com.raizlabs.android.dbflow.structure.BaseModel
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
index d68423be0..18b8d0268 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
@@ -18,7 +18,6 @@ package de.dreier.mytargets.shared.models.db
 import android.os.Parcel
 import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.*
-import com.raizlabs.android.dbflow.structure.BaseModel
 import de.dreier.mytargets.shared.AppDatabase
 
 @Table(database = AppDatabase::class)
@@ -32,7 +31,7 @@ data class EndImage(
 
         @ForeignKey(tableClass = End::class, references = [(ForeignKeyReference(columnName = "end", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.CASCADE)
         var endId: Long? = null
-) : BaseModel(), Image, Parcelable {
+) : Image, Parcelable {
     constructor(imageFile: String) : this(fileName = imageFile)
 
     constructor(source: Parcel) : this(

From 79293c1b9c6bd56638a64708be60d7ec26dce075 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Fri, 5 Jan 2018 16:06:38 +0100
Subject: [PATCH 016/102] Added lateinit to GalleryActivity

---
 .../mytargets/base/gallery/GalleryActivity.kt | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
index 402157b48..b70a8abc7 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
@@ -52,10 +52,10 @@ class GalleryActivity : ChildActivityBase() {
 
     internal var adapter: ViewPagerAdapter? = null
     internal var layoutManager: LinearLayoutManager? = null
-    internal var previewAdapter: HorizontalListAdapters? = null
+    internal lateinit var previewAdapter: HorizontalListAdapters
 
     @State
-    var imageList: ImageList? = null
+    lateinit var imageList: ImageList
 
     private lateinit var binding: ActivityGalleryBinding
 
@@ -79,19 +79,19 @@ class GalleryActivity : ChildActivityBase() {
         layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)
         binding.imagesHorizontalList.layoutManager = layoutManager
 
-        adapter = ViewPagerAdapter(this, imageList!!, binding.toolbar, binding.imagesHorizontalList)
+        adapter = ViewPagerAdapter(this, imageList, binding.toolbar, binding.imagesHorizontalList)
         binding.pager.adapter = adapter
 
-        previewAdapter = HorizontalListAdapters(this, imageList!!, { this.goToImage(it) })
+        previewAdapter = HorizontalListAdapters(this, imageList, { this.goToImage(it) })
         binding.imagesHorizontalList.adapter = previewAdapter
-        previewAdapter!!.notifyDataSetChanged()
+        previewAdapter.notifyDataSetChanged()
 
         binding.pager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
             override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
 
             override fun onPageSelected(position: Int) {
                 binding.imagesHorizontalList.smoothScrollToPosition(position)
-                previewAdapter!!.setSelectedItem(position)
+                previewAdapter.setSelectedItem(position)
             }
 
             override fun onPageScrollStateChanged(state: Int) {
@@ -100,10 +100,10 @@ class GalleryActivity : ChildActivityBase() {
         })
 
         val currentPos = 0
-        previewAdapter!!.setSelectedItem(currentPos)
+        previewAdapter.setSelectedItem(currentPos)
         binding.pager.currentItem = currentPos
 
-        if (imageList!!.size() == 0 && savedInstanceState == null) {
+        if (imageList.size() == 0 && savedInstanceState == null) {
             onTakePictureWithPermissionCheck()
         }
     }
@@ -115,8 +115,8 @@ class GalleryActivity : ChildActivityBase() {
 
     override fun onPrepareOptionsMenu(menu: Menu): Boolean {
         super.onPrepareOptionsMenu(menu)
-        menu.findItem(R.id.action_share).isVisible = !imageList!!.isEmpty
-        menu.findItem(R.id.action_delete).isVisible = !imageList!!.isEmpty
+        menu.findItem(R.id.action_share).isVisible = !imageList.isEmpty
+        menu.findItem(R.id.action_delete).isVisible = !imageList.isEmpty
         return true
     }
 
@@ -141,7 +141,7 @@ class GalleryActivity : ChildActivityBase() {
     }
 
     private fun shareImage(currentItem: Int) {
-        val currentImage = imageList!![currentItem]
+        val currentImage = imageList[currentItem]
         val file = File(filesDir, currentImage.fileName)
         val uri = file.toUri(this)
         val shareIntent = Intent(Intent.ACTION_SEND)
@@ -158,19 +158,19 @@ class GalleryActivity : ChildActivityBase() {
                 .positiveText(R.string.delete)
                 .positiveColorRes(R.color.md_red_500)
                 .onPositive { _, _ ->
-                    imageList!!.remove(currentItem)
+                    imageList.remove(currentItem)
                     updateResult()
                     invalidateOptionsMenu()
                     adapter!!.notifyDataSetChanged()
-                    val nextItem = Math.min(imageList!!.size() - 1, currentItem)
-                    previewAdapter!!.setSelectedItem(nextItem)
+                    val nextItem = Math.min(imageList.size() - 1, currentItem)
+                    previewAdapter.setSelectedItem(nextItem)
                     binding.pager.currentItem = nextItem
                 }
                 .show()
     }
 
     private fun updateResult() {
-        navigationController.setResultSuccess(imageList!!)
+        navigationController.setResultSuccess(imageList)
     }
 
     public override fun onSaveInstanceState(outState: Bundle?) {
@@ -234,20 +234,20 @@ class GalleryActivity : ChildActivityBase() {
 
             override fun onPostExecute(files: List<String>) {
                 super.onPostExecute(files)
-                imageList!!.addAll(files)
+                imageList.addAll(files)
                 updateResult()
                 invalidateOptionsMenu()
-                previewAdapter!!.notifyDataSetChanged()
+                previewAdapter.notifyDataSetChanged()
                 adapter!!.notifyDataSetChanged()
-                val currentPos = imageList!!.size() - 1
-                previewAdapter!!.setSelectedItem(currentPos)
+                val currentPos = imageList.size() - 1
+                previewAdapter.setSelectedItem(currentPos)
                 binding.pager.currentItem = currentPos
             }
         }.execute()
     }
 
     private fun goToImage(pos: Int) {
-        if (imageList!!.size() == pos) {
+        if (imageList.size() == pos) {
             onTakePictureWithPermissionCheck()
         } else {
             binding.pager.setCurrentItem(pos, true)

From 7d4c89e156467d36e844d847bac1755dbdc3bfe7 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Sat, 6 Jan 2018 13:02:55 +0100
Subject: [PATCH 017/102] Made training date non nullable

---
 .../features/scoreboard/ScoreboardFragment.kt |  2 +-
 .../training/edit/EditTrainingFragment.kt     | 19 +----
 .../views/selector/EnvironmentSelector.kt     | 10 +--
 .../views/selector/ImageSelectorBase.kt       | 27 -------
 .../mytargets/shared/models/dao/EndDAO.kt     | 78 +++++++++++++++++++
 .../dreier/mytargets/shared/models/db/End.kt  | 26 +++----
 .../dreier/mytargets/shared/models/db/Shot.kt |  8 +-
 .../mytargets/shared/models/db/Training.kt    |  2 +-
 8 files changed, 105 insertions(+), 67 deletions(-)
 delete mode 100644 app/src/main/java/de/dreier/mytargets/views/selector/ImageSelectorBase.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt

diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
index 99adf9343..b719b6a73 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
@@ -236,6 +236,6 @@ class ScoreboardFragment : FragmentBase() {
 
     fun getDefaultFileName(extension: EFileType): String {
         return training!!.date.format(DateTimeFormatter.ISO_LOCAL_DATE) + "-" +
-                getString(R.string.scoreboard) + "." + extension.name.toLowerCase()
+                getString(R.string.scoreboard) + "." + extension.name.toLowerCase(Locale.US)
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
index aa2d87aa2..091a19618 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
@@ -44,6 +44,7 @@ import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.targets.models.WA3Ring3Spot
 import de.dreier.mytargets.utils.ToolbarUtils
+import de.dreier.mytargets.utils.getLongOrNull
 import de.dreier.mytargets.utils.Utils
 import de.dreier.mytargets.views.selector.ArrowSelector
 import de.dreier.mytargets.views.selector.BowSelector
@@ -71,17 +72,8 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
             training.title = binding.training.text.toString()
             training.date = date
             training.environment = binding.environment.selectedItem!!
-            training.bowId = if (binding.bow.selectedItem == null)
-                null
-            else
-                binding.bow
-                        .selectedItem!!
-                        .id
-            training.arrowId = if (binding.arrow.selectedItem == null)
-                null
-            else
-                binding.arrow
-                        .selectedItem!!.id
+            training.bowId = binding.bow.selectedItem?.id
+            training.arrowId = binding.arrow.selectedItem?.id
             training.arrowNumbering = binding.numberArrows.isChecked
 
             SettingsManager.bow = training.bowId
@@ -109,10 +101,7 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
         binding = DataBindingUtil
                 .inflate(inflater, R.layout.fragment_edit_training, container, false)
 
-        val arguments = arguments
-        if (arguments != null && arguments.containsKey(ITEM_ID)) {
-            trainingId = arguments.getLong(ITEM_ID)
-        }
+        trainingId = arguments.getLongOrNull(ITEM_ID)
         trainingType = if (activity?.intent?.action == CREATE_TRAINING_WITH_STANDARD_ROUND_ACTION) {
             TRAINING_WITH_STANDARD_ROUND
         } else {
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
index eb47e4c64..e7cfa56c8 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
@@ -87,7 +87,7 @@ class EnvironmentSelector @JvmOverloads constructor(context: Context, attrs: Att
         return description
     }
 
-    fun queryWeather(fragment: Fragment, request_code: Int) {
+    fun queryWeather(fragment: Fragment, requestCode: Int) {
         if (isTestMode) {
             setDefaultWeather()
             return
@@ -95,9 +95,9 @@ class EnvironmentSelector @JvmOverloads constructor(context: Context, attrs: Att
         if (ContextCompat.checkSelfPermission(fragment.context!!, ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
             setDefaultWeather()
             fragment.requestPermissions(arrayOf(ACCESS_FINE_LOCATION),
-                    request_code)
+                    requestCode)
         } else {
-            queryWeatherInfo(fragment.context)
+            queryWeatherInfo(fragment.context!!)
         }
     }
 
@@ -113,9 +113,9 @@ class EnvironmentSelector @JvmOverloads constructor(context: Context, attrs: Att
     // Start getting weather for current location
     @SuppressLint("MissingPermission", "SupportAnnotationUsage")
     @RequiresPermission(anyOf = [ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION])
-    private fun queryWeatherInfo(context: Context?) {
+    private fun queryWeatherInfo(context: Context) {
         setItem(null)
-        Locator(context!!).getLocation(Locator.Method.NETWORK_THEN_GPS, object : Locator.Listener {
+        Locator(context).getLocation(Locator.Method.NETWORK_THEN_GPS, object : Locator.Listener {
             override fun onLocationFound(location: Location) {
                 val locationStr = getAddressFromLocation(location.latitude, location.longitude)
                 val weatherService = WeatherService()
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/ImageSelectorBase.kt b/app/src/main/java/de/dreier/mytargets/views/selector/ImageSelectorBase.kt
deleted file mode 100644
index 994c2e722..000000000
--- a/app/src/main/java/de/dreier/mytargets/views/selector/ImageSelectorBase.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2017 Florian Dreier
- *
- * This file is part of MyTargets.
- *
- * MyTargets is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * MyTargets is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-package de.dreier.mytargets.views.selector
-
-import android.content.Context
-import android.os.Parcelable
-import android.util.AttributeSet
-import de.dreier.mytargets.R
-
-abstract class ImageSelectorBase<T> @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet?,
-        requestCode: Int
-) : SelectorBase<T>(context, attrs, R.layout.selector_item_image_details, requestCode) where T : Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
new file mode 100644
index 000000000..59c67527a
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.shared.models.dao
+
+import com.raizlabs.android.dbflow.config.FlowManager
+import com.raizlabs.android.dbflow.kotlinextensions.save
+import com.raizlabs.android.dbflow.sql.language.SQLite
+import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.shared.models.db.*
+
+object EndDAO {
+    fun loadEnds(): List<End> = SQLite.select().from(End::class.java).queryList()
+
+    fun loadEnd(id: Long): End = SQLite.select()
+            .from(End::class.java)
+            .where(End_Table._id.eq(id))
+            .querySingle() ?: throw IllegalStateException("End $id does not exist")
+
+    fun loadEndOrNull(id: Long): End? = SQLite.select()
+            .from(End::class.java)
+            .where(End_Table._id.eq(id))
+            .querySingle()
+
+    fun loadEndImages(id: Long): List<EndImage> = SQLite.select()
+            .from(EndImage::class.java)
+            .where(EndImage_Table.end.eq(id))
+            .queryList()
+
+    fun loadShots(id: Long): MutableList<Shot> = SQLite.select()
+            .from(Shot::class.java)
+            .where(Shot_Table.end.eq(id))
+            .queryList().toMutableList()
+
+    fun saveEnd(end: End, images: List<EndImage>, shots: List<Shot>) {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
+                    end.save(db)
+                    SQLite.delete(EndImage::class.java)
+                            .where(EndImage_Table.end.eq(end.id))
+                            .execute(db)
+                    for (image in images) {
+                        image.endId = end.id
+                        image.save(db)
+                    }
+                    SQLite.delete(Shot::class.java)
+                            .where(Shot_Table.end.eq(end.id))
+                            .execute(db)
+                    for (shot in shots) {
+                        shot.endId = end.id
+                        shot.save(db)
+                    }
+                }
+    }
+
+    fun deleteEnd(end: End) {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
+                    SQLite.delete(EndImage::class.java)
+                            .where(EndImage_Table.end.eq(end.id))
+                            .execute(db)
+                    SQLite.delete(Shot::class.java)
+                            .where(Shot_Table.end.eq(end.id))
+                            .execute(db)
+                    end.delete(db)
+                }
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
index 4913faa1c..7cec6ec35 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
@@ -57,7 +57,7 @@ data class End(
         var saveTime: LocalTime? = null,
 
         @Column
-        var comment: String? = ""
+        var comment: String = ""
 ) : BaseModel(), IIdSettable, Comparable<End>, Parcelable {
 
     @IgnoredOnParcel
@@ -163,7 +163,7 @@ data class End(
         FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ this.saveRecursively(it) })
     }
 
-    fun saveRecursively(databaseWrapper: DatabaseWrapper) {
+    private fun saveRecursively(databaseWrapper: DatabaseWrapper) {
         val round = Round[roundId!!]
         val ends = round!!.loadEnds(databaseWrapper).toMutableList()
 
@@ -188,18 +188,18 @@ data class End(
             rounds.flatMap { it.loadEnds() }
                     .forEach {
                         it.loadShots().forEach { s ->
-                            if (s.scoringRing != Shot.NOTHING_SELECTED) {
-                                val tuple = SelectableZone(s.scoringRing,
-                                        t.model.getZone(s.scoringRing),
-                                        t.zoneToString(s.scoringRing, s.index),
-                                        t.getScoreByZone(s.scoringRing, s.index))
-                                val integer = scoreCount[tuple]
-                                if (integer != null) {
-                                    val count = integer + 1
-                                    scoreCount[tuple] = count
+                                    if (s.scoringRing != Shot.NOTHING_SELECTED) {
+                                        val tuple = SelectableZone(s.scoringRing,
+                                                t.model.getZone(s.scoringRing),
+                                                t.zoneToString(s.scoringRing, s.index),
+                                                t.getScoreByZone(s.scoringRing, s.index))
+                                        val integer = scoreCount[tuple]
+                                        if (integer != null) {
+                                            val count = integer + 1
+                                            scoreCount[tuple] = count
+                                        }
+                                    }
                                 }
-                            }
-                        }
                     }
             return scoreCount
         }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
index 07e7ab2e0..c8122dc83 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
@@ -18,7 +18,6 @@ package de.dreier.mytargets.shared.models.db
 import android.os.Parcel
 import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.*
-import com.raizlabs.android.dbflow.structure.BaseModel
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.IIdSettable
 
@@ -36,10 +35,10 @@ data class Shot(
         var endId: Long? = null,
 
         @Column
-        var x: Float = 0.toFloat(),
+        var x: Float = 0f,
 
         @Column
-        var y: Float = 0.toFloat(),
+        var y: Float = 0f,
 
         @Column
         var scoringRing: Int = NOTHING_SELECTED,
@@ -47,7 +46,7 @@ data class Shot(
         // Is the actual number of the arrow not its index, arrow id or something else
         @Column
         var arrowNumber: String? = null
-) : BaseModel(), IIdSettable, Comparable<Shot>, Parcelable {
+) : IIdSettable, Comparable<Shot>, Parcelable {
     constructor(i: Int) : this(index = i)
 
     override fun compareTo(other: Shot): Int {
@@ -84,7 +83,6 @@ data class Shot(
 
     companion object {
         const val NOTHING_SELECTED = -2
-
         const val MISS = -1
 
         @JvmField
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
index 5df193a08..51f7a2c01 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
@@ -207,7 +207,7 @@ data class Training(
         FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ this.saveRecursively(it) })
     }
 
-    fun saveRecursively(databaseWrapper: DatabaseWrapper) {
+    private fun saveRecursively(databaseWrapper: DatabaseWrapper) {
         super.save(databaseWrapper)
         loadRounds().forEach { s ->
             s.trainingId = id

From d6df24aefb098eb9fa846272a8cdb02b5c86ecbd Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Sun, 7 Jan 2018 15:55:05 +0100
Subject: [PATCH 018/102] Pulled out Comparable from ArrowStatistic

---
 .../base/adapters/header/HeaderListAdapterBase.kt      | 10 ++++++++--
 .../scoreboard/layout/DefaultScoreboardLayout.kt       |  2 +-
 .../mytargets/features/statistics/ArrowStatistic.kt    |  3 +--
 .../features/statistics/StatisticsFragment.kt          |  2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt
index 9749bd132..2fe95c7d8 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt
@@ -23,11 +23,16 @@ import de.dreier.mytargets.utils.multiselector.ItemBindingHolder
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 import java.util.*
 
-abstract class HeaderListAdapterBase<P : IIdProvider, C : IIdProvider, H : HeaderListAdapterBase.HeaderHolder<P, C>>(private val partitionDelegate: PartitionDelegate<P, C>, private val headerComparator: Comparator<P>, private val childComparator: Comparator<C>) : ListAdapterBase<ItemBindingHolder<IIdProvider>, C>() {
+abstract class HeaderListAdapterBase<P : IIdProvider, C : IIdProvider, H : HeaderListAdapterBase.HeaderHolder<P, C>>(
+        private val partitionDelegate: PartitionDelegate<P, C>,
+        private val headerComparator: Comparator<P>,
+        private val childComparator: Comparator<C>
+) : ListAdapterBase<ItemBindingHolder<IIdProvider>, C>() {
+
     protected var headersList: MutableList<H> = ArrayList()
 
     init {
-        setHasStableIds(true)
+        super.setHasStableIds(true)
     }
 
     override fun getItem(position: Int): C? {
@@ -56,6 +61,7 @@ abstract class HeaderListAdapterBase<P : IIdProvider, C : IIdProvider, H : Heade
         return if (getHeaderRelativePosition(position) == 0) HEADER_TYPE else ITEM_TYPE
     }
 
+    @Suppress("UNCHECKED_CAST")
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemBindingHolder<IIdProvider> {
         return if (viewType == HEADER_TYPE) {
             getTopLevelViewHolder(parent) as ItemBindingHolder<IIdProvider>
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
index 0d830ceed..284a161b7 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
@@ -286,7 +286,7 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
                     comments.startRow()
                             .addCell(round.index + 1)
                             .addCell(index + 1)
-                            .addCell(TextCell(comment!!, wrapText = true))
+                            .addCell(TextCell(comment, wrapText = true))
                     commentsCount++
                 }
             }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
index fde7609d3..c6f7efe56 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
@@ -41,7 +41,7 @@ data class ArrowStatistic(
         var totalScore: Score = Score(),
         var arrowDiameter: Dimension = Dimension(5f, Dimension.Unit.MILLIMETER),
         var exportFileName: String? = null
-) : Comparable<ArrowStatistic>, Parcelable {
+) : Parcelable {
 
     val appropriateBgColor: Int
         get() = BG_COLORS[ceil(((BG_COLORS.size - 1) * totalScore.percent).toDouble()).toInt()]
@@ -63,7 +63,6 @@ data class ArrowStatistic(
                 .sum()
     }
 
-    override fun compareTo(other: ArrowStatistic) = compareByDescending<ArrowStatistic>({ totalScore.shotAverage }).compare(this, other)
 
     companion object {
         private val BG_COLORS = intArrayOf(-0xbbcca, -0xa8de, -0x6800, -0x3ef9, -0x14c5, -0x3223c7, -0x743cb6, -0xb350b0)
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
index 7d7eafc8d..fd1515165 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
@@ -166,6 +166,7 @@ class StatisticsFragment : FragmentBase() {
                 .filterNotNull()
 
         val data = ArrowStatistic.getAll(target!!, rounds!!)
+                .sortedWith(compareByDescending({ it.totalScore.shotAverage }))
 
         return {
             showLineChart()
@@ -175,7 +176,6 @@ class StatisticsFragment : FragmentBase() {
             binding.chartView.invalidate()
 
             binding.arrowRankingLabel.visibility = if (data.isEmpty()) View.GONE else View.VISIBLE
-            Collections.sort(data)
             adapter!!.setData(data)
         }
     }

From aba78d06218f6d8b242f839c6b9d51c5bc5fe184 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Sun, 7 Jan 2018 16:02:10 +0100
Subject: [PATCH 019/102] Made builder use lateinit

---
 .../layout/DefaultScoreboardLayout.kt         | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
index 284a161b7..e01852cac 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
@@ -34,7 +34,7 @@ import de.dreier.mytargets.shared.utils.SharedUtils
 import java.util.*
 
 class DefaultScoreboardLayout(private val context: Context, private val locale: Locale, private val configuration: ScoreboardConfiguration) {
-    private var builder: ScoreboardBuilder? = null
+    private lateinit var builder: ScoreboardBuilder
 
     fun generateWithBuilder(builder: ScoreboardBuilder, training: Training, rounds: List<Round>) {
         this.builder = builder
@@ -141,19 +141,19 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
 
     private fun appendStatistics(rounds: List<Round>) {
         if (rounds.size == 1) {
-            builder!!.table(getStatisticsForRound(rounds))
+            builder.table(getStatisticsForRound(rounds))
         } else if (rounds.size > 1) {
             for (round in rounds) {
-                builder!!.openSection()
-                builder!!.subtitle(context.resources.getQuantityString(R.plurals.rounds, round
+                builder.openSection()
+                builder.subtitle(context.resources.getQuantityString(R.plurals.rounds, round
                         .index + 1, round.index + 1))
-                builder!!.table(getStatisticsForRound(listOf(round)))
-                builder!!.closeSection()
+                builder.table(getStatisticsForRound(listOf(round)))
+                builder.closeSection()
             }
-            builder!!.openSection()
-            builder!!.subtitle(context.getString(R.string.scoreboard_title_all_rounds))
-            builder!!.table(getStatisticsForRound(rounds))
-            builder!!.closeSection()
+            builder.openSection()
+            builder.subtitle(context.getString(R.string.scoreboard_title_all_rounds))
+            builder.table(getStatisticsForRound(rounds))
+            builder.closeSection()
         }
     }
 
@@ -294,7 +294,7 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
 
         // If a minimum of one comment is present show comments table
         if (commentsCount > 0) {
-            builder!!.table(comments)
+            builder.table(comments)
         }
     }
 
@@ -323,6 +323,6 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
     }
 
     private fun appendSignature(training: Training) {
-        builder!!.signature(training.orCreateArcherSignature, training.orCreateWitnessSignature)
+        builder.signature(training.orCreateArcherSignature, training.orCreateWitnessSignature)
     }
 }

From 4721d77f5dd8ac16f1676c23701544c86401e5e6 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Sun, 7 Jan 2018 16:12:19 +0100
Subject: [PATCH 020/102] Extracted End companion object to ScoreUtils

---
 .../layout/DefaultScoreboardLayout.kt         | 10 +--
 .../features/statistics/StatisticsFragment.kt |  4 +-
 .../dreier/mytargets/shared/models/db/End.kt  | 65 --------------
 .../mytargets/shared/utils/ScoreUtils.kt      | 85 +++++++++++++++++++
 4 files changed, 91 insertions(+), 73 deletions(-)
 create mode 100644 shared/src/main/java/de/dreier/mytargets/shared/utils/ScoreUtils.kt

diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
index e01852cac..ea05c69ce 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
@@ -25,11 +25,11 @@ import de.dreier.mytargets.features.scoreboard.builder.model.TextCell
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.SelectableZone
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.targets.scoringstyle.ScoringStyle
+import de.dreier.mytargets.shared.utils.ScoreUtils
 import de.dreier.mytargets.shared.utils.SharedUtils
 import java.util.*
 
@@ -172,9 +172,7 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
     }
 
     private fun getStatisticsForRound(rounds: List<Round>): Table {
-        val scoreDistribution = End
-                .getSortedScoreDistribution(
-                        rounds)
+        val scoreDistribution = ScoreUtils.getSortedScoreDistribution(rounds)
         var hits = 0
         var total = 0
         for ((key, value) in scoreDistribution) {
@@ -184,7 +182,7 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
             total += value
         }
 
-        val topScores = End.getTopScoreDistribution(scoreDistribution)
+        val topScores = ScoreUtils.getTopScoreDistribution(scoreDistribution)
 
         val table = Table(false)
         var row: Table.Row = table.startRow()
@@ -198,7 +196,7 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
         for (topScore in topScores) {
             row.addCell(topScore.second!!)
         }
-        row.addCell(hits.toString() + "/" + total)
+        row.addCell("$hits/$total")
         row.addCell(getAverageScore(scoreDistribution))
         return table
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
index fd1515165..91e126f6c 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
@@ -47,6 +47,7 @@ import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.utils.Color
+import de.dreier.mytargets.shared.utils.ScoreUtils
 import de.dreier.mytargets.shared.utils.SharedUtils
 import de.dreier.mytargets.utils.MobileWearableClient
 import de.dreier.mytargets.utils.MobileWearableClient.Companion.BROADCAST_UPDATE_TRAINING_FROM_REMOTE
@@ -290,8 +291,7 @@ class StatisticsFragment : FragmentBase() {
     }
 
     private fun addPieData() {
-        val scores = End
-                .getSortedScoreDistribution(rounds!!)
+        val scores = ScoreUtils.getSortedScoreDistribution(rounds!!)
 
         val yValues = ArrayList<PieEntry>()
         val colors = ArrayList<Int>()
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
index 7cec6ec35..04ec6a50e 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
@@ -17,7 +17,6 @@ package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
 import android.os.Parcelable
-import android.support.v4.util.Pair
 import com.raizlabs.android.dbflow.annotation.*
 import com.raizlabs.android.dbflow.config.FlowManager
 import com.raizlabs.android.dbflow.kotlinextensions.delete
@@ -27,8 +26,6 @@ import com.raizlabs.android.dbflow.structure.BaseModel
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.IIdSettable
-import de.dreier.mytargets.shared.models.SelectableZone
-import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.utils.typeconverters.LocalTimeConverter
 import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
@@ -179,66 +176,4 @@ data class End(
             end.save(databaseWrapper)
         }
     }
-
-    companion object {
-
-        private fun getRoundScores(rounds: List<Round>): Map<SelectableZone, Int> {
-            val t = rounds[0].target
-            val scoreCount = getAllPossibleZones(t)
-            rounds.flatMap { it.loadEnds() }
-                    .forEach {
-                        it.loadShots().forEach { s ->
-                                    if (s.scoringRing != Shot.NOTHING_SELECTED) {
-                                        val tuple = SelectableZone(s.scoringRing,
-                                                t.model.getZone(s.scoringRing),
-                                                t.zoneToString(s.scoringRing, s.index),
-                                                t.getScoreByZone(s.scoringRing, s.index))
-                                        val integer = scoreCount[tuple]
-                                        if (integer != null) {
-                                            val count = integer + 1
-                                            scoreCount[tuple] = count
-                                        }
-                                    }
-                                }
-                    }
-            return scoreCount
-        }
-
-        private fun getAllPossibleZones(t: Target): MutableMap<SelectableZone, Int> {
-            val scoreCount = HashMap<SelectableZone, Int>()
-            for (arrow in 0..2) {
-                val zoneList = t.getSelectableZoneList(arrow)
-                for (selectableZone in zoneList) {
-                    scoreCount[selectableZone] = 0
-                }
-                if (!t.model.dependsOnArrowIndex()) {
-                    break
-                }
-            }
-            return scoreCount
-        }
-
-        fun getTopScoreDistribution(sortedScore: List<Map.Entry<SelectableZone, Int>>): List<Pair<String, Int>> {
-            val result = sortedScore.map { Pair(it.key.text, it.value) }.toMutableList()
-
-            // Collapse first two entries if they yield the same score points,
-            // e.g. 10 and X => {X, 10+X, 9, ...}
-            if (sortedScore.size > 1) {
-                val first = sortedScore[0]
-                val second = sortedScore[1]
-                if (first.key.points == second.key.points) {
-                    val newTitle = second.key.text + "+" + first.key.text
-                    result[1] = Pair(newTitle, second.value + first.value)
-                }
-            }
-            return result
-        }
-
-        /**
-         * Compound 9ers are already collapsed to one SelectableZone.
-         */
-        fun getSortedScoreDistribution(rounds: List<Round>): List<Map.Entry<SelectableZone, Int>> {
-            return getRoundScores(rounds).entries.sortedBy { it.key }
-        }
-    }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/ScoreUtils.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/ScoreUtils.kt
new file mode 100644
index 000000000..9ea79ae65
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/ScoreUtils.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.shared.utils
+
+import android.support.v4.util.Pair
+import de.dreier.mytargets.shared.models.SelectableZone
+import de.dreier.mytargets.shared.models.Target
+import de.dreier.mytargets.shared.models.db.Round
+import de.dreier.mytargets.shared.models.db.Shot
+import java.util.*
+
+object ScoreUtils {
+
+    fun getTopScoreDistribution(sortedScore: List<Map.Entry<SelectableZone, Int>>): List<Pair<String, Int>> {
+        val result = sortedScore.map { Pair(it.key.text, it.value) }.toMutableList()
+
+        // Collapse first two entries if they yield the same score points,
+        // e.g. 10 and X => {X, 10+X, 9, ...}
+        if (sortedScore.size > 1) {
+            val first = sortedScore[0]
+            val second = sortedScore[1]
+            if (first.key.points == second.key.points) {
+                val newTitle = second.key.text + "+" + first.key.text
+                result[1] = Pair(newTitle, second.value + first.value)
+            }
+        }
+        return result
+    }
+
+    /**
+     * Compound 9ers are already collapsed to one SelectableZone.
+     */
+    fun getSortedScoreDistribution(rounds: List<Round>): List<Map.Entry<SelectableZone, Int>> {
+        return getRoundScores(rounds).entries.sortedBy { it.key }
+    }
+
+    private fun getRoundScores(rounds: List<Round>): Map<SelectableZone, Int> {
+        val t = rounds[0].target
+        val scoreCount = getAllPossibleZones(t)
+        rounds.flatMap { it.loadEnds() }
+                .forEach {
+                    it.loadShots().forEach { s ->
+                                if (s.scoringRing != Shot.NOTHING_SELECTED) {
+                                    val tuple = SelectableZone(s.scoringRing,
+                                            t.model.getZone(s.scoringRing),
+                                            t.zoneToString(s.scoringRing, s.index),
+                                            t.getScoreByZone(s.scoringRing, s.index))
+                                    val integer = scoreCount[tuple]
+                                    if (integer != null) {
+                                        val count = integer + 1
+                                        scoreCount[tuple] = count
+                                    }
+                                }
+                            }
+                }
+        return scoreCount
+    }
+
+    private fun getAllPossibleZones(t: Target): MutableMap<SelectableZone, Int> {
+        val scoreCount = HashMap<SelectableZone, Int>()
+        for (arrow in 0..2) {
+            val zoneList = t.getSelectableZoneList(arrow)
+            for (selectableZone in zoneList) {
+                scoreCount[selectableZone] = 0
+            }
+            if (!t.model.dependsOnArrowIndex()) {
+                break
+            }
+        }
+        return scoreCount
+    }
+}

From baf8bfcd18edafc7d99709996f58503d9caec156 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Sun, 7 Jan 2018 17:34:37 +0100
Subject: [PATCH 021/102] Converted End to POJO

---
 .../de/dreier/mytargets/app/MigrationTest.kt  |   5 +-
 .../test/utils/rules/MiniDbTestRule.kt        |   8 +-
 .../test/utils/rules/SimpleDbTestRule.kt      |  78 +++++------
 .../layout/DefaultScoreboardLayout.kt         |   8 +-
 .../features/statistics/ArrowStatistic.kt     |   3 +-
 .../features/statistics/CsvExporter.kt        |   3 +-
 .../features/statistics/StatisticsFragment.kt |  12 +-
 .../features/training/RoundFragment.kt        |  32 +++--
 .../features/training/input/InputActivity.kt  |  14 +-
 .../features/training/input/TargetView.kt     |   9 +-
 .../mytargets/utils/MobileWearableListener.kt |   2 +-
 .../shared/models/augmented/AugmentedEnd.kt   |  18 ++-
 .../shared/models/augmented/AugmentedRound.kt |  17 +--
 .../models/augmented/AugmentedTraining.kt     |   2 +-
 .../mytargets/shared/models/dao/EndDAO.kt     |  48 ++++++-
 .../dreier/mytargets/shared/models/db/End.kt  | 131 +-----------------
 .../mytargets/shared/models/db/Round.kt       |   5 +-
 .../mytargets/shared/utils/ScoreUtils.kt      |   3 +-
 .../mytargets/shared/views/TargetViewBase.kt  |  13 +-
 .../java/de/dreier/mytargets/InputActivity.kt |   9 +-
 20 files changed, 167 insertions(+), 253 deletions(-)

diff --git a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
index 2a7b1d18a..f266d20a4 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
@@ -33,6 +33,7 @@ import de.dreier.mytargets.shared.models.Dimension.Unit.CENTIMETER
 import de.dreier.mytargets.shared.models.Dimension.Unit.METER
 import de.dreier.mytargets.shared.models.EWeather
 import de.dreier.mytargets.shared.models.dao.BowDAO
+import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.test.base.InstrumentedTestBase
@@ -143,10 +144,10 @@ class MigrationTest : InstrumentedTestBase() {
         Truth.assertThat(ends[0].id).isEqualTo(1L)
         Truth.assertThat(ends[0].roundId).isEqualTo(1L)
         Truth.assertThat(ends[0].index).isEqualTo(0)
-        Truth.assertThat(ends[0].loadImages()).isEmpty()
+        Truth.assertThat(EndDAO.loadEndImages(ends[0].id)).isEmpty()
         Truth.assertThat(ends[0].exact).isEqualTo(true)
         Truth.assertThat(ends[2].exact).isEqualTo(false)
-        val shots = ends[0].loadShots()
+        val shots = EndDAO.loadShots(ends[0].id)
         Truth.assertThat(shots).hasSize(4)
         Truth.assertThat(shots[0].index).isEqualTo(0)
         Truth.assertThat(shots[0].x).isWithin(0f).of(-0.41206896f)
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
index 19d86741b..af0bb25d8 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
@@ -49,11 +49,11 @@ class MiniDbTestRule : DbTestRuleBase() {
         val round1 = at.rounds[0]
         val round2 = at.rounds[1]
 
-        randomEnd(round1, 6, generator).toEnd().save()
-        randomEnd(round1, 6, generator).toEnd().save()
+        randomEnd(round1, 6, generator).save()
+        randomEnd(round1, 6, generator).save()
 
-        randomEnd(round2, 6, generator).toEnd().save()
-        randomEnd(round2, 6, generator).toEnd().save()
+        randomEnd(round2, 6, generator).save()
+        randomEnd(round2, 6, generator).save()
     }
 
 }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
index af4796429..be13a19b0 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
@@ -71,19 +71,19 @@ class SimpleDbTestRule : DbTestRuleBase() {
         round2.save()
         val r2 = AugmentedRound(round2)
 
-        randomEnd(r1, 6, generator).toEnd().save()
-        randomEnd(r1, 6, generator).toEnd().save()
-        randomEnd(r1, 6, generator).toEnd().save()
-        randomEnd(r1, 6, generator).toEnd().save()
-        randomEnd(r1, 6, generator).toEnd().save()
-        randomEnd(r1, 6, generator).toEnd().save()
-
-        randomEnd(r2, 6, generator).toEnd().save()
-        randomEnd(r2, 6, generator).toEnd().save()
-        randomEnd(r2, 6, generator).toEnd().save()
-        randomEnd(r2, 6, generator).toEnd().save()
-        randomEnd(r2, 6, generator).toEnd().save()
-        randomEnd(r2, 6, generator).toEnd().save()
+        randomEnd(r1, 6, generator).save()
+        randomEnd(r1, 6, generator).save()
+        randomEnd(r1, 6, generator).save()
+        randomEnd(r1, 6, generator).save()
+        randomEnd(r1, 6, generator).save()
+        randomEnd(r1, 6, generator).save()
+
+        randomEnd(r2, 6, generator).save()
+        randomEnd(r2, 6, generator).save()
+        randomEnd(r2, 6, generator).save()
+        randomEnd(r2, 6, generator).save()
+        randomEnd(r2, 6, generator).save()
+        randomEnd(r2, 6, generator).save()
     }
 
     private fun getRoundTemplate(index: Int, distance: Int): RoundTemplate {
@@ -110,19 +110,19 @@ class SimpleDbTestRule : DbTestRuleBase() {
 
         val round2 = at.rounds[1]
 
-        randomEnd(round1, 6, generator).toEnd().save()
-        randomEnd(round1, 6, generator).toEnd().save()
-        randomEnd(round1, 6, generator).toEnd().save()
-        randomEnd(round1, 6, generator).toEnd().save()
-        randomEnd(round1, 6, generator).toEnd().save()
-        randomEnd(round1, 6, generator).toEnd().save()
-
-        randomEnd(round2, 6, generator).toEnd().save()
-        randomEnd(round2, 6, generator).toEnd().save()
-        randomEnd(round2, 6, generator).toEnd().save()
-        randomEnd(round2, 6, generator).toEnd().save()
-        randomEnd(round2, 6, generator).toEnd().save()
-        randomEnd(round2, 6, generator).toEnd().save()
+        randomEnd(round1, 6, generator).save()
+        randomEnd(round1, 6, generator).save()
+        randomEnd(round1, 6, generator).save()
+        randomEnd(round1, 6, generator).save()
+        randomEnd(round1, 6, generator).save()
+        randomEnd(round1, 6, generator).save()
+
+        randomEnd(round2, 6, generator).save()
+        randomEnd(round2, 6, generator).save()
+        randomEnd(round2, 6, generator).save()
+        randomEnd(round2, 6, generator).save()
+        randomEnd(round2, 6, generator).save()
+        randomEnd(round2, 6, generator).save()
     }
 
     private fun addFullTraining(bow: Bow) {
@@ -146,18 +146,18 @@ class SimpleDbTestRule : DbTestRuleBase() {
 
         val round2 = at.rounds[1]
 
-        buildEnd(round1, 1, 1, 2, 3, 3, 4).toEnd().save()
-        buildEnd(round1, 0, 0, 1, 2, 2, 3).toEnd().save()
-        buildEnd(round1, 1, 1, 1, 3, 4, 4).toEnd().save()
-        buildEnd(round1, 0, 1, 1, 1, 2, 3).toEnd().save()
-        buildEnd(round1, 1, 2, 3, 3, 4, 5).toEnd().save()
-        buildEnd(round1, 1, 2, 2, 3, 3, 3).toEnd().save()
-
-        buildEnd(round2, 1, 2, 2, 3, 4, 5).toEnd().save()
-        buildEnd(round2, 0, 0, 1, 2, 2, 3).toEnd().save()
-        buildEnd(round2, 0, 1, 2, 2, 2, 3).toEnd().save()
-        buildEnd(round2, 1, 1, 2, 3, 4, 4).toEnd().save()
-        buildEnd(round2, 1, 2, 2, 3, 3, 3).toEnd().save()
-        buildEnd(round2, 1, 2, 2, 3, 3, 4).toEnd().save()
+        buildEnd(round1, 1, 1, 2, 3, 3, 4).save()
+        buildEnd(round1, 0, 0, 1, 2, 2, 3).save()
+        buildEnd(round1, 1, 1, 1, 3, 4, 4).save()
+        buildEnd(round1, 0, 1, 1, 1, 2, 3).save()
+        buildEnd(round1, 1, 2, 3, 3, 4, 5).save()
+        buildEnd(round1, 1, 2, 2, 3, 3, 3).save()
+
+        buildEnd(round2, 1, 2, 2, 3, 4, 5).save()
+        buildEnd(round2, 0, 0, 1, 2, 2, 3).save()
+        buildEnd(round2, 0, 1, 2, 2, 2, 3).save()
+        buildEnd(round2, 1, 1, 2, 3, 4, 4).save()
+        buildEnd(round2, 1, 2, 2, 3, 3, 3).save()
+        buildEnd(round2, 1, 2, 2, 3, 3, 4).save()
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
index ea05c69ce..95e053b10 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
@@ -25,6 +25,7 @@ import de.dreier.mytargets.features.scoreboard.builder.model.TextCell
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.SelectableZone
 import de.dreier.mytargets.shared.models.Target
+import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.models.db.Training
@@ -223,14 +224,13 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
             val row = table.startRow()
             row.addCell(end.index + 1)
             var sum = 0
-            val shots = ArrayList(end.loadShots())
+            val shots = ArrayList(EndDAO.loadShots(end.id))
             if (SettingsManager.shouldSortTarget(round.target)) {
-                Collections.sort(shots)
+                shots.sort()
             }
             for (shot in shots) {
                 appendPointsCell(row, shot, round.target)
-                val points = round.target.getScoreByZone(shot.scoringRing, shot
-                        .index)
+                val points = round.target.getScoreByZone(shot.scoringRing, shot.index)
                 sum += points
                 carry += points
             }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
index c6f7efe56..7227821d7 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
@@ -24,6 +24,7 @@ import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Score
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.dao.ArrowDAO
+import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.models.sum
@@ -75,7 +76,7 @@ data class ArrowStatistic(
                         val arrow = ArrowDAO.loadArrowOrNull(t.key)
                         val name = arrow?.name ?: SharedApplicationInstance.getStr(R.string.unknown)
                         t.value.flatMap { it.loadEnds() }
-                                .flatMap { it.loadShots() }
+                                .flatMap { EndDAO.loadShots(it.id) }
                                 .filter { it.arrowNumber != null }
                                 .groupBy {it.arrowNumber!! }
                                 .filter { it.value.size > 1 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
index f2b1d49a1..69f9dbdba 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
@@ -17,6 +17,7 @@ package de.dreier.mytargets.features.statistics
 
 import android.content.Context
 import de.dreier.mytargets.R
+import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import org.threeten.bp.format.DateTimeFormatter
@@ -99,7 +100,7 @@ class CsvExporter(private val context: Context) {
             csv.add((e.index + 1).toString())
             // Timestamp
             csv.add(e.saveTime!!.format(DateTimeFormatter.ISO_LOCAL_TIME))
-            for ((_, index, _, x, y, scoringRing) in e.loadShots()) {
+            for ((_, index, _, x, y, scoringRing) in EndDAO.loadShots(e.id)) {
                 csv.enterScope()
                 // Score
                 csv.add(target.zoneToString(scoringRing, index))
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
index 91e126f6c..40a29c9a4 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
@@ -42,6 +42,7 @@ import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.SelectableZone
 import de.dreier.mytargets.shared.models.Target
+import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
@@ -83,7 +84,7 @@ class StatisticsFragment : FragmentBase() {
         get() {
             val shots = rounds!!
                     .flatMap { r -> r.loadEnds() }
-                    .flatMap { p -> p.loadShots() }
+                    .flatMap { EndDAO.loadShots(it.id) }
                     .filter { (_, _, _, _, _, scoringRing) -> scoringRing != Shot.NOTHING_SELECTED }
             val missCount = shots.filter { (_, _, _, _, _, scoringRing) -> scoringRing == Shot.MISS }.count().toLong()
             val hitCount = shots.size - missCount
@@ -167,7 +168,7 @@ class StatisticsFragment : FragmentBase() {
                 .filterNotNull()
 
         val data = ArrowStatistic.getAll(target!!, rounds!!)
-                .sortedWith(compareByDescending({ it.totalScore.shotAverage }))
+                .sortedWith(compareByDescending { it.totalScore.shotAverage })
 
         return {
             showLineChart()
@@ -185,7 +186,7 @@ class StatisticsFragment : FragmentBase() {
         val exactShots = rounds!!
                 .flatMap { r -> r.loadEnds() }
                 .filter { (_, _, _, exact) -> exact }
-                .flatMap { p -> p.loadShots() }
+                .flatMap { EndDAO.loadShots(it.id) }
                 .filter { (_, _, _, _, _, scoringRing) -> scoringRing != Shot.NOTHING_SELECTED }
                 .toList()
         if (exactShots.isEmpty()) {
@@ -382,9 +383,8 @@ class StatisticsFragment : FragmentBase() {
     }
 
     private fun getPairEndSummary(target: Target, end: End, trainingDate: LocalDate): Pair<Float, LocalDateTime> {
-        val reachedScore = target.getReachedScore(end.loadShots())
-        return Pair(reachedScore.shotAverage,
-                LocalDateTime.of(trainingDate, end.saveTime!!))
+        val reachedScore = target.getReachedScore(EndDAO.loadShots(end.id))
+        return Pair(reachedScore.shotAverage, LocalDateTime.of(trainingDate, end.saveTime!!))
     }
 
     private fun convertToLineData(values: List<Pair<Float, LocalDateTime>>, evaluator: Evaluator): LineDataSet {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
index 4056e1b67..c8e416ba0 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
@@ -30,6 +30,8 @@ import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.databinding.FragmentListBinding
 import de.dreier.mytargets.databinding.ItemEndBinding
 import de.dreier.mytargets.features.settings.SettingsManager
+import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
+import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.utils.DividerItemDecoration
@@ -43,7 +45,7 @@ import java.util.*
 /**
  * Shows all ends of one round
  */
-class RoundFragment : EditableListFragmentBase<End, SimpleListAdapterBase<End>>() {
+class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBase<AugmentedEnd>>() {
 
     private var roundId: Long = 0
     private lateinit var binding: FragmentListBinding
@@ -107,7 +109,7 @@ class RoundFragment : EditableListFragmentBase<End, SimpleListAdapterBase<End>>(
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
         round = Round[roundId]
-        val ends = round!!.loadEnds()
+        val ends = round!!.loadEnds().map { AugmentedEnd(it) }.toMutableList()
         val showFab = round!!.maxEndCount == null || ends.size < round!!.maxEndCount!!
 
         return {
@@ -151,45 +153,45 @@ class RoundFragment : EditableListFragmentBase<End, SimpleListAdapterBase<End>>(
         }
     }
 
-    override fun onSelected(item: End) {
-        navigationController.navigateToEditEnd(round!!, item.index)
+    override fun onSelected(item: AugmentedEnd) {
+        navigationController.navigateToEditEnd(round!!, item.end.index)
                 .start()
     }
 
     private fun onEdit(itemId: Long) {
-        navigationController.navigateToEditEnd(round!!, adapter!!.getItemById(itemId)!!.index)
+        navigationController.navigateToEditEnd(round!!, adapter!!.getItemById(itemId)!!.end.index)
                 .start()
     }
 
-    override fun deleteItem(item: End): () -> End {
-        item.delete()
+    override fun deleteItem(item: AugmentedEnd): () -> AugmentedEnd {
+        EndDAO.deleteEnd(item.end)
         return {
-            item.saveRecursively()
+            EndDAO.insertEnd(item.end, item.images, item.shots)
             item
         }
     }
 
-    private inner class EndAdapter : SimpleListAdapterBase<End>(compareBy(End::index)) {
+    private inner class EndAdapter : SimpleListAdapterBase<AugmentedEnd>(compareBy { it.end.index }) {
 
-        override fun onCreateViewHolder(parent: ViewGroup): SelectableViewHolder<End> {
+        override fun onCreateViewHolder(parent: ViewGroup): SelectableViewHolder<AugmentedEnd> {
             val itemView = LayoutInflater.from(parent.context)
                     .inflate(R.layout.item_end, parent, false)
             return EndViewHolder(itemView)
         }
     }
 
-    private inner class EndViewHolder internal constructor(itemView: View) : SelectableViewHolder<End>(itemView, selector, this@RoundFragment, this@RoundFragment) {
+    private inner class EndViewHolder internal constructor(itemView: View) : SelectableViewHolder<AugmentedEnd>(itemView, selector, this@RoundFragment, this@RoundFragment) {
 
         private val binding: ItemEndBinding = DataBindingUtil.bind(itemView)
 
-        override fun bindItem(item: End) {
-            val shots = item.loadShots()
+        override fun bindItem(item: AugmentedEnd) {
+            val shots = item.shots
             if (SettingsManager.shouldSortTarget(round!!.target)) {
                 shots.sort()
             }
             binding.shoots.setShots(round!!.target, shots)
-            binding.imageIndicator.visibility = if (item.loadImages().isEmpty()) View.INVISIBLE else View.VISIBLE
-            binding.end.text = getString(R.string.end_n, item.index + 1)
+            binding.imageIndicator.visibility = if (item.images.isEmpty()) View.INVISIBLE else View.VISIBLE
+            binding.end.text = getString(R.string.end_n, item.end.index + 1)
         }
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
index 731bd3997..3ceff9bbf 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
@@ -48,6 +48,7 @@ import de.dreier.mytargets.features.settings.ESettingsScreens
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
 import de.dreier.mytargets.shared.models.dao.BowDAO
+import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
@@ -134,7 +135,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
             for (image in imageList.removedImages) {
                 File(filesDir, image).delete()
             }
-            this.data!!.currentEnd.toEnd().save()
+            this.data!!.currentEnd.save()
             updateEnd()
             invalidateOptionsMenu()
         }
@@ -214,7 +215,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
                         .inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE)
                         .input("", data!!.currentEnd.end.comment) { _, input ->
                             data!!.currentEnd.end.comment = input.toString()
-                            data!!.currentEnd.toEnd().save()
+                            EndDAO.saveEnd(data!!.currentEnd.end)
                         }
                         .negativeText(android.R.string.cancel)
                         .show()
@@ -222,8 +223,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
             R.id.action_timer -> {
                 val timerEnabled = !SettingsManager.timerEnabled
                 SettingsManager.timerEnabled = timerEnabled
-                ApplicationInstance.wearableClient
-                        .sendTimerSettingsFromLocal(SettingsManager.timerSettings)
+                ApplicationInstance.wearableClient.sendTimerSettingsFromLocal(SettingsManager.timerSettings)
                 openTimer()
                 item.isChecked = timerEnabled
                 invalidateOptionsMenu()
@@ -319,7 +319,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
     }
 
     private fun updateEnd() {
-        targetView!!.replaceWithEnd(data!!.currentEnd.toEnd())
+        targetView!!.replaceWithEnd(data!!.currentEnd.shots, data!!.currentEnd.end.exact)
         val totalEnds = if (data!!.currentRound.round.maxEndCount == null)
             data!!.ends.size
         else
@@ -396,7 +396,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
 
     override fun onEndUpdated(shots: List<Shot>) {
         data!!.currentEnd.shots = shots.toMutableList()
-        data!!.currentEnd.toEnd().save()
+        data!!.currentEnd.save()
 
         // Set current end score
         val reachedEndScore = data!!.currentRound.round.target
@@ -426,7 +426,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
     override fun onEndFinished(shotList: List<Shot>) {
         data!!.currentEnd.shots = shotList.toMutableList()
         data!!.currentEnd.end.exact = targetView!!.inputMode === EInputMethod.PLOTTING
-        data!!.currentEnd.toEnd().save()
+        data!!.currentEnd.save()
 
         updateWearNotification()
         updateNavigationButtons()
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.kt
index d51f02a37..4eaa7c4ce 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.kt
@@ -35,7 +35,6 @@ import de.dreier.mytargets.features.training.input.TargetView.EKeyboardType.LEFT
 import de.dreier.mytargets.shared.analysis.aggregation.EAggregationStrategy
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.targets.drawable.TargetDrawable
 import de.dreier.mytargets.shared.utils.EndRenderer
@@ -153,13 +152,13 @@ class TargetView : TargetViewBase {
         borderPaint.style = Paint.Style.STROKE
     }
 
-    override fun replaceWithEnd(end: End) {
-        inputMethod = if (!end.isEmpty) {
-            if (end.exact) PLOTTING else KEYBOARD
+    override fun replaceWithEnd(shots: List<Shot>, exact: Boolean) {
+        inputMethod = if (shots.all { it.scoringRing == Shot.NOTHING_SELECTED }) {
+            if (exact) PLOTTING else KEYBOARD
         } else {
             SettingsManager.inputMethod
         }
-        super.replaceWithEnd(end)
+        super.replaceWithEnd(shots, exact)
     }
 
     fun setArrow(diameter: Dimension, numbers: Boolean, maxArrowNumber: Int) {
diff --git a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
index 7d3cb094b..a3b72154d 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
@@ -104,7 +104,7 @@ class MobileWearableListener : WearableListenerService() {
         val newEnd = getLastEmptyOrCreateNewEnd(round)
         newEnd.end.exact = false
         newEnd.shots = shots
-        newEnd.toEnd().save()
+        newEnd.save()
 
         ApplicationInstance.wearableClient.sendUpdateTrainingFromRemoteBroadcast(round.round, newEnd.end)
         ApplicationInstance.wearableClient
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedEnd.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedEnd.kt
index 9c3111692..a58d7484d 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedEnd.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedEnd.kt
@@ -17,6 +17,8 @@ package de.dreier.mytargets.shared.models.augmented
 
 import android.os.Parcel
 import android.os.Parcelable
+import de.dreier.mytargets.shared.models.IIdSettable
+import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.EndImage
 import de.dreier.mytargets.shared.models.db.Shot
@@ -25,13 +27,17 @@ data class AugmentedEnd(
         val end: End,
         var shots: MutableList<Shot>,
         var images: MutableList<EndImage>
-) : Parcelable {
-    constructor(end: End) : this(end, end.loadShots().toMutableList(), end.loadImages().toMutableList())
+) : Parcelable, IIdSettable {
+    override var id: Long
+        get() = end.id
+        set(value) {
+            end.id = value
+        }
+
+    constructor(end: End) : this(end, EndDAO.loadShots(end.id).toMutableList(), EndDAO.loadEndImages(end.id).toMutableList())
 
-    fun toEnd(): End {
-        end.shots = shots
-        end.images = images
-        return end
+    fun save() {
+        EndDAO.saveEnd(end, images, shots)
     }
 
     val isEmpty: Boolean
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedRound.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedRound.kt
index 4937b71f0..c55bd3ecc 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedRound.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedRound.kt
@@ -20,6 +20,7 @@ import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Score
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
+import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.models.sum
 
 data class AugmentedRound(
@@ -36,22 +37,18 @@ data class AugmentedRound(
             return ends.map { target.getReachedScore(it.shots) }.sum()
         }
 
-    fun toRound(): Round {
-        round.ends = ends.map { it.toEnd() }.toMutableList()
-        return round
-    }
-
     /**
      * Adds a new end to the internal list of ends, but does not yet save it.
      *
      * @return Returns the newly created end
      */
     fun addEnd(): AugmentedEnd {
-        val end = AugmentedEnd(End(round.shotsPerEnd, ends.size))
-        end.end.roundId = round.id
-        end.end.save()
-        ends.add(end)
-        return end
+        val end = End(index = ends.size, roundId = round.id)
+        val augmentedEnd = AugmentedEnd(end, (0 until round.shotsPerEnd)
+                .map { Shot(it) }.toMutableList(), mutableListOf())
+        augmentedEnd.save()
+        ends.add(augmentedEnd)
+        return augmentedEnd
     }
 
     constructor(source: Parcel) : this(
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
index 8721a1645..9dbb02741 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
@@ -30,7 +30,7 @@ data class AugmentedTraining(
             .toMutableList())
 
     fun toTraining(): Training {
-        training.rounds = rounds.map { it.toRound() }.toMutableList()
+        training.rounds = rounds.map { it.round }.toMutableList()
         return training
     }
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
index 59c67527a..d3c95a006 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
@@ -16,10 +16,12 @@
 package de.dreier.mytargets.shared.models.dao
 
 import com.raizlabs.android.dbflow.config.FlowManager
+import com.raizlabs.android.dbflow.kotlinextensions.delete
 import com.raizlabs.android.dbflow.kotlinextensions.save
 import com.raizlabs.android.dbflow.sql.language.SQLite
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.db.*
+import org.threeten.bp.LocalTime
 
 object EndDAO {
     fun loadEnds(): List<End> = SQLite.select().from(End::class.java).queryList()
@@ -44,7 +46,14 @@ object EndDAO {
             .where(Shot_Table.end.eq(id))
             .queryList().toMutableList()
 
+    fun saveEnd(end: End) {
+        end.save()
+    }
+
     fun saveEnd(end: End, images: List<EndImage>, shots: List<Shot>) {
+        if (end.saveTime == null) {
+            end.saveTime = LocalTime.now()
+        }
         FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
                     end.save(db)
                     SQLite.delete(EndImage::class.java)
@@ -66,13 +75,40 @@ object EndDAO {
 
     fun deleteEnd(end: End) {
         FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-                    SQLite.delete(EndImage::class.java)
-                            .where(EndImage_Table.end.eq(end.id))
-                            .execute(db)
-                    SQLite.delete(Shot::class.java)
-                            .where(Shot_Table.end.eq(end.id))
-                            .execute(db)
+                    //TODO check if this is really getting deleted
+//                    SQLite.delete(EndImage::class.java)
+//                            .where(EndImage_Table.end.eq(end.id))
+//                            .execute(db)
+//                    SQLite.delete(Shot::class.java)
+//                            .where(Shot_Table.end.eq(end.id))
+//                            .execute(db)
                     end.delete(db)
+
+                    val round = Round[end.roundId!!] ?: return@executeTransaction
+
+                    for ((i, end) in round.loadEnds(db).withIndex()) {
+                        end.index = i
+                        end.save(db)
+                    }
+                }
+    }
+
+    fun insertEnd(end: End, images: List<EndImage>, shots: List<Shot>) {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
+                    val round = Round[end.roundId!!]
+                    val ends = round!!.loadEnds(db).toMutableList()
+
+                    val pos = ends.binarySearch(end, compareBy(End::index))
+                    if (pos < 0) {
+                        ends.add(-pos - 1, end)
+                    } else {
+                        ends.add(pos, end)
+                    }
+
+                    for ((i, end) in ends.withIndex()) {
+                        end.index = i
+                        end.save(db)
+                    }
                 }
     }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
index 04ec6a50e..32bee1ce5 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
@@ -18,19 +18,11 @@ package de.dreier.mytargets.shared.models.db
 import android.annotation.SuppressLint
 import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.*
-import com.raizlabs.android.dbflow.config.FlowManager
-import com.raizlabs.android.dbflow.kotlinextensions.delete
-import com.raizlabs.android.dbflow.kotlinextensions.save
-import com.raizlabs.android.dbflow.sql.language.SQLite
-import com.raizlabs.android.dbflow.structure.BaseModel
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.IIdSettable
 import de.dreier.mytargets.shared.utils.typeconverters.LocalTimeConverter
-import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
 import org.threeten.bp.LocalTime
-import java.util.*
 
 @SuppressLint("ParcelCreator")
 @Parcelize
@@ -55,125 +47,4 @@ data class End(
 
         @Column
         var comment: String = ""
-) : BaseModel(), IIdSettable, Comparable<End>, Parcelable {
-
-    @IgnoredOnParcel
-    var images: MutableList<EndImage>? = null
-
-    @IgnoredOnParcel
-    internal var shots: MutableList<Shot>? = null
-
-    val isEmpty: Boolean
-        get() = loadShots().any { it.scoringRing == Shot.NOTHING_SELECTED } && loadImages().isEmpty()
-
-    constructor(shotCount: Int, index: Int) : this(index = index) {
-        shots = (0 until shotCount)
-                .map { Shot(it) }
-                .toMutableList()
-    }
-
-    constructor(end: End) : this(index = end.index) {
-        this.shots = ArrayList(end.loadShots())
-    }
-
-    @OneToMany(methods = [], variableName = "shots")
-    fun loadShots(): MutableList<Shot> {
-        if (shots == null) {
-            shots = SQLite.select()
-                    .from(Shot::class.java)
-                    .where(Shot_Table.end.eq(id))
-                    .queryList().toMutableList()
-        }
-        return shots!!
-    }
-
-    @OneToMany(methods = [], variableName = "images")
-    fun loadImages(): MutableList<EndImage> {
-        if (images == null) {
-            images = SQLite.select()
-                    .from(EndImage::class.java)
-                    .where(EndImage_Table.end.eq(id))
-                    .queryList().toMutableList()
-        }
-        return images!!
-    }
-
-    override fun save(): Boolean {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ this.save(it) })
-        return true
-    }
-
-    override fun save(databaseWrapper: DatabaseWrapper): Boolean {
-        if (saveTime == null) {
-            saveTime = LocalTime.now()
-        }
-        super.save(databaseWrapper)
-        if (shots != null) {
-            SQLite.delete(Shot::class.java)
-                    .where(Shot_Table.end.eq(id))
-                    .execute(databaseWrapper)
-            // TODO Replace this super ugly workaround by stubbed Relationship in version 4 of dbFlow
-            for (s in shots!!) {
-                s.endId = id
-                s.save(databaseWrapper)
-            }
-        }
-        if (images != null) {
-            SQLite.delete(EndImage::class.java)
-                    .where(EndImage_Table.end.eq(id))
-                    .execute(databaseWrapper)
-            // TODO Replace this super ugly workaround by stubbed Relationship in version 4 of dbFlow
-            loadImages().forEach { image ->
-                image.endId = id
-                image.save(databaseWrapper)
-            }
-        }
-        return true
-    }
-
-    override fun delete(): Boolean {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ this.delete(it) })
-        return true
-    }
-
-    override fun delete(databaseWrapper: DatabaseWrapper): Boolean {
-        loadShots().forEach { it.delete(databaseWrapper) }
-        loadImages().forEach { it.delete(databaseWrapper) }
-        super.delete(databaseWrapper)
-        updateEndIndicesForRound(databaseWrapper)
-        return true
-    }
-
-    private fun updateEndIndicesForRound(databaseWrapper: DatabaseWrapper) {
-        // FIXME very inefficient
-        val round = Round[roundId!!] ?: return
-
-        for ((i, end) in round.loadEnds(databaseWrapper).withIndex()) {
-            end.index = i
-            end.save(databaseWrapper)
-        }
-    }
-
-    override fun compareTo(other: End) = compareBy(End::index).compare(this, other)
-
-    fun saveRecursively() {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ this.saveRecursively(it) })
-    }
-
-    private fun saveRecursively(databaseWrapper: DatabaseWrapper) {
-        val round = Round[roundId!!]
-        val ends = round!!.loadEnds(databaseWrapper).toMutableList()
-
-        val pos = Collections.binarySearch(ends, this)
-        if (pos < 0) {
-            ends.add(-pos - 1, this)
-        } else {
-            ends.add(pos, this)
-        }
-
-        for ((i, end) in ends.withIndex()) {
-            end.index = i
-            end.save(databaseWrapper)
-        }
-    }
-}
+) : IIdSettable, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
index 821b2d0a8..db2471d26 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
@@ -19,12 +19,15 @@ import android.annotation.SuppressLint
 import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.*
 import com.raizlabs.android.dbflow.config.FlowManager
+import com.raizlabs.android.dbflow.kotlinextensions.delete
+import com.raizlabs.android.dbflow.kotlinextensions.save
 import com.raizlabs.android.dbflow.sql.language.SQLite
 import com.raizlabs.android.dbflow.structure.BaseModel
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.*
 import de.dreier.mytargets.shared.models.Target
+import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.utils.typeconverters.DimensionConverter
 import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
@@ -106,7 +109,7 @@ data class Round(
         get() {
             val target = target
             return loadEnds().
-                    map { end: End -> target.getReachedScore(end.loadShots()) }
+                    map { end: End -> target.getReachedScore(EndDAO.loadShots(end.id)) }
                     .sum()
         }
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/ScoreUtils.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/ScoreUtils.kt
index 9ea79ae65..ece759e67 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/ScoreUtils.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/ScoreUtils.kt
@@ -18,6 +18,7 @@ package de.dreier.mytargets.shared.utils
 import android.support.v4.util.Pair
 import de.dreier.mytargets.shared.models.SelectableZone
 import de.dreier.mytargets.shared.models.Target
+import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
 import java.util.*
@@ -52,7 +53,7 @@ object ScoreUtils {
         val scoreCount = getAllPossibleZones(t)
         rounds.flatMap { it.loadEnds() }
                 .forEach {
-                    it.loadShots().forEach { s ->
+                    EndDAO.loadShots(it.id).forEach { s ->
                                 if (s.scoringRing != Shot.NOTHING_SELECTED) {
                                     val tuple = SelectableZone(s.scoringRing,
                                             t.model.getZone(s.scoringRing),
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt
index 8988c7289..a32f8cc72 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt
@@ -41,7 +41,6 @@ import android.view.animation.AccelerateDecelerateInterpolator
 import de.dreier.mytargets.shared.R
 import de.dreier.mytargets.shared.models.SelectableZone
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.targets.drawable.TargetImpactAggregationDrawable
@@ -51,8 +50,7 @@ import de.dreier.mytargets.shared.utils.RectUtils
 import java.util.*
 
 abstract class TargetViewBase : View, View.OnTouchListener {
-    private val touchHelper = TargetAccessibilityTouchHelper(
-            this)
+    private val touchHelper = TargetAccessibilityTouchHelper(this)
     @VisibleForTesting
     val virtualViews: MutableList<VirtualView> = ArrayList()
     /**
@@ -69,7 +67,7 @@ abstract class TargetViewBase : View, View.OnTouchListener {
     protected var endRenderer = EndRenderer()
     protected lateinit var shots: List<Shot>
     protected var round: RoundTemplate? = null
-    protected var setListener: OnEndFinishedListener? = null
+    private var setListener: OnEndFinishedListener? = null
     protected open var inputMethod = EInputMethod.KEYBOARD
     protected var density: Float = 0.toFloat()
     protected lateinit var selectableZones: List<SelectableZone>
@@ -153,12 +151,11 @@ abstract class TargetViewBase : View, View.OnTouchListener {
         updateSelectableZones()
     }
 
-    open fun replaceWithEnd(end: End) {
-        shots = end.loadShots()
+    open fun replaceWithEnd(shots: List<Shot>, exact: Boolean) {
+        this.shots = shots
         currentShotIndex = getNextShotIndex(-1)
         endRenderer.setShots(shots)
-        endRenderer.setSelection(currentShotIndex, null, EndRenderer
-                .MAX_CIRCLE_SIZE)
+        endRenderer.setSelection(currentShotIndex, null, EndRenderer.MAX_CIRCLE_SIZE)
         animateToNewState()
         notifyTargetShotsChanged()
     }
diff --git a/wearable/src/main/java/de/dreier/mytargets/InputActivity.kt b/wearable/src/main/java/de/dreier/mytargets/InputActivity.kt
index c70cff51d..1a36c2dc3 100644
--- a/wearable/src/main/java/de/dreier/mytargets/InputActivity.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/InputActivity.kt
@@ -50,7 +50,8 @@ class InputActivity : WearableActivity(), TargetViewBase.OnEndFinishedListener {
 
         // Set up target view
         binding.target.initWithTarget(round.round.target)
-        binding.target.replaceWithEnd(End(round.round.shotsPerEnd, 0))
+        binding.target.replaceWithEnd((0 until round.round.shotsPerEnd)
+                .map { Shot(it) }.toMutableList(), false)
         binding.target.setOnTargetSetListener(this)
 
         // Ensure Moto 360 is not cut off at the bottom
@@ -96,12 +97,10 @@ class InputActivity : WearableActivity(), TargetViewBase.OnEndFinishedListener {
             intent.putExtra(ConfirmationActivity.EXTRA_MESSAGE, this@InputActivity
                     .getString(R.string.saved))
             this@InputActivity.startActivity(intent)
-            val v = this@InputActivity
-                    .getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
+            val v = this@InputActivity.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
             VibratorCompat.vibrate(v, 200)
             this@InputActivity.finish()
-            val end = End(round.round.shotsPerEnd, 0)
-            end.roundId = round.round.id
+            val end = End(index = 0, roundId = round.round.id)
             val ae = AugmentedEnd(end, shotList.toMutableList(), mutableListOf())
             ApplicationInstance.wearableClient.sendEndUpdate(ae)
         }

From 89a2b0bff204339e15a062023f98cd6feb7c4a04 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Tue, 9 Jan 2018 18:39:43 +0100
Subject: [PATCH 022/102] Got rid of SharedUtils

---
 .../layout/DefaultScoreboardLayout.kt         |  5 ++---
 .../features/statistics/StatisticsFragment.kt |  5 ++---
 .../features/training/details/HtmlUtils.kt    |  5 ++---
 .../features/training/input/InputActivity.kt  |  3 +--
 .../mytargets/shared/utils/SharedUtils.kt     | 22 -------------------
 5 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 shared/src/main/java/de/dreier/mytargets/shared/utils/SharedUtils.kt

diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
index 95e053b10..9435c3b44 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
@@ -31,7 +31,6 @@ import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.targets.scoringstyle.ScoringStyle
 import de.dreier.mytargets.shared.utils.ScoreUtils
-import de.dreier.mytargets.shared.utils.SharedUtils
 import java.util.*
 
 class DefaultScoreboardLayout(private val context: Context, private val locale: Locale, private val configuration: ScoreboardConfiguration) {
@@ -135,8 +134,8 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
         equals[1] = true
         val round = rounds[0]
         for (r in rounds) {
-            equals[0] = SharedUtils.equals(r.distance, round.distance) && equals[0]
-            equals[1] = SharedUtils.equals(r.target, round.target) && equals[1]
+            equals[0] = r.distance == round.distance && equals[0]
+            equals[1] = r.target == round.target && equals[1]
         }
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
index 40a29c9a4..109a189f1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
@@ -49,7 +49,6 @@ import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.utils.Color
 import de.dreier.mytargets.shared.utils.ScoreUtils
-import de.dreier.mytargets.shared.utils.SharedUtils
 import de.dreier.mytargets.utils.MobileWearableClient
 import de.dreier.mytargets.utils.MobileWearableClient.Companion.BROADCAST_UPDATE_TRAINING_FROM_REMOTE
 import de.dreier.mytargets.utils.RoundedTextDrawable
@@ -74,7 +73,7 @@ class StatisticsFragment : FragmentBase() {
     private val updateReceiver = object : MobileWearableClient.EndUpdateReceiver() {
 
         override fun onUpdate(trainingId: Long, roundId: Long, end: End) {
-            if (roundIds!!.any { r -> SharedUtils.equals(r, roundId) }) {
+            if (roundIds!!.contains(roundId)) {
                 reloadData()
             }
         }
@@ -184,7 +183,7 @@ class StatisticsFragment : FragmentBase() {
 
     private fun showDispersionView() {
         val exactShots = rounds!!
-                .flatMap { r -> r.loadEnds() }
+                .flatMap { it.loadEnds() }
                 .filter { (_, _, _, exact) -> exact }
                 .flatMap { EndDAO.loadShots(it.id) }
                 .filter { (_, _, _, _, _, scoringRing) -> scoringRing != Shot.NOTHING_SELECTED }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
index 66f53498a..08bf3679a 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
@@ -21,7 +21,6 @@ import android.text.TextUtils
 import de.dreier.mytargets.R
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
-import de.dreier.mytargets.shared.utils.SharedUtils
 import de.dreier.mytargets.utils.Utils
 
 object HtmlUtils {
@@ -80,8 +79,8 @@ object HtmlUtils {
         equals[1] = true
         val round = rounds[0]
         for (r in rounds) {
-            equals[0] = SharedUtils.equals(r.distance, round.distance) && equals[0]
-            equals[1] = SharedUtils.equals(r.target, round.target) && equals[1]
+            equals[0] = r.distance == round.distance && equals[0]
+            equals[1] = r.target == round.target && equals[1]
         }
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
index 3ceff9bbf..094d95ac7 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
@@ -55,7 +55,6 @@ import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.models.sum
 import de.dreier.mytargets.shared.utils.ImageList
-import de.dreier.mytargets.shared.utils.SharedUtils
 import de.dreier.mytargets.shared.views.TargetViewBase
 import de.dreier.mytargets.shared.views.TargetViewBase.EInputMethod
 import de.dreier.mytargets.shared.wearable.WearableClientBase.Companion.BROADCAST_TIMER_SETTINGS_FROM_REMOTE
@@ -477,7 +476,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
         }
 
         private fun shouldShowEnd(end: End, currentEndId: Long?): Boolean {
-            return !SharedUtils.equals(end.id, currentEndId) && end.exact
+            return end.id != currentEndId && end.exact
         }
     }
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/SharedUtils.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/SharedUtils.kt
deleted file mode 100644
index 26ef4c9f2..000000000
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/SharedUtils.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2017 Florian Dreier
- *
- * This file is part of MyTargets.
- *
- * MyTargets is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * MyTargets is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-package de.dreier.mytargets.shared.utils
-
-object SharedUtils {
-    fun equals(a: Any?, b: Any?): Boolean {
-        return a == b
-    }
-}

From c88b47b9583f06b6a91ead0b87b0b6d35f615cf1 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Thu, 11 Jan 2018 20:06:14 +0100
Subject: [PATCH 023/102] Converted textPattern to property in NumberPicker

---
 .../standardround/EditStandardRoundFragment.kt      |  4 ++--
 .../java/de/dreier/mytargets/views/NumberPicker.kt  | 13 +++----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
index 1b3fb5dc0..c6a9101b1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
@@ -191,12 +191,12 @@ class EditStandardRoundFragment : EditFragmentBase() {
             binding.target.setItem(item.targetTemplate)
 
             // Ends
-            binding.endCount.setTextPattern(R.plurals.passe)
+            binding.endCount.textPattern = R.plurals.passe
             binding.endCount.setOnValueChangedListener { item.endCount = it }
             binding.endCount.value = item.endCount
 
             // Shots per end
-            binding.shotCount.setTextPattern(R.plurals.arrow)
+            binding.shotCount.textPattern = R.plurals.arrow
             binding.shotCount.minimum = 1
             binding.shotCount.maximum = 12
             binding.shotCount.setOnValueChangedListener { item.shotsPerEnd = it }
diff --git a/app/src/main/java/de/dreier/mytargets/views/NumberPicker.kt b/app/src/main/java/de/dreier/mytargets/views/NumberPicker.kt
index 7462bb6ca..68a059694 100644
--- a/app/src/main/java/de/dreier/mytargets/views/NumberPicker.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/NumberPicker.kt
@@ -35,9 +35,6 @@ import de.dreier.mytargets.databinding.LayoutNumberPickerBinding
  * @author Jeffrey F. Cole
  */
 
-
-typealias OnValueChangedListener = (Int) -> Unit
-
 class NumberPicker(context: Context, attributeSet: AttributeSet) : LinearLayout(context, attributeSet) {
 
     var minimum = 1
@@ -67,13 +64,13 @@ class NumberPicker(context: Context, attributeSet: AttributeSet) : LinearLayout(
 
     private var autoIncrement = false
     private var autoDecrement = false
-    private var changeListener: OnValueChangedListener? = null
+    private var changeListener: ((Int) -> Unit)? = null
 
     @PluralsRes
-    private var textPattern: Int = 0
+    var textPattern: Int = 0
     private val binding: LayoutNumberPickerBinding
 
-    fun setOnValueChangedListener(listener: OnValueChangedListener) {
+    fun setOnValueChangedListener(listener: (Int) -> Unit) {
         changeListener = listener
     }
 
@@ -147,10 +144,6 @@ class NumberPicker(context: Context, attributeSet: AttributeSet) : LinearLayout(
         }
     }
 
-    fun setTextPattern(@PluralsRes textPattern: Int) {
-        this.textPattern = textPattern
-    }
-
     companion object {
         private const val REPEAT_DELAY: Long = 50
     }

From 50b35816ff1f2685f96ae52b76e7abc76c19dc94 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Sat, 13 Jan 2018 15:08:58 +0100
Subject: [PATCH 024/102] Fixed insertEnd

---
 .../fragments/EditableListFragmentBase.kt     |  7 +-
 .../features/scoreboard/ScoreboardFragment.kt |  1 +
 .../mytargets/utils/MobileWearableListener.kt |  9 +--
 .../mytargets/shared/models/dao/EndDAO.kt     | 77 ++++++++-----------
 4 files changed, 39 insertions(+), 55 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
index 1a7a1b6cb..328452c26 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
@@ -66,9 +66,8 @@ abstract class EditableListFragmentBase<T, U : ListAdapterBase<*, T>> : Fragment
 
     fun onDelete(deletedIds: List<Long>) {
         FirebaseAnalytics.getInstance(context!!).logEvent("delete", null)
-        val deleted = deleteItems(deletedIds)
-        val message = resources
-                .getQuantityString(itemTypeDelRes, deleted.size, deleted.size)
+        val undoDeletions = deleteItems(deletedIds)
+        val message = resources.getQuantityString(itemTypeDelRes, deletedIds.size, deletedIds.size)
         val coordinatorLayout = view!!.findViewById<View>(R.id.coordinatorLayout)
         Snackbar.make(coordinatorLayout, message, Snackbar.LENGTH_LONG)
                 .setAction(R.string.undo) {
@@ -77,7 +76,7 @@ abstract class EditableListFragmentBase<T, U : ListAdapterBase<*, T>> : Fragment
                 .show()
     }
 
-    private fun deleteItems(deletedIds: List<Long>): MutableList<T> {
+    private fun deleteItems(deletedIds: List<Long>): MutableList<() -> T> {
         val deleted = deletedIds
                 .map { id -> adapter!!.getItemById(id) }
                 .filter { item -> item != null }
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
index b719b6a73..fc3987515 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
@@ -54,6 +54,7 @@ import de.dreier.mytargets.utils.Utils
 import org.threeten.bp.format.DateTimeFormatter
 import java.io.File
 import java.io.IOException
+import java.util.*
 
 class ScoreboardFragment : FragmentBase() {
 
diff --git a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
index a3b72154d..caac24e0f 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
@@ -52,8 +52,7 @@ class MobileWearableListener : WearableListenerService() {
     }
 
     private fun timerSettings(messageEvent: MessageEvent) {
-        val data = messageEvent.data
-        val settings = data.unmarshall(TimerSettings.CREATOR)
+        val settings = messageEvent.data.unmarshall(TimerSettings.CREATOR)
         SettingsManager.timerSettings = settings
         ApplicationInstance.wearableClient.sendTimerSettingsFromRemote()
     }
@@ -89,8 +88,7 @@ class MobileWearableListener : WearableListenerService() {
     }
 
     private fun createTraining(messageEvent: MessageEvent) {
-        val data = messageEvent.data
-        val augmentedTraining = data.unmarshall(AugmentedTraining.CREATOR)
+        val augmentedTraining = messageEvent.data.unmarshall(AugmentedTraining.CREATOR)
         val training = augmentedTraining.toTraining()
         training.save()
         ApplicationInstance.wearableClient.updateTraining(AugmentedTraining(training))
@@ -98,8 +96,7 @@ class MobileWearableListener : WearableListenerService() {
     }
 
     private fun endUpdated(messageEvent: MessageEvent) {
-        val data = messageEvent.data
-        val (end, shots) = data.unmarshall(AugmentedEnd.CREATOR)
+        val (end, shots) = messageEvent.data.unmarshall(AugmentedEnd.CREATOR)
         val round = AugmentedRound(Round[end.roundId!!]!!)
         val newEnd = getLastEmptyOrCreateNewEnd(round)
         newEnd.end.exact = false
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
index d3c95a006..b40a937df 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
@@ -19,6 +19,7 @@ import com.raizlabs.android.dbflow.config.FlowManager
 import com.raizlabs.android.dbflow.kotlinextensions.delete
 import com.raizlabs.android.dbflow.kotlinextensions.save
 import com.raizlabs.android.dbflow.sql.language.SQLite
+import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.db.*
 import org.threeten.bp.LocalTime
@@ -55,60 +56,46 @@ object EndDAO {
             end.saveTime = LocalTime.now()
         }
         FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-                    end.save(db)
-                    SQLite.delete(EndImage::class.java)
-                            .where(EndImage_Table.end.eq(end.id))
-                            .execute(db)
-                    for (image in images) {
-                        image.endId = end.id
-                        image.save(db)
-                    }
-                    SQLite.delete(Shot::class.java)
-                            .where(Shot_Table.end.eq(end.id))
-                            .execute(db)
-                    for (shot in shots) {
-                        shot.endId = end.id
-                        shot.save(db)
-                    }
-                }
+            saveEnd(end, db, images, shots)
+        }
+    }
+
+    fun insertEnd(end: End, images: List<EndImage>, shots: List<Shot>) {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
+            db.execSQL("UPDATE End SET index = index + 1 WHERE index>=${end.index}")
+            saveEnd(end, db, images, shots)
+        }
+    }
+
+    private fun saveEnd(end: End, db: DatabaseWrapper, images: List<EndImage>, shots: List<Shot>) {
+        end.save(db)
+        SQLite.delete(EndImage::class.java)
+                .where(EndImage_Table.end.eq(end.id))
+                .execute(db)
+        for (image in images) {
+            image.endId = end.id
+            image.save(db)
+        }
+        SQLite.delete(Shot::class.java)
+                .where(Shot_Table.end.eq(end.id))
+                .execute(db)
+        for (shot in shots) {
+            shot.endId = end.id
+            shot.save(db)
+        }
     }
 
     fun deleteEnd(end: End) {
         FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-                    //TODO check if this is really getting deleted
+            //TODO check if this is really getting deleted
 //                    SQLite.delete(EndImage::class.java)
 //                            .where(EndImage_Table.end.eq(end.id))
 //                            .execute(db)
 //                    SQLite.delete(Shot::class.java)
 //                            .where(Shot_Table.end.eq(end.id))
 //                            .execute(db)
-                    end.delete(db)
-
-                    val round = Round[end.roundId!!] ?: return@executeTransaction
-
-                    for ((i, end) in round.loadEnds(db).withIndex()) {
-                        end.index = i
-                        end.save(db)
-                    }
-                }
-    }
-
-    fun insertEnd(end: End, images: List<EndImage>, shots: List<Shot>) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-                    val round = Round[end.roundId!!]
-                    val ends = round!!.loadEnds(db).toMutableList()
-
-                    val pos = ends.binarySearch(end, compareBy(End::index))
-                    if (pos < 0) {
-                        ends.add(-pos - 1, end)
-                    } else {
-                        ends.add(pos, end)
-                    }
-
-                    for ((i, end) in ends.withIndex()) {
-                        end.index = i
-                        end.save(db)
-                    }
-                }
+            end.delete(db)
+            db.execSQL("UPDATE End SET index = index - 1 WHERE index>${end.index}")
+        }
     }
 }

From 6c046a901836fa86cc5ff3492b9ae461e91c5176 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Sat, 13 Jan 2018 19:22:15 +0100
Subject: [PATCH 025/102] Fixed UI tests

---
 .../features/main/MainActivityTest.kt         |  6 ++-
 .../training/ScoreboardActivityTest.kt        | 48 ++++++++++++-------
 .../training/input/InputActivityTest.kt       |  2 +-
 .../StandardRoundActivityTest.kt              |  6 +--
 .../training/details/TrainingFragment.kt      |  9 +++-
 .../environment/EnvironmentActivity.kt        | 11 +++++
 .../views/selector/EnvironmentSelector.kt     |  2 +-
 .../src/main/res/drawable/ic_house_24dp.xml   |  0
 .../mytargets/shared/models/Environment.kt    | 15 ------
 .../mytargets/shared/models/db/Training.kt    |  2 +-
 10 files changed, 58 insertions(+), 43 deletions(-)
 rename {shared => app}/src/main/res/drawable/ic_house_24dp.xml (100%)

diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
index 86ce65786..ee511fd8d 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
@@ -48,6 +48,8 @@ import de.dreier.mytargets.shared.models.EBowType
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.dao.BowDAO
+import de.dreier.mytargets.shared.models.db.Arrow
+import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.targets.models.WAFull
 import de.dreier.mytargets.shared.views.TargetViewBase.EInputMethod
@@ -181,7 +183,7 @@ class MainActivityTest : UITestBase() {
         // openBow
         onView(withRecyclerView(R.id.recyclerView).atPosition(0))
                 .perform(click())
-        val firstBow = BowDAO.loadBows().sorted().firstOrNull()
+        val firstBow = BowDAO.loadBows().sortedWith(compareBy(Bow::name, Bow::id)).firstOrNull()
         intended(allOf(hasClass(EditBowActivity::class.java),
                 hasExtra<Long>(EditBowFragment.BOW_ID, firstBow!!.id)))
 
@@ -193,7 +195,7 @@ class MainActivityTest : UITestBase() {
         // openArrow
         onView(withRecyclerView(R.id.recyclerView).atPosition(0))
                 .perform(click())
-        val firstArrow = ArrowDAO.loadArrows().sorted().firstOrNull()
+        val firstArrow = ArrowDAO.loadArrows().sortedWith(compareBy(Arrow::name, Arrow::id)).firstOrNull()
         intended(allOf(hasClass(EditArrowActivity::class.java),
                 hasExtra<Long>(EditArrowFragment.ARROW_ID, firstArrow!!.id)))
 
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt
index 827bd9860..de727a7f6 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt
@@ -15,52 +15,64 @@
 
 package de.dreier.mytargets.features.training
 
-
+import android.app.Activity
+import android.app.Instrumentation
 import android.content.Intent
+import android.support.test.espresso.Espresso.onView
+import android.support.test.espresso.assertion.ViewAssertions.matches
+import android.support.test.espresso.intent.Intents.intended
+import android.support.test.espresso.intent.Intents.intending
+import android.support.test.espresso.intent.matcher.IntentMatchers.*
 import android.support.test.espresso.intent.rule.IntentsTestRule
+import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
+import android.support.test.espresso.matcher.ViewMatchers.withText
 import android.support.test.runner.AndroidJUnit4
+import android.support.v7.preference.PreferenceFragmentCompat
+import de.dreier.mytargets.R
 import de.dreier.mytargets.features.scoreboard.ScoreboardActivity
+import de.dreier.mytargets.features.settings.ESettingsScreens
+import de.dreier.mytargets.features.settings.SettingsActivity
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.test.base.UITestBase
+import de.dreier.mytargets.test.utils.matchers.IntentMatcher.hasClass
 import de.dreier.mytargets.test.utils.rules.SimpleDbTestRule
-import org.junit.Ignore
+import org.hamcrest.CoreMatchers.*
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
 import java.util.*
 
-@Ignore
 @RunWith(AndroidJUnit4::class)
 class ScoreboardActivityTest : UITestBase() {
 
     private val activityTestRule = IntentsTestRule(
             ScoreboardActivity::class.java, true, false)
     @get:Rule
-    val rule = RuleChain.outerRule(SimpleDbTestRule())
+    val rule: RuleChain = RuleChain.outerRule(SimpleDbTestRule())
             .around(activityTestRule)
 
     @Test
     fun navigation() {
         val trainings = Training.all
-        Collections.sort(trainings, Collections.reverseOrder())
-        val (id) = trainings[0]
+        trainings.sortedWith(Collections.reverseOrder())
+        val id = trainings[0].id
         val i = Intent()
         i.putExtra(ScoreboardActivity.TRAINING_ID, id)
         i.putExtra(ScoreboardActivity.ROUND_ID, -1L)
         activityTestRule.launchActivity(i)
 
-//        intending(anyOf(not(isInternal()), isInternal()))
-//                .respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, null))
-//
-//        onView(withContentDescription(containsString("415/720")))
-//                .check(matches(isDisplayed()))
-//
-//        clickActionBarItem(R.id.action_share, R.string.share)
-//        intended(hasAction(Intent.ACTION_CHOOSER))
-//
-//        clickActionBarItem(R.id.action_settings, R.string.preferences)
-//        intended(allOf(hasClass(SettingsActivity::class.java),
-//                hasExtra(PreferenceFragmentCompat.ARG_PREFERENCE_ROOT, ESettingsScreens.SCOREBOARD.key)))
+        intending(anyOf(not(isInternal()), isInternal()))
+                .respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, null))
+
+        onView(withText(containsString("436/720")))
+                .check(matches(isDisplayed()))
+
+        clickActionBarItem(R.id.action_share, R.string.share)
+        intended(hasAction(Intent.ACTION_CHOOSER))
+
+        clickActionBarItem(R.id.action_settings, R.string.preferences)
+        intended(allOf(hasClass(SettingsActivity::class.java),
+                hasExtra(PreferenceFragmentCompat.ARG_PREFERENCE_ROOT, ESettingsScreens.SCOREBOARD.key)))
     }
 }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt
index eeea1125d..868785fb0 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt
@@ -49,7 +49,7 @@ class InputActivityTest : UITestBase() {
             InputActivity::class.java, true, false)
 
     @get:Rule
-    val rule = RuleChain.outerRule(object : DbTestRuleBase() {
+    val rule: RuleChain = RuleChain.outerRule(object : DbTestRuleBase() {
         override fun addDatabaseContent() {
             val generator = Random(3435)
             val standardRound = StandardRound[32L]
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt
index 5e70bccf3..ab212b9a8 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt
@@ -26,7 +26,7 @@ import android.support.test.runner.AndroidJUnit4
 import android.support.v4.util.LongSparseArray
 import android.support.v7.widget.RecyclerView
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.activities.ItemSelectActivity
+import de.dreier.mytargets.base.navigation.NavigationController
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.db.StandardRound
 import de.dreier.mytargets.test.base.UITestBase
@@ -56,7 +56,7 @@ class StandardRoundActivityTest : UITestBase() {
     @Test
     fun searchTest() {
         val i = Intent()
-        i.putExtra(ItemSelectActivity.ITEM, StandardRound[32L]!!)
+        i.putExtra(NavigationController.ITEM, StandardRound[32L]!!)
         activityTestRule.launchActivity(i)
 
         clickActionBarItem(R.id.action_search, R.string.search)
@@ -76,7 +76,7 @@ class StandardRoundActivityTest : UITestBase() {
     @Test
     fun recentlyUsedTest() {
         val i = Intent()
-        i.putExtra(ItemSelectActivity.ITEM, StandardRound[32L]!!)
+        i.putExtra(NavigationController.ITEM, StandardRound[32L]!!)
         activityTestRule.launchActivity(i)
 
         onView(withRecyclerView(R.id.recyclerView).atPosition(0))
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index 516d83b88..258b6073b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -119,9 +119,14 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
             binding.fab.visibility = if (supportsDeletion) View.VISIBLE else View.GONE
 
             // Set round info
-            binding.weatherIcon.setImageResource(training!!.environment.colorDrawable)
+            val colorDrawable = if (training!!.environment.indoor) {
+                R.drawable.ic_house_24dp
+            } else {
+                training!!.environment.weather.colorDrawable
+            }
+            binding.weatherIcon.setImageResource(colorDrawable)
             binding.detailRoundInfo.text = HtmlUtils.getTrainingInfoHTML(context!!, training!!, rounds, equals)
-            adapter!!.setList(rounds.toMutableList())
+            adapter!!.setList(rounds)
 
             activity!!.invalidateOptionsMenu()
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentActivity.kt
index 18b5d8061..4987c29e9 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentActivity.kt
@@ -16,6 +16,7 @@
 package de.dreier.mytargets.features.training.environment
 
 import android.support.v4.app.Fragment
+import android.view.MenuItem
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 
 class EnvironmentActivity : SimpleFragmentActivityBase() {
@@ -23,6 +24,16 @@ class EnvironmentActivity : SimpleFragmentActivityBase() {
         return EnvironmentFragment()
     }
 
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            android.R.id.home -> {
+                (childFragment as EnvironmentFragment).onSave()
+                true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+
     override fun onBackPressed() {
         (childFragment as EnvironmentFragment).onSave()
     }
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
index e7cfa56c8..23a9ec5de 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
@@ -60,7 +60,7 @@ class EnvironmentSelector @JvmOverloads constructor(context: Context, attrs: Att
 
         if (item.indoor) {
             binding.name.setText(de.dreier.mytargets.shared.R.string.indoor)
-            binding.image.setImageResource(de.dreier.mytargets.shared.R.drawable.ic_house_24dp)
+            binding.image.setImageResource(R.drawable.ic_house_24dp)
         } else {
             binding.name.text = item.weather.getName()
             binding.image.setImageResource(item.weather.drawable)
diff --git a/shared/src/main/res/drawable/ic_house_24dp.xml b/app/src/main/res/drawable/ic_house_24dp.xml
similarity index 100%
rename from shared/src/main/res/drawable/ic_house_24dp.xml
rename to app/src/main/res/drawable/ic_house_24dp.xml
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Environment.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Environment.kt
index 5020f23c9..f17a696e6 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Environment.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Environment.kt
@@ -16,14 +16,7 @@ package de.dreier.mytargets.shared.models
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.graphics.drawable.Drawable
 import android.os.Parcelable
-import android.support.annotation.DrawableRes
-import android.support.v4.content.ContextCompat
-import android.text.TextUtils
-
-import de.dreier.mytargets.shared.R
-import de.dreier.mytargets.shared.SharedApplicationInstance
 import kotlinx.android.parcel.Parcelize
 
 @SuppressLint("ParcelCreator")
@@ -36,14 +29,6 @@ data class Environment(
         var location: String = ""
 ) : Parcelable {
 
-    val colorDrawable: Int
-        @DrawableRes
-        get() = if (indoor) {
-            R.drawable.ic_house_24dp
-        } else {
-            weather.colorDrawable
-        }
-
     fun getWindSpeed(context: Context): String {
         return windSpeed.toString() + " Bft " + WindDirection.getList(context)[windDirection].name
     }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
index 51f7a2c01..6c33294ab 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
@@ -160,7 +160,7 @@ data class Training(
                 .sum()
 
     @OneToMany(methods = [], variableName = "rounds")
-    fun loadRounds(): List<Round> {
+    fun loadRounds(): MutableList<Round> {
         if (rounds == null) {
             rounds = SQLite.select()
                     .from(Round::class.java)

From f4ea3140862939bb198182ad486a21d419b18d45 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Sun, 14 Jan 2018 15:44:22 +0100
Subject: [PATCH 026/102] Fixed end index update query

---
 .../de/dreier/mytargets/shared/models/dao/EndDAO.kt   | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
index b40a937df..4e19b5c8d 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
@@ -62,7 +62,7 @@ object EndDAO {
 
     fun insertEnd(end: End, images: List<EndImage>, shots: List<Shot>) {
         FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            db.execSQL("UPDATE End SET index = index + 1 WHERE index>=${end.index}")
+            db.execSQL("UPDATE End SET `index` = `index` + 1 WHERE `index` >= ${end.index}")
             saveEnd(end, db, images, shots)
         }
     }
@@ -87,15 +87,8 @@ object EndDAO {
 
     fun deleteEnd(end: End) {
         FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            //TODO check if this is really getting deleted
-//                    SQLite.delete(EndImage::class.java)
-//                            .where(EndImage_Table.end.eq(end.id))
-//                            .execute(db)
-//                    SQLite.delete(Shot::class.java)
-//                            .where(Shot_Table.end.eq(end.id))
-//                            .execute(db)
             end.delete(db)
-            db.execSQL("UPDATE End SET index = index - 1 WHERE index>${end.index}")
+            db.execSQL("UPDATE End SET `index` = `index` - 1 WHERE `index` > ${end.index}")
         }
     }
 }

From bd6a103e9abdc36677cae2e30cbbf0de18b144c4 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Sun, 14 Jan 2018 15:48:40 +0100
Subject: [PATCH 027/102] Updated copyright

---
 app/build.gradle                              |  2 +-
 app/src/androidTest/AndroidManifest.xml       |  2 +-
 .../de/dreier/mytargets/app/MigrationTest.kt  |  2 +-
 .../features/arrow/ArrowSelectorTest.kt       |  2 +-
 .../mytargets/features/arrow/EditArrowTest.kt |  2 +-
 .../mytargets/features/bow/BowSelectorTest.kt |  2 +-
 .../features/bow/EditSightMarksTest.kt        |  2 +-
 .../features/main/IntroActivityTest.kt        |  2 +-
 .../features/main/MainActivityTest.kt         |  2 +-
 .../features/settings/SettingsActivityTest.kt |  2 +-
 .../features/settings/SettingsManagerTest.kt  |  2 +-
 .../features/statistics/ExportTest.kt         |  2 +-
 .../statistics/StatisticsActivityTest.kt      |  2 +-
 .../mytargets/features/training/DeleteTest.kt |  2 +-
 .../training/EditTrainingActivityTest.kt      |  2 +-
 .../training/ScoreboardActivityTest.kt        |  2 +-
 .../features/training/TrainingActivityTest.kt |  2 +-
 .../training/input/InputActivityTest.kt       |  2 +-
 .../EditStandardRoundActivityTest.kt          |  2 +-
 .../StandardRoundActivityTest.kt              |  2 +-
 .../test/base/InstrumentedTestBase.kt         |  2 +-
 .../dreier/mytargets/test/base/UITestBase.kt  |  2 +-
 .../test/utils/ImageCaptureStubbingUtils.kt   |  2 +-
 .../mytargets/test/utils/PermissionGranter.kt |  2 +-
 .../test/utils/actions/LowLevelActions.kt     |  2 +-
 .../utils/actions/NestedScrollToAction.kt     |  2 +-
 .../test/utils/actions/TargetViewActions.kt   |  2 +-
 .../assertions/RecyclerViewAssertions.kt      |  2 +-
 .../utils/assertions/TargetViewAssertions.kt  |  2 +-
 .../test/utils/matchers/IntentMatcher.kt      |  2 +-
 .../test/utils/matchers/MatcherUtils.kt       |  2 +-
 .../test/utils/matchers/ParentViewMatcher.kt  |  2 +-
 .../utils/matchers/RecyclerViewMatcher.kt     |  2 +-
 .../test/utils/matchers/ViewMatcher.kt        |  2 +-
 .../test/utils/rules/DbTestRuleBase.kt        |  2 +-
 .../test/utils/rules/EmptyDbTestRule.kt       |  2 +-
 .../test/utils/rules/MiniDbTestRule.kt        |  2 +-
 .../test/utils/rules/SimpleDbTestRule.kt      |  2 +-
 app/src/debug/res/values/constants.xml        |  2 +-
 app/src/main/AndroidManifest.xml              |  2 +-
 .../arrow/ic_arrow_diameter_grey600_24dp.svg  |  4 ++--
 .../arrow/ic_arrow_length_grey600_24dp.svg    |  2 +-
 .../arrow/ic_arrow_material_grey600_24dp.svg  |  2 +-
 .../art/arrow/ic_arrow_nock_grey600_24dp.svg  |  2 +-
 .../art/arrow/ic_arrow_spine_grey600_24dp.svg |  2 +-
 .../ic_arrow_tip_weight_grey600_24dp.svg      |  2 +-
 .../art/arrow/ic_arrow_vanes_grey600_24dp.svg |  2 +-
 .../arrow/ic_arrow_weight_grey600_24dp.svg    |  2 +-
 .../main/art/bow/ic_bow_bare_black_24dp.svg   |  2 +-
 .../bow/ic_bow_brace_height_grey600_24dp.svg  |  2 +-
 .../art/bow/ic_bow_button_grey600_24dp.svg    |  2 +-
 .../main/art/bow/ic_bow_cam_grey600_24dp.svg  |  2 +-
 .../art/bow/ic_bow_clicker_grey600_24dp.svg   |  2 +-
 .../art/bow/ic_bow_compound_black_24dp.svg    |  2 +-
 .../main/art/bow/ic_bow_horse_black_24dp.svg  |  2 +-
 .../main/art/bow/ic_bow_limb_grey600_24dp.svg |  2 +-
 .../main/art/bow/ic_bow_long_black_24dp.svg   |  2 +-
 .../bow/ic_bow_nocking_point_grey600_24dp.svg |  2 +-
 .../art/bow/ic_bow_recurve_black_24dp.svg     |  2 +-
 .../main/art/bow/ic_bow_rest_grey600_24dp.svg |  2 +-
 .../bow/ic_bow_stabilizer_grey600_24dp.svg    |  2 +-
 .../art/bow/ic_bow_string_grey600_24dp.svg    |  2 +-
 .../art/bow/ic_bow_tiller_grey600_24dp.svg    |  2 +-
 .../main/art/bow/ic_bow_yumi_black_24dp.svg   |  2 +-
 app/src/main/art/intro/screen_1_image.svg     | 15 +++++++++++++++
 app/src/main/art/intro/screen_2_2_image.svg   | 15 +++++++++++++++
 .../ic_dispersion_pattern_grey600_48dp.svg    |  2 +-
 .../main/art/share/ic_grid_grey600_48dp.svg   |  2 +-
 .../main/art/share/ic_text_grey600_48dp.svg   |  2 +-
 app/src/main/art/store/brand_name.svg         |  2 +-
 app/src/main/art/store/ic_launcher.svg        |  2 +-
 app/src/main/art/targets/beursault.svg        |  2 +-
 app/src/main/art/targets/gridded_dot.svg      |  2 +-
 app/src/main/art/targets/hit_miss.svg         |  2 +-
 app/src/main/art/targets/ifaa_animal.svg      |  2 +-
 app/src/main/art/targets/nfaa_5_spot.svg      |  2 +-
 app/src/main/art/targets/nfaa_animal.svg      |  2 +-
 app/src/main/art/targets/nfaa_field.svg       |  2 +-
 app/src/main/art/targets/nfaa_hunter.svg      |  2 +-
 app/src/main/art/targets/nfaa_indoor.svg      |  2 +-
 app/src/main/art/targets/nfas_field.svg       |  2 +-
 app/src/main/art/targets/simple_dot.svg       |  2 +-
 app/src/main/art/targets/three_d_asa.svg      |  2 +-
 app/src/main/art/targets/three_d_asa_14.svg   |  2 +-
 app/src/main/art/targets/three_d_dair.svg     |  2 +-
 app/src/main/art/targets/three_d_ibo.svg      |  2 +-
 app/src/main/art/targets/three_d_nfas.svg     |  2 +-
 app/src/main/art/targets/vegas.svg            |  2 +-
 app/src/main/art/targets/vertical_3_spot.svg  |  2 +-
 app/src/main/art/targets/wa_3_ring.svg        |  2 +-
 app/src/main/art/targets/wa_5_ring.svg        |  2 +-
 app/src/main/art/targets/wa_6_ring.svg        |  2 +-
 app/src/main/art/targets/wa_field.svg         |  2 +-
 app/src/main/art/targets/wa_full.svg          |  2 +-
 app/src/main/art/targets/worcester.svg        |  2 +-
 .../training/ic_arrow_number_grey600_24dp.svg |  2 +-
 .../ic_arrow_number_off_grey600_24dp.svg      |  2 +-
 app/src/main/art/training/ic_inside_out.svg   |  2 +-
 .../art/training/ic_multiple_archerers.svg    |  2 +-
 app/src/main/art/training/ic_outside_in.svg   |  2 +-
 .../art/training/ic_timer_grey600_24dp.svg    |  2 +-
 .../training/ic_timer_off_grey600_24dp.svg    |  2 +-
 app/src/main/art/weather/ic_cloudy_48dp.svg   |  2 +-
 .../art/weather/ic_cloudy_outline_48dp.svg    |  2 +-
 .../main/art/weather/ic_light_rain_48dp.svg   |  2 +-
 .../weather/ic_light_rain_outline_48dp.svg    |  2 +-
 .../art/weather/ic_partly_cloudy_48dp.svg     |  2 +-
 .../weather/ic_partly_cloudy_outline_48dp.svg |  2 +-
 app/src/main/art/weather/ic_rain_48dp.svg     |  2 +-
 .../main/art/weather/ic_rain_outline_48dp.svg |  2 +-
 app/src/main/art/weather/ic_sun_48dp.svg      |  2 +-
 .../main/art/weather/ic_sun_outline_48dp.svg  |  2 +-
 .../v7/widget/RebindReportingHolder.kt        |  2 +-
 .../mytargets/app/ApplicationInstance.kt      |  2 +-
 .../base/activities/ChildActivityBase.kt      |  2 +-
 .../activities/SimpleFragmentActivityBase.kt  |  2 +-
 .../base/adapters/ListAdapterBase.kt          |  2 +-
 .../base/adapters/SimpleListAdapterBase.kt    |  2 +-
 .../dynamicitem/DynamicItemAdapter.kt         |  2 +-
 .../adapters/dynamicitem/DynamicItemHolder.kt |  2 +-
 .../adapters/header/ExpandableHeaderHolder.kt |  2 +-
 .../adapters/header/ExpandableListAdapter.kt  |  2 +-
 .../base/adapters/header/HeaderListAdapter.kt |  2 +-
 .../adapters/header/HeaderListAdapterBase.kt  |  2 +-
 .../base/fragments/EditFragmentBase.kt        |  2 +-
 .../fragments/EditWithImageFragmentBase.kt    |  2 +-
 .../fragments/EditableListFragmentBase.kt     |  2 +-
 .../mytargets/base/fragments/FragmentBase.kt  |  2 +-
 .../base/fragments/ItemActionModeCallback.kt  |  2 +-
 .../base/fragments/SelectItemFragmentBase.kt  |  2 +-
 .../SelectPureListItemFragmentBase.kt         |  2 +-
 .../mytargets/base/gallery/CustomViewPager.kt |  2 +-
 .../mytargets/base/gallery/GalleryActivity.kt |  2 +-
 .../base/gallery/HorizontalImageViewHolder.kt |  2 +-
 .../adapters/HorizontalListAdapters.kt        |  2 +-
 .../base/gallery/adapters/ViewPagerAdapter.kt |  2 +-
 .../base/navigation/NavigationController.kt   |  2 +-
 .../features/arrows/ArrowListActivity.kt      |  2 +-
 .../features/arrows/ArrowListFragment.kt      |  2 +-
 .../features/arrows/EditArrowActivity.kt      |  2 +-
 .../features/arrows/EditArrowFragment.kt      |  2 +-
 .../features/arrows/EditArrowListFragment.kt  |  2 +-
 .../features/arrows/EditArrowViewModel.kt     |  2 +-
 .../mytargets/features/bows/BowAdapter.kt     |  2 +-
 .../features/bows/BowListActivity.kt          |  2 +-
 .../features/bows/BowListFragment.kt          |  2 +-
 .../features/bows/EditBowActivity.kt          |  2 +-
 .../features/bows/EditBowFragment.kt          |  2 +-
 .../features/bows/EditBowListFragment.kt      |  2 +-
 .../features/distance/DistanceActivity.kt     |  2 +-
 .../features/distance/DistanceFragment.kt     |  2 +-
 .../features/distance/DistanceGridFragment.kt |  2 +-
 .../features/distance/DistanceInputDialog.kt  |  2 +-
 .../distance/DistanceItemDecorator.kt         |  2 +-
 .../DistanceTabsFragmentPagerAdapter.kt       |  2 +-
 .../mytargets/features/help/HelpActivity.kt   |  2 +-
 .../mytargets/features/help/HelpFragment.kt   |  2 +-
 .../help/licences/LicencesActivity.kt         |  2 +-
 .../help/licences/LicencesFragment.kt         |  2 +-
 .../mytargets/features/main/IntroActivity.kt  |  2 +-
 .../mytargets/features/main/MainActivity.kt   |  2 +-
 .../features/rounds/EditRoundFragment.kt      |  2 +-
 .../features/scoreboard/EFileType.kt          |  2 +-
 .../features/scoreboard/ScoreboardActivity.kt |  2 +-
 .../features/scoreboard/ScoreboardBuilder.kt  |  2 +-
 .../scoreboard/ScoreboardConfiguration.kt     |  2 +-
 .../features/scoreboard/ScoreboardFragment.kt |  2 +-
 .../features/scoreboard/ScoreboardUtils.kt    |  2 +-
 .../scoreboard/SignatureDialogFragment.kt     |  2 +-
 .../scoreboard/builder/ViewBuilder.kt         |  2 +-
 .../scoreboard/builder/model/Table.kt         |  2 +-
 .../layout/DefaultScoreboardLayout.kt         |  2 +-
 .../scoreboard/layout/InfoTableBuilder.kt     |  2 +-
 .../pdf/ViewPrintDocumentAdapter.kt           |  2 +-
 .../scoreboard/pdf/ViewToPdfWriter.kt         |  2 +-
 .../features/settings/DatePreference.kt       |  2 +-
 .../DatePreferenceDialogFragmentCompat.kt     |  2 +-
 .../features/settings/ESettingsScreens.kt     |  2 +-
 .../settings/InputSettingsFragment.kt         |  2 +-
 .../features/settings/LanguagePreference.kt   |  2 +-
 .../features/settings/MainSettingsFragment.kt |  2 +-
 .../settings/OverviewSettingsFragment.kt      |  2 +-
 .../settings/ProfileSettingsFragment.kt       |  2 +-
 .../settings/ScoreboardSettingsFragment.kt    |  2 +-
 .../features/settings/SettingsActivity.kt     |  2 +-
 .../features/settings/SettingsFragmentBase.kt |  2 +-
 .../features/settings/SettingsManager.kt      |  2 +-
 .../settings/SharedPreferencesUtils.kt        |  2 +-
 .../settings/StatisticsSettingsFragment.kt    |  2 +-
 .../settings/TimerSettingsFragment.kt         |  2 +-
 .../features/settings/about/AboutActivity.kt  |  2 +-
 .../features/settings/about/AboutFragment.kt  |  2 +-
 .../features/settings/about/DonateActivity.kt |  2 +-
 .../settings/about/DonationAdapter.kt         |  2 +-
 .../features/settings/backup/BackupAdapter.kt |  2 +-
 .../features/settings/backup/BackupEntry.kt   |  2 +-
 .../settings/backup/BackupException.kt        |  2 +-
 .../settings/backup/BackupSettingsFragment.kt |  2 +-
 .../settings/backup/EBackupInterval.kt        |  2 +-
 .../settings/backup/provider/BackupUtils.kt   |  2 +-
 .../backup/provider/EBackupLocation.kt        |  2 +-
 .../backup/provider/ExternalStorageBackup.kt  |  2 +-
 .../backup/provider/GoogleDriveBackup.kt      |  2 +-
 .../backup/provider/IAsyncBackupRestore.kt    |  2 +-
 .../backup/provider/IBlockingBackup.kt        |  2 +-
 .../backup/provider/InternalStorageBackup.kt  |  2 +-
 .../synchronization/GenericAccountService.kt  |  2 +-
 .../backup/synchronization/StubProvider.kt    |  2 +-
 .../backup/synchronization/SyncAdapter.kt     |  2 +-
 .../backup/synchronization/SyncService.java   |  2 +-
 .../backup/synchronization/SyncUtils.kt       |  2 +-
 .../features/statistics/ArrowStatistic.kt     |  2 +-
 .../features/statistics/ChipGroup.kt          |  2 +-
 .../features/statistics/CsvExporter.kt        |  2 +-
 .../statistics/DispersionPatternActivity.kt   |  2 +-
 .../statistics/DispersionPatternUtils.kt      |  2 +-
 .../features/statistics/StatisticsActivity.kt |  2 +-
 .../features/statistics/StatisticsFragment.kt |  2 +-
 .../mytargets/features/statistics/Tag.kt      |  2 +-
 .../mytargets/features/timer/TimerActivity.kt |  2 +-
 .../mytargets/features/timer/TimerFragment.kt |  2 +-
 .../features/training/ETrainingType.kt        |  2 +-
 .../features/training/EditRoundActivity.kt    |  2 +-
 .../features/training/RoundActivity.kt        |  2 +-
 .../features/training/RoundFragment.kt        |  2 +-
 .../features/training/TrainingActivity.kt     |  2 +-
 .../training/details/HtmlInfoBuilder.kt       |  2 +-
 .../features/training/details/HtmlUtils.kt    |  2 +-
 .../training/details/TrainingFragment.kt      |  2 +-
 .../training/edit/DatePickerFragment.kt       |  2 +-
 .../training/edit/EditTrainingActivity.kt     |  2 +-
 .../training/edit/EditTrainingFragment.kt     |  2 +-
 .../training/environment/Connectivity.kt      |  2 +-
 .../training/environment/CurrentWeather.kt    |  2 +-
 .../environment/EnvironmentActivity.kt        |  2 +-
 .../environment/EnvironmentFragment.kt        |  2 +-
 .../features/training/environment/Locator.kt  |  2 +-
 .../training/environment/WeatherService.kt    |  2 +-
 .../environment/WindDirectionActivity.kt      |  2 +-
 .../environment/WindDirectionListFragment.kt  |  2 +-
 .../training/environment/WindSpeedActivity.kt |  2 +-
 .../environment/WindSpeedListFragment.kt      |  2 +-
 .../features/training/input/ETrainingScope.kt |  2 +-
 .../training/input/FingerSlipDetector.kt      |  2 +-
 .../features/training/input/InputActivity.kt  |  2 +-
 .../features/training/input/LoaderResult.kt   |  2 +-
 .../training/input/SummaryConfiguration.kt    |  2 +-
 .../features/training/input/TargetView.kt     |  2 +-
 .../overview/ExpandableListFragment.kt        |  2 +-
 .../features/training/overview/Header.kt      |  2 +-
 .../training/overview/TrainingsFragment.kt    |  2 +-
 .../EditStandardRoundActivity.kt              |  2 +-
 .../EditStandardRoundFragment.kt              |  2 +-
 .../standardround/StandardRoundActivity.kt    |  2 +-
 .../StandardRoundListFragment.kt              |  2 +-
 .../training/target/TargetActivity.kt         |  2 +-
 .../training/target/TargetListFragment.kt     |  2 +-
 .../de/dreier/mytargets/utils/BundleUtils.kt  |  2 +-
 .../mytargets/utils/DividerItemDecoration.kt  |  2 +-
 .../dreier/mytargets/utils/IntentWrapper.kt   |  2 +-
 .../mytargets/utils/MobileWearableClient.kt   |  2 +-
 .../mytargets/utils/MobileWearableListener.kt |  2 +-
 .../mytargets/utils/RoundedTextDrawable.kt    |  2 +-
 .../mytargets/utils/SingleSelectorBundler.kt  |  2 +-
 .../mytargets/utils/SlideInItemAnimator.kt    |  2 +-
 .../de/dreier/mytargets/utils/ToolbarUtils.kt |  2 +-
 .../java/de/dreier/mytargets/utils/Utils.kt   |  2 +-
 .../mytargets/utils/backup/DbBackupHelper.kt  |  2 +-
 .../mytargets/utils/backup/MyBackupAgent.kt   |  2 +-
 .../databinding/SpinnerBindingAdapters.kt     |  2 +-
 .../ExpandableHeaderBindingHolder.kt          |  2 +-
 .../multiselector/HeaderBindingHolder.kt      |  2 +-
 .../utils/multiselector/ItemBindingHolder.kt  |  2 +-
 .../utils/multiselector/MultiSelector.kt      |  2 +-
 .../multiselector/OnItemClickListener.kt      |  2 +-
 .../multiselector/OnItemLongClickListener.kt  |  2 +-
 .../utils/multiselector/SelectableHolder.kt   |  2 +-
 .../multiselector/SelectableViewHolder.kt     |  2 +-
 .../utils/multiselector/SelectorBase.kt       |  2 +-
 .../utils/multiselector/SingleSelector.kt     |  2 +-
 .../utils/multiselector/WeakHolderTracker.kt  |  2 +-
 .../utils/transitions/FabTransform.kt         |  2 +-
 .../utils/transitions/GravityArcMotion.kt     |  2 +-
 .../utils/transitions/NoPauseAnimator.kt      |  2 +-
 .../utils/transitions/TransitionAdapter.kt    |  2 +-
 .../de/dreier/mytargets/views/NumberPicker.kt |  2 +-
 .../mytargets/views/selector/ArrowSelector.kt |  2 +-
 .../mytargets/views/selector/BowSelector.kt   |  2 +-
 .../views/selector/DistanceSelector.kt        |  2 +-
 .../views/selector/EnvironmentSelector.kt     |  2 +-
 .../mytargets/views/selector/SelectorBase.kt  |  2 +-
 .../views/selector/SimpleDistanceSelector.kt  |  2 +-
 .../views/selector/StandardRoundSelector.kt   |  2 +-
 .../views/selector/TargetSelector.kt          |  2 +-
 .../views/selector/WindDirectionSelector.kt   |  2 +-
 .../views/selector/WindSpeedSelector.kt       |  2 +-
 .../mytargets/views/speeddial/FabSpeedDial.kt |  2 +-
 .../views/speeddial/FabSpeedDialBehaviour.kt  |  2 +-
 app/src/main/res/anim/left_in.xml             |  2 +-
 app/src/main/res/anim/left_out.xml            |  4 ++--
 app/src/main/res/anim/right_in.xml            |  4 ++--
 app/src/main/res/anim/right_out.xml           |  4 ++--
 app/src/main/res/animator-v21/raise.xml       |  4 ++--
 app/src/main/res/animator/fab_rotator.xml     | 15 +++++++++++++++
 .../main/res/animator/fab_rotator_reverse.xml | 15 +++++++++++++++
 .../color-v24/gradient_launcher_finish.xml    | 17 ++++++++++++++++-
 app/src/main/res/color/tab_layout_text.xml    |  4 ++--
 .../drawable-v21/chip_background_selector.xml |  4 ++--
 .../res/drawable-v21/fab_buttonstates.xml     | 19 +++++++++----------
 .../main/res/drawable-v21/launch_screen.xml   |  4 ++--
 .../res/drawable-v24/launcher_foreground.xml  |  4 ++--
 .../ic_shortcut_album_green_48dp.xml          |  2 +-
 .../ic_shortcut_trending_up_green_48dp.xml    |  2 +-
 .../ic_shortcut_album_green_48dp.xml          |  4 ++--
 .../ic_shortcut_album_green_foreground.xml    |  2 +-
 .../ic_shortcut_trending_up_green_48dp.xml    |  4 ++--
 ..._shortcut_trending_up_green_foreground.xml |  2 +-
 .../res/drawable/about_icon_beta_test.xml     |  2 +-
 .../main/res/drawable/about_icon_crowdin.xml  |  2 +-
 .../main/res/drawable/about_icon_donate.xml   |  2 +-
 .../res/drawable/about_icon_google_plus.xml   |  2 +-
 .../main/res/drawable/about_icon_linkedin.xml |  2 +-
 .../main/res/drawable/about_icon_paypal.xml   |  2 +-
 .../main/res/drawable/about_icon_share.xml    |  2 +-
 app/src/main/res/drawable/arrow_numbers.xml   |  4 ++--
 app/src/main/res/drawable/brand_name.xml      |  4 ++--
 app/src/main/res/drawable/chip_background.xml |  2 +-
 .../res/drawable/chip_background_selected.xml |  4 ++--
 .../res/drawable/chip_background_selector.xml |  4 ++--
 .../main/res/drawable/fab_add_animated.xml    | 15 +++++++++++++++
 .../res/drawable/fab_add_animated_reverse.xml | 15 +++++++++++++++
 .../main/res/drawable/fab_add_white_24dp.xml  |  2 +-
 app/src/main/res/drawable/fab_album_24dp.xml  |  2 +-
 .../main/res/drawable/fab_buttonstates.xml    | 19 +++++++++----------
 .../res/drawable/fab_label_background.xml     |  2 +-
 .../drawable/fab_label_background_pressed.xml |  2 +-
 .../fab_label_background_released.xml         |  2 +-
 .../drawable/fab_trending_up_white_24dp.xml   |  2 +-
 app/src/main/res/drawable/full_divider.xml    |  4 ++--
 .../drawable/ic_account_circle_white_24dp.xml |  2 +-
 app/src/main/res/drawable/ic_add.xml          | 15 +++++++++++++++
 .../main/res/drawable/ic_add_white_24dp.xml   |  2 +-
 app/src/main/res/drawable/ic_album_24dp.xml   |  2 +-
 app/src/main/res/drawable/ic_archery_24dp.xml |  2 +-
 app/src/main/res/drawable/ic_arrow_24dp.xml   |  2 +-
 .../ic_arrow_diameter_grey600_24dp.xml        |  2 +-
 .../drawable/ic_arrow_length_grey600_24dp.xml |  2 +-
 .../ic_arrow_material_grey600_24dp.xml        |  2 +-
 .../drawable/ic_arrow_nock_grey600_24dp.xml   |  2 +-
 .../drawable/ic_arrow_number_accent_24dp.xml  |  2 +-
 .../drawable/ic_arrow_number_grey600_24dp.xml |  2 +-
 .../ic_arrow_number_off_grey600_24dp.xml      |  2 +-
 .../drawable/ic_arrow_spine_grey600_24dp.xml  |  2 +-
 .../ic_arrow_tip_weight_grey600_24dp.xml      |  4 ++--
 .../drawable/ic_arrow_vanes_grey600_24dp.xml  |  2 +-
 .../drawable/ic_arrow_weight_grey600_24dp.xml |  2 +-
 .../res/drawable/ic_backup_grey600_24dp.xml   |  2 +-
 app/src/main/res/drawable/ic_bow_24dp.xml     |  2 +-
 .../ic_bow_brace_height_grey600_24dp.xml      |  2 +-
 .../drawable/ic_bow_button_grey600_24dp.xml   |  2 +-
 .../res/drawable/ic_bow_cam_grey600_24dp.xml  |  2 +-
 .../drawable/ic_bow_clicker_grey600_24dp.xml  |  2 +-
 .../res/drawable/ic_bow_limb_grey600_24dp.xml |  2 +-
 .../ic_bow_nocking_point_grey600_24dp.xml     |  2 +-
 .../res/drawable/ic_bow_rest_grey600_24dp.xml |  2 +-
 ...c_bow_scope_magnification_grey600_24dp.xml |  2 +-
 .../drawable/ic_bow_sight_grey600_24dp.xml    |  2 +-
 .../ic_bow_stabilizer_grey600_24dp.xml        |  2 +-
 .../drawable/ic_bow_string_grey600_24dp.xml   |  2 +-
 .../drawable/ic_bow_tiller_grey600_24dp.xml   |  2 +-
 .../res/drawable/ic_brand_grey600_24dp.xml    |  2 +-
 .../drawable/ic_bubble_chart_grey600_24dp.xml |  2 +-
 .../res/drawable/ic_cancel_grey600_24dp.xml   |  2 +-
 .../main/res/drawable/ic_check_white_24dp.xml |  2 +-
 .../drawable/ic_clear_filter_white_24dp.xml   |  2 +-
 .../main/res/drawable/ic_close_white_24dp.xml |  2 +-
 .../res/drawable/ic_comment_grey600_24dp.xml  |  2 +-
 .../res/drawable/ic_comment_white_24dp.xml    |  2 +-
 .../res/drawable/ic_create_white_24dp.xml     |  2 +-
 .../res/drawable/ic_delete_black_24dp.xml     |  2 +-
 .../res/drawable/ic_delete_white_24dp.xml     |  2 +-
 .../drawable/ic_description_grey600_24dp.xml  |  2 +-
 .../drawable/ic_description_white_24dp.xml    |  2 +-
 .../main/res/drawable/ic_excel_white_24dp.xml |  2 +-
 .../drawable/ic_expand_more_grey600_24dp.xml  |  2 +-
 .../res/drawable/ic_file_grey600_24dp.xml     |  2 +-
 .../res/drawable/ic_filter_white_24dp.xml     |  2 +-
 .../drawable/ic_google_drive_grey600_24dp.xml |  2 +-
 .../res/drawable/ic_help_grey600_24dp.xml     |  2 +-
 .../res/drawable/ic_home_grey600_24dp.xml     |  2 +-
 app/src/main/res/drawable/ic_house.xml        |  2 +-
 app/src/main/res/drawable/ic_house_24dp.xml   |  2 +-
 .../res/drawable/ic_image_grey600_24dp.xml    |  2 +-
 .../main/res/drawable/ic_image_white_24dp.xml |  2 +-
 .../res/drawable/ic_input_grey600_24dp.xml    |  2 +-
 .../res/drawable/ic_keyboard_grey600_24dp.xml |  2 +-
 .../res/drawable/ic_language_grey600_24dp.xml |  2 +-
 .../ic_maximum_score_grey600_24dp.xml         |  2 +-
 .../ic_micro_sd_card_grey600_24dp.xml         |  2 +-
 .../res/drawable/ic_pan_tool_grey600_24dp.xml |  2 +-
 .../drawable/ic_percentage_grey600_24dp.xml   |  2 +-
 .../res/drawable/ic_person_grey600_24dp.xml   |  2 +-
 .../ic_phone_android_grey600_24dp.xml         |  2 +-
 .../drawable/ic_photo_camera_white_24dp.xml   |  2 +-
 .../main/res/drawable/ic_print_white_24dp.xml |  2 +-
 .../ic_query_builder_grey600_24dp.xml         |  2 +-
 .../ic_reached_score_grey600_24dp.xml         |  2 +-
 .../ic_screen_lock_portrait_grey600_24dp.xml  |  2 +-
 .../res/drawable/ic_search_white_24dp.xml     |  2 +-
 .../res/drawable/ic_settings_grey600_24dp.xml |  2 +-
 .../res/drawable/ic_settings_white_24dp.xml   |  2 +-
 .../main/res/drawable/ic_share_white_24dp.xml |  2 +-
 .../drawable/ic_show_chart_grey600_24dp.xml   |  2 +-
 .../res/drawable/ic_show_chart_white_24dp.xml |  2 +-
 .../res/drawable/ic_sorting_grey600_24dp.xml  |  2 +-
 .../ic_target_spot_face_grey600_24dp.xml      |  2 +-
 .../res/drawable/ic_timer_grey600_24dp.xml    |  2 +-
 .../res/drawable/ic_timer_off_white_24dp.xml  |  2 +-
 .../main/res/drawable/ic_timer_white_24dp.xml |  2 +-
 .../res/drawable/ic_title_grey600_24dp.xml    |  2 +-
 .../drawable/ic_trending_up_white_24dp.xml    |  2 +-
 .../drawable/ic_view_list_grey600_24dp.xml    |  2 +-
 .../drawable/ic_visibility_grey600_24dp.xml   |  2 +-
 .../res/drawable/ic_zoom_in_grey600_24dp.xml  |  2 +-
 app/src/main/res/drawable/intro_screen_1.xml  | 15 +++++++++++++++
 app/src/main/res/drawable/intro_screen_2.xml  |  2 +-
 app/src/main/res/drawable/launch_screen.xml   |  4 ++--
 .../res/drawable/md_background_centered.xml   |  2 +-
 .../main/res/drawable/selector_item_light.xml |  4 ++--
 .../main/res/drawable/table_cell_border.xml   |  2 +-
 .../layout/activity_arrow_ranking_details.xml |  2 +-
 app/src/main/res/layout/activity_gallery.xml  | 15 +++++++++++++++
 app/src/main/res/layout/activity_input.xml    |  2 +-
 app/src/main/res/layout/activity_main.xml     |  2 +-
 .../main/res/layout/activity_statistics.xml   |  2 +-
 app/src/main/res/layout/dialog_comment.xml    |  2 +-
 app/src/main/res/layout/fab_menu_item_end.xml |  2 +-
 .../main/res/layout/fab_speed_dial_bottom.xml |  2 +-
 app/src/main/res/layout/fragment_arrows.xml   |  2 +-
 app/src/main/res/layout/fragment_backup.xml   |  2 +-
 app/src/main/res/layout/fragment_bows.xml     |  2 +-
 app/src/main/res/layout/fragment_distance.xml |  2 +-
 .../main/res/layout/fragment_edit_arrow.xml   |  2 +-
 app/src/main/res/layout/fragment_edit_bow.xml |  2 +-
 .../main/res/layout/fragment_edit_image.xml   |  2 +-
 .../main/res/layout/fragment_edit_round.xml   |  2 +-
 .../layout/fragment_edit_standard_round.xml   |  2 +-
 .../res/layout/fragment_edit_training.xml     |  2 +-
 .../main/res/layout/fragment_environment.xml  |  2 +-
 app/src/main/res/layout/fragment_list.xml     |  2 +-
 .../main/res/layout/fragment_scoreboard.xml   |  2 +-
 .../main/res/layout/fragment_signature.xml    |  2 +-
 .../main/res/layout/fragment_statistics.xml   |  2 +-
 .../res/layout/fragment_target_select.xml     |  2 +-
 app/src/main/res/layout/fragment_timer.xml    |  2 +-
 app/src/main/res/layout/fragment_training.xml |  2 +-
 .../main/res/layout/fragment_trainings.xml    |  2 +-
 app/src/main/res/layout/fragment_web.xml      |  2 +-
 app/src/main/res/layout/item_arrow_number.xml |  2 +-
 .../layout/item_details_secondary_action.xml  |  2 +-
 app/src/main/res/layout/item_distance.xml     |  2 +-
 app/src/main/res/layout/item_donation.xml     |  2 +-
 app/src/main/res/layout/item_end.xml          |  2 +-
 app/src/main/res/layout/item_header.xml       |  2 +-
 .../res/layout/item_header_expandable.xml     |  2 +-
 .../main/res/layout/item_image_details.xml    |  2 +-
 .../main/res/layout/item_image_horizontal.xml | 15 +++++++++++++++
 app/src/main/res/layout/item_image_simple.xml |  2 +-
 app/src/main/res/layout/item_round.xml        |  2 +-
 .../main/res/layout/item_round_template.xml   |  2 +-
 app/src/main/res/layout/item_sight_mark.xml   |  2 +-
 .../main/res/layout/item_standard_round.xml   |  2 +-
 app/src/main/res/layout/item_text.xml         |  2 +-
 app/src/main/res/layout/item_training.xml     |  2 +-
 .../main/res/layout/layout_number_picker.xml  |  2 +-
 .../main/res/layout/layout_switch_label.xml   |  2 +-
 .../res/layout/navigation_drawer_header.xml   |  2 +-
 app/src/main/res/layout/pager_item.xml        | 15 +++++++++++++++
 .../main/res/layout/partial_divider_full.xml  |  2 +-
 .../main/res/layout/partial_empty_state.xml   |  2 +-
 .../layout/partial_scoreboard_signatures.xml  |  2 +-
 .../main/res/layout/partial_target_view.xml   |  2 +-
 .../res/layout/preference_image_details.xml   |  2 +-
 .../res/layout/selector_item_distance.xml     |  2 +-
 .../layout/selector_item_image_details.xml    |  2 +-
 .../main/res/layout/selector_item_process.xml |  2 +-
 .../res/layout/selector_item_simple_text.xml  |  2 +-
 app/src/main/res/layout/view_chips.xml        |  2 +-
 .../main/res/menu/bottom_navigation_main.xml  |  2 +-
 .../res/menu/context_menu_edit_delete.xml     |  2 +-
 app/src/main/res/menu/context_menu_image.xml  |  4 ++--
 app/src/main/res/menu/environment_switch.xml  |  2 +-
 app/src/main/res/menu/export_filter.xml       |  2 +-
 app/src/main/res/menu/fab_bows.xml            |  2 +-
 app/src/main/res/menu/fab_trainings.xml       |  2 +-
 app/src/main/res/menu/gallery.xml             |  2 +-
 app/src/main/res/menu/help.xml                |  2 +-
 app/src/main/res/menu/input_end.xml           |  2 +-
 app/src/main/res/menu/menu_scoreboard.xml     |  2 +-
 .../main/res/menu/navigation_drawer_main.xml  |  2 +-
 app/src/main/res/menu/save.xml                |  4 ++--
 app/src/main/res/menu/search.xml              |  4 ++--
 app/src/main/res/menu/settings_backup.xml     |  2 +-
 app/src/main/res/menu/statistics.xml          |  2 +-
 .../main/res/menu/statistics_scoresheet.xml   |  2 +-
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |  4 ++--
 app/src/main/res/raw-af-rZA/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-ar-rSA/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-ca-rES/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-cs-rCZ/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-da-rDK/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-de-rDE/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-el-rGR/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-es-rES/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-et-rEE/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-fi-rFI/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-fr-rFR/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-hu-rHU/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-in-rID/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-it-rIT/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-iw-rIL/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-ja-rJP/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-ko-rKR/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-nl-rNL/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-no-rNO/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-pl-rPL/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-pt-rBR/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-pt-rPT/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-ro-rRO/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-ru-rRU/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-sk-rSK/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-sl-rSI/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-sr-rSP/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-sv-rSE/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-tr-rTR/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-uk-rUA/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-vi-rVN/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-zh-rCN/help.html         | 15 +++++++++++++++
 app/src/main/res/raw-zh-rTW/help.html         | 15 +++++++++++++++
 app/src/main/res/raw/help.html                | 15 +++++++++++++++
 app/src/main/res/values-af/strings.xml        |  6 ++++--
 app/src/main/res/values-ar/strings.xml        |  6 ++++--
 app/src/main/res/values-ca/strings.xml        |  6 ++++--
 app/src/main/res/values-cs/strings.xml        |  6 ++++--
 app/src/main/res/values-da/strings.xml        |  6 ++++--
 app/src/main/res/values-de/strings.xml        |  6 ++++--
 app/src/main/res/values-el/strings.xml        |  6 ++++--
 app/src/main/res/values-es/strings.xml        |  6 ++++--
 app/src/main/res/values-et/strings.xml        |  6 ++++--
 app/src/main/res/values-fi/strings.xml        |  6 ++++--
 app/src/main/res/values-fr/strings.xml        |  6 ++++--
 app/src/main/res/values-hu/strings.xml        |  6 ++++--
 app/src/main/res/values-in/strings.xml        |  6 ++++--
 app/src/main/res/values-it/strings.xml        |  6 ++++--
 app/src/main/res/values-iw/strings.xml        |  6 ++++--
 app/src/main/res/values-ja/strings.xml        |  6 ++++--
 app/src/main/res/values-ko/strings.xml        |  6 ++++--
 app/src/main/res/values-land/dimens.xml       |  4 ++--
 app/src/main/res/values-nl/strings.xml        |  6 ++++--
 app/src/main/res/values-no/strings.xml        |  6 ++++--
 app/src/main/res/values-pl/strings.xml        |  6 ++++--
 app/src/main/res/values-port-v21/dimens.xml   |  4 ++--
 app/src/main/res/values-pt-rBR/strings.xml    |  6 ++++--
 app/src/main/res/values-pt-rPT/strings.xml    |  6 ++++--
 app/src/main/res/values-ro/strings.xml        |  6 ++++--
 app/src/main/res/values-ru/strings.xml        |  6 ++++--
 app/src/main/res/values-sk/strings.xml        |  6 ++++--
 app/src/main/res/values-sl/strings.xml        |  6 ++++--
 app/src/main/res/values-sr/strings.xml        |  6 ++++--
 app/src/main/res/values-sv/strings.xml        |  6 ++++--
 .../res/values-sw600dp-land-v21/dimens.xml    |  4 ++--
 .../main/res/values-sw600dp-land/dimens.xml   |  4 ++--
 .../res/values-sw600dp-port-v21/dimens.xml    |  4 ++--
 app/src/main/res/values-sw600dp/dimens.xml    |  4 ++--
 app/src/main/res/values-sw720dp/dimens.xml    |  4 ++--
 app/src/main/res/values-tr/strings.xml        |  6 ++++--
 app/src/main/res/values-uk/strings.xml        |  6 ++++--
 app/src/main/res/values-v19/themes.xml        |  2 +-
 app/src/main/res/values-v21/dimens.xml        |  2 +-
 app/src/main/res/values-v21/themes.xml        |  2 +-
 app/src/main/res/values-vi/strings.xml        |  6 ++++--
 app/src/main/res/values-w820dp/dimens.xml     |  2 +-
 app/src/main/res/values-zh-rCN/strings.xml    |  6 ++++--
 app/src/main/res/values-zh-rTW/strings.xml    |  6 ++++--
 app/src/main/res/values/arrays.xml            |  2 +-
 app/src/main/res/values/attrs.xml             |  2 +-
 app/src/main/res/values/bool.xml              |  2 +-
 app/src/main/res/values/colors.xml            |  2 +-
 app/src/main/res/values/constants.xml         |  2 +-
 app/src/main/res/values/dimens.xml            |  2 +-
 app/src/main/res/values/epl.xml               |  2 +-
 app/src/main/res/values/pub_key.xml           |  4 ++--
 app/src/main/res/values/strings.xml           |  2 +-
 app/src/main/res/values/styles.xml            |  2 +-
 app/src/main/res/values/themes.xml            |  2 +-
 app/src/main/res/values/translators.xml       |  2 +-
 app/src/main/res/xml-v25/shortcuts.xml        |  2 +-
 app/src/main/res/xml/authenticator.xml        |  2 +-
 app/src/main/res/xml/my_file_paths.xml        |  2 +-
 app/src/main/res/xml/preferences.xml          |  2 +-
 app/src/main/res/xml/sync_adapter.xml         |  2 +-
 app/src/screengrabDebug/AndroidManifest.xml   |  2 +-
 .../screengrabDebug/res/values/constants.xml  |  2 +-
 build.gradle                                  |  2 +-
 dependencies.gradle                           |  2 +-
 gradle/wrapper/gradle-wrapper.properties      | 15 +++++++++++++++
 settings.gradle                               |  2 +-
 shared/build.gradle                           |  2 +-
 .../mytargets/shared/models/db/ShotTest.java  |  2 +-
 .../shared/targets/models/DAIR3DTest.java     |  2 +-
 .../targets/models/TargetModelBaseTest.java   |  2 +-
 .../shared/targets/models/WAFullTest.java     |  2 +-
 .../targets/models/WAVertical3SpotTest.java   |  4 ++--
 shared/src/main/AndroidManifest.xml           |  2 +-
 .../de/dreier/mytargets/shared/AppDatabase.kt |  2 +-
 .../shared/SharedApplicationInstance.kt       |  2 +-
 .../aggregation/EAggregationStrategy.kt       |  2 +-
 .../aggregation/IAggregationResultRenderer.kt |  2 +-
 .../aggregation/IAggregationStrategy.kt       |  2 +-
 .../analysis/aggregation/NOPResultRenderer.kt |  2 +-
 .../analysis/aggregation/NoneStrategy.kt      |  2 +-
 .../analysis/aggregation/average/Average.kt   |  2 +-
 .../average/AverageResultRenderer.kt          |  2 +-
 .../aggregation/average/AverageStrategy.kt    |  2 +-
 .../cluster/AggregationStrategyBase.kt        |  2 +-
 .../analysis/aggregation/cluster/Cluster.kt   |  2 +-
 .../cluster/ClusterResultRenderer.kt          |  2 +-
 .../aggregation/cluster/ClusterStrategy.kt    |  2 +-
 .../shared/base/fragment/ETimerState.kt       |  2 +-
 .../shared/base/fragment/TimerFragmentBase.kt |  2 +-
 .../mytargets/shared/migration/Migration9.kt  |  2 +-
 .../mytargets/shared/models/Diameter.kt       |  2 +-
 .../mytargets/shared/models/Dimension.kt      |  2 +-
 .../mytargets/shared/models/EBowType.kt       |  2 +-
 .../mytargets/shared/models/ETargetType.kt    |  2 +-
 .../mytargets/shared/models/EWeather.kt       |  2 +-
 .../mytargets/shared/models/Environment.kt    |  2 +-
 .../mytargets/shared/models/IIdProvider.kt    |  2 +-
 .../mytargets/shared/models/IIdSettable.kt    |  2 +-
 .../dreier/mytargets/shared/models/Score.kt   |  2 +-
 .../mytargets/shared/models/SelectableZone.kt |  2 +-
 .../dreier/mytargets/shared/models/Target.kt  |  2 +-
 .../mytargets/shared/models/Thumbnail.kt      |  2 +-
 .../mytargets/shared/models/TimerSettings.kt  |  2 +-
 .../mytargets/shared/models/TrainingInfo.kt   |  2 +-
 .../mytargets/shared/models/WindDirection.kt  |  2 +-
 .../mytargets/shared/models/WindSpeed.kt      |  2 +-
 .../shared/models/augmented/AugmentedEnd.kt   |  2 +-
 .../shared/models/augmented/AugmentedRound.kt |  2 +-
 .../models/augmented/AugmentedTraining.kt     |  2 +-
 .../mytargets/shared/models/dao/ArrowDAO.kt   |  2 +-
 .../mytargets/shared/models/db/Arrow.kt       |  2 +-
 .../mytargets/shared/models/db/ArrowImage.kt  |  2 +-
 .../dreier/mytargets/shared/models/db/Bow.kt  |  2 +-
 .../mytargets/shared/models/db/BowImage.kt    |  2 +-
 .../dreier/mytargets/shared/models/db/End.kt  |  2 +-
 .../mytargets/shared/models/db/EndImage.kt    |  2 +-
 .../mytargets/shared/models/db/Image.kt       |  2 +-
 .../mytargets/shared/models/db/Round.kt       |  2 +-
 .../shared/models/db/RoundTemplate.kt         |  2 +-
 .../dreier/mytargets/shared/models/db/Shot.kt |  2 +-
 .../mytargets/shared/models/db/SightMark.kt   |  2 +-
 .../mytargets/shared/models/db/Signature.kt   |  2 +-
 .../shared/models/db/StandardRound.kt         |  2 +-
 .../mytargets/shared/models/db/Training.kt    |  2 +-
 .../mytargets/shared/targets/Target3DBase.kt  |  2 +-
 .../mytargets/shared/targets/TargetFactory.kt |  2 +-
 .../shared/targets/TargetOvalBase.kt          |  2 +-
 .../targets/decoration/BeursaultDecorator.kt  |  2 +-
 .../targets/decoration/CenterMarkDecorator.kt |  2 +-
 .../targets/decoration/TargetDecorator.kt     |  2 +-
 .../shared/targets/drawable/CanvasWrapper.kt  |  2 +-
 .../shared/targets/drawable/CombinedSpot.kt   |  2 +-
 .../shared/targets/drawable/TargetDrawable.kt |  2 +-
 .../TargetImpactAggregationDrawable.kt        |  2 +-
 .../targets/drawable/TargetImpactDrawable.kt  |  2 +-
 .../mytargets/shared/targets/models/ASA3D.kt  |  2 +-
 .../shared/targets/models/ASA3D14.kt          |  2 +-
 .../shared/targets/models/Beursault.kt        |  2 +-
 .../mytargets/shared/targets/models/DAIR3D.kt |  2 +-
 .../shared/targets/models/DBSCBlowpipe.kt     |  2 +-
 .../shared/targets/models/HitOrMiss.kt        |  2 +-
 .../mytargets/shared/targets/models/IBO3D.kt  |  2 +-
 .../shared/targets/models/IFAAAnimal.kt       |  2 +-
 .../shared/targets/models/NFAAAnimal.kt       |  2 +-
 .../shared/targets/models/NFAAExpertField.kt  |  2 +-
 .../shared/targets/models/NFAAField.kt        |  2 +-
 .../shared/targets/models/NFAAHunter.kt       |  2 +-
 .../shared/targets/models/NFAAIndoor.kt       |  2 +-
 .../shared/targets/models/NFAAIndoor5Spot.kt  |  2 +-
 .../mytargets/shared/targets/models/NFAS3D.kt |  2 +-
 .../shared/targets/models/NFASField.kt        |  2 +-
 .../shared/targets/models/SCAPeriod.kt        |  2 +-
 .../shared/targets/models/TargetModelBase.kt  |  2 +-
 .../shared/targets/models/WA3Ring.kt          |  2 +-
 .../shared/targets/models/WA3Ring3Spot.kt     |  2 +-
 .../shared/targets/models/WA5Ring.kt          |  2 +-
 .../shared/targets/models/WA6Ring.kt          |  2 +-
 .../shared/targets/models/WADanage3Spot.kt    |  2 +-
 .../shared/targets/models/WADanage6Spot.kt    |  2 +-
 .../shared/targets/models/WAField.kt          |  2 +-
 .../shared/targets/models/WAField3Spot.kt     |  2 +-
 .../mytargets/shared/targets/models/WAFull.kt |  2 +-
 .../shared/targets/models/WAVegas3Spot.kt     |  2 +-
 .../shared/targets/models/WAVertical3Spot.kt  |  2 +-
 .../shared/targets/models/Worcester.kt        |  2 +-
 .../scoringstyle/ArrowAwareScoringStyle.kt    |  2 +-
 .../targets/scoringstyle/ColorScoringStyle.kt |  2 +-
 .../targets/scoringstyle/ScoringStyle.kt      |  2 +-
 .../shared/targets/zone/CircularZone.kt       |  2 +-
 .../shared/targets/zone/EllipseZone.kt        |  2 +-
 .../shared/targets/zone/HeartZone.kt          |  2 +-
 .../mytargets/shared/targets/zone/ZoneBase.kt |  2 +-
 .../shared/utils/BitmapParcelUtils.kt         |  2 +-
 .../mytargets/shared/utils/BitmapUtils.kt     |  2 +-
 .../dreier/mytargets/shared/utils/Circle.kt   |  2 +-
 .../mytargets/shared/utils/CircleDrawable.kt  |  2 +-
 .../de/dreier/mytargets/shared/utils/Color.kt |  2 +-
 .../mytargets/shared/utils/EndRenderer.kt     |  2 +-
 .../mytargets/shared/utils/FileUtils.kt       |  2 +-
 .../mytargets/shared/utils/ImageList.kt       |  2 +-
 .../shared/utils/LongSparseArrayUtils.kt      |  2 +-
 .../mytargets/shared/utils/MatrixEvaluator.kt |  2 +-
 .../mytargets/shared/utils/ParcelableUtil.kt  |  2 +-
 .../mytargets/shared/utils/RectUtils.kt       |  2 +-
 .../mytargets/shared/utils/RegionUtils.kt     |  2 +-
 .../shared/utils/RoundedAvatarDrawable.kt     |  2 +-
 .../shared/utils/StandardRoundFactory.kt      |  2 +-
 .../utils/typeconverters/BitmapConverter.kt   |  2 +-
 .../typeconverters/DimensionConverter.kt      |  2 +-
 .../utils/typeconverters/EBowTypeConverter.kt |  2 +-
 .../utils/typeconverters/EWeatherConverter.kt |  2 +-
 .../typeconverters/LocalDateConverter.kt      |  2 +-
 .../typeconverters/LocalTimeConverter.kt      |  2 +-
 .../typeconverters/ThumbnailConverter.kt      |  2 +-
 .../dreier/mytargets/shared/views/EndView.kt  |  2 +-
 .../mytargets/shared/views/TargetViewBase.kt  |  2 +-
 .../shared/wearable/WearableClientBase.kt     |  2 +-
 .../ic_arrow_bottom_left_black_24dp.xml       |  2 +-
 .../ic_arrow_bottom_right_black_24dp.xml      |  2 +-
 .../drawable/ic_arrow_downward_black_24dp.xml |  2 +-
 .../res/drawable/ic_arrow_left_black_24dp.xml |  2 +-
 .../drawable/ic_arrow_right_black_24px.xml    |  2 +-
 .../drawable/ic_arrow_up_left_black_24dp.xml  |  2 +-
 .../drawable/ic_arrow_up_right_black_24dp.xml |  2 +-
 .../drawable/ic_arrow_upward_black_24dp.xml   |  2 +-
 .../drawable/ic_backspace_grey600_24dp.xml    |  2 +-
 .../main/res/drawable/ic_bft_0_black_24dp.xml |  2 +-
 .../main/res/drawable/ic_bft_1_black_24dp.xml |  2 +-
 .../main/res/drawable/ic_bft_2_black_24dp.xml |  2 +-
 .../main/res/drawable/ic_bft_3_black_24dp.xml |  2 +-
 .../main/res/drawable/ic_bft_4_black_24dp.xml |  2 +-
 .../main/res/drawable/ic_bft_5_black_24dp.xml |  2 +-
 .../main/res/drawable/ic_bft_6_black_24dp.xml |  2 +-
 .../main/res/drawable/ic_bft_7_black_24dp.xml |  2 +-
 .../main/res/drawable/ic_bft_8_black_24dp.xml |  2 +-
 .../main/res/drawable/ic_bft_9_black_24dp.xml |  2 +-
 .../res/drawable/ic_bow_bare_white_24dp.xml   |  2 +-
 .../drawable/ic_bow_compound_white_24dp.xml   |  2 +-
 .../res/drawable/ic_bow_horse_white_24dp.xml  |  2 +-
 .../res/drawable/ic_bow_long_white_24dp.xml   |  2 +-
 .../drawable/ic_bow_recurve_white_24dp.xml    |  2 +-
 .../res/drawable/ic_bow_yumi_white_24dp.xml   |  2 +-
 .../src/main/res/drawable/ic_cloudy_48dp.xml  |  2 +-
 .../res/drawable/ic_cloudy_outline_48dp.xml   |  2 +-
 .../drawable/ic_cloudy_outline_color_48dp.xml |  2 +-
 .../ic_compat_bow_bare_white_24dp.xml         |  2 +-
 .../ic_compat_bow_compound_white_24dp.xml     |  2 +-
 .../ic_compat_bow_horse_white_24dp.xml        |  2 +-
 .../ic_compat_bow_long_white_24dp.xml         |  2 +-
 .../ic_compat_bow_recurve_white_24dp.xml      |  2 +-
 .../ic_compat_bow_yumi_white_24dp.xml         |  2 +-
 .../main/res/drawable/ic_light_rain_48dp.xml  |  2 +-
 .../drawable/ic_light_rain_outline_48dp.xml   |  2 +-
 .../ic_light_rain_outline_color_48dp.xml      |  2 +-
 .../res/drawable/ic_partly_cloudy_48dp.xml    |  2 +-
 .../ic_partly_cloudy_outline_48dp.xml         |  2 +-
 .../ic_partly_cloudy_outline_color_48dp.xml   |  2 +-
 shared/src/main/res/drawable/ic_rain_48dp.xml |  2 +-
 .../res/drawable/ic_rain_outline_48dp.xml     |  2 +-
 .../drawable/ic_rain_outline_color_48dp.xml   |  2 +-
 shared/src/main/res/drawable/ic_sun_48dp.xml  |  2 +-
 .../main/res/drawable/ic_sun_outline_48dp.xml |  2 +-
 .../drawable/ic_sun_outline_color_48dp.xml    |  2 +-
 shared/src/main/res/values-af/rounds.xml      |  6 ++++--
 shared/src/main/res/values-af/strings.xml     |  6 ++++--
 .../src/main/res/values-af/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-ar/rounds.xml      |  6 ++++--
 shared/src/main/res/values-ar/strings.xml     |  6 ++++--
 .../src/main/res/values-ar/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-ca/rounds.xml      |  6 ++++--
 shared/src/main/res/values-ca/strings.xml     |  6 ++++--
 .../src/main/res/values-ca/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-cs/rounds.xml      |  6 ++++--
 shared/src/main/res/values-cs/strings.xml     |  6 ++++--
 .../src/main/res/values-cs/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-da/rounds.xml      |  6 ++++--
 shared/src/main/res/values-da/strings.xml     |  6 ++++--
 .../src/main/res/values-da/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-de/rounds.xml      |  6 ++++--
 shared/src/main/res/values-de/strings.xml     |  6 ++++--
 .../src/main/res/values-de/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-el/rounds.xml      |  6 ++++--
 shared/src/main/res/values-el/strings.xml     |  6 ++++--
 .../src/main/res/values-el/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-es/rounds.xml      |  6 ++++--
 shared/src/main/res/values-es/strings.xml     |  6 ++++--
 .../src/main/res/values-es/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-et/rounds.xml      |  6 ++++--
 shared/src/main/res/values-et/strings.xml     |  6 ++++--
 .../src/main/res/values-et/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-fi/rounds.xml      |  6 ++++--
 shared/src/main/res/values-fi/strings.xml     |  6 ++++--
 .../src/main/res/values-fi/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-fr/rounds.xml      |  6 ++++--
 shared/src/main/res/values-fr/strings.xml     |  6 ++++--
 .../src/main/res/values-fr/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-hu/rounds.xml      |  6 ++++--
 shared/src/main/res/values-hu/strings.xml     |  6 ++++--
 .../src/main/res/values-hu/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-in/rounds.xml      |  6 ++++--
 shared/src/main/res/values-in/strings.xml     |  6 ++++--
 .../src/main/res/values-in/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-it/rounds.xml      |  6 ++++--
 shared/src/main/res/values-it/strings.xml     |  6 ++++--
 .../src/main/res/values-it/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-iw/rounds.xml      |  6 ++++--
 shared/src/main/res/values-iw/strings.xml     |  6 ++++--
 .../src/main/res/values-iw/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-ja/rounds.xml      |  6 ++++--
 shared/src/main/res/values-ja/strings.xml     |  6 ++++--
 .../src/main/res/values-ja/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-ko/rounds.xml      |  6 ++++--
 shared/src/main/res/values-ko/strings.xml     |  6 ++++--
 .../src/main/res/values-ko/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-nl/rounds.xml      |  6 ++++--
 shared/src/main/res/values-nl/strings.xml     |  6 ++++--
 .../src/main/res/values-nl/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-no/rounds.xml      |  6 ++++--
 shared/src/main/res/values-no/strings.xml     |  6 ++++--
 .../src/main/res/values-no/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-pl/rounds.xml      |  6 ++++--
 shared/src/main/res/values-pl/strings.xml     |  6 ++++--
 .../src/main/res/values-pl/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-pt-rBR/rounds.xml  |  6 ++++--
 shared/src/main/res/values-pt-rBR/strings.xml |  6 ++++--
 .../main/res/values-pt-rBR/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-pt-rPT/rounds.xml  |  6 ++++--
 shared/src/main/res/values-pt-rPT/strings.xml |  6 ++++--
 .../main/res/values-pt-rPT/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-ro/rounds.xml      |  6 ++++--
 shared/src/main/res/values-ro/strings.xml     |  6 ++++--
 .../src/main/res/values-ro/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-ru/rounds.xml      |  6 ++++--
 shared/src/main/res/values-ru/strings.xml     |  6 ++++--
 .../src/main/res/values-ru/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-sk/rounds.xml      |  6 ++++--
 shared/src/main/res/values-sk/strings.xml     |  6 ++++--
 .../src/main/res/values-sk/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-sl/rounds.xml      |  6 ++++--
 shared/src/main/res/values-sl/strings.xml     |  6 ++++--
 .../src/main/res/values-sl/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-sr/rounds.xml      |  6 ++++--
 shared/src/main/res/values-sr/strings.xml     |  6 ++++--
 .../src/main/res/values-sr/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-sv/rounds.xml      |  6 ++++--
 shared/src/main/res/values-sv/strings.xml     |  6 ++++--
 .../src/main/res/values-sv/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-tr/rounds.xml      |  6 ++++--
 shared/src/main/res/values-tr/strings.xml     |  6 ++++--
 .../src/main/res/values-tr/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-uk/rounds.xml      |  6 ++++--
 shared/src/main/res/values-uk/strings.xml     |  6 ++++--
 .../src/main/res/values-uk/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-vi/rounds.xml      |  6 ++++--
 shared/src/main/res/values-vi/strings.xml     |  6 ++++--
 .../src/main/res/values-vi/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-zh-rCN/rounds.xml  |  6 ++++--
 shared/src/main/res/values-zh-rCN/strings.xml |  6 ++++--
 .../main/res/values-zh-rCN/target_faces.xml   |  6 ++++--
 shared/src/main/res/values-zh-rTW/rounds.xml  |  6 ++++--
 shared/src/main/res/values-zh-rTW/strings.xml |  6 ++++--
 .../main/res/values-zh-rTW/target_faces.xml   |  6 ++++--
 shared/src/main/res/values/colors.xml         |  4 ++--
 .../res/values/material_design_colors.xml     |  2 +-
 shared/src/main/res/values/rounds.xml         |  4 ++--
 shared/src/main/res/values/strings.xml        |  2 +-
 shared/src/main/res/values/target_faces.xml   |  4 ++--
 .../mytargets/shared/models/ScoreTest.kt      |  2 +-
 .../mytargets/shared/utils/ImageListTest.kt   |  2 +-
 tools/script-codacy.gradle                    |  2 +-
 tools/script-crowdin.gradle                   |  2 +-
 tools/script-dependency-updates.gradle        |  2 +-
 tools/script-git-version.gradle               |  2 +-
 tools/script-keystore-fallback.gradle         |  2 +-
 tools/script-play-store.gradle                |  2 +-
 wearable/build.gradle                         |  2 +-
 wearable/src/main/AndroidManifest.xml         |  4 ++--
 .../dreier/mytargets/ApplicationInstance.kt   |  2 +-
 .../java/de/dreier/mytargets/InputActivity.kt |  2 +-
 .../java/de/dreier/mytargets/MainActivity.kt  |  2 +-
 .../java/de/dreier/mytargets/RoundActivity.kt |  2 +-
 .../de/dreier/mytargets/TargetSelectView.kt   |  2 +-
 .../java/de/dreier/mytargets/TimerActivity.kt |  2 +-
 .../dreier/mytargets/WearWearableListener.kt  |  2 +-
 .../mytargets/utils/WearSettingsManager.kt    |  2 +-
 .../mytargets/utils/WearWearableClient.kt     |  2 +-
 .../main/res/drawable/ic_add_white_24dp.xml   | 15 +++++++++++++++
 .../main/res/drawable/ic_close_white_18dp.xml |  2 +-
 .../res/drawable/ic_more_vert_white_24dp.xml  | 15 +++++++++++++++
 .../res/drawable/ic_play_arrow_white_48dp.xml | 15 +++++++++++++++
 .../main/res/drawable/ic_stop_white_24dp.xml  |  2 +-
 .../res/drawable/ic_timer_off_white_24dp.xml  |  2 +-
 .../res/drawable/ic_traffic_white_24dp.xml    | 15 +++++++++++++++
 .../drawable/ic_vibration_off_white_24dp.xml  |  2 +-
 .../res/drawable/ic_vibration_white_24dp.xml  |  2 +-
 .../res/drawable/ic_volume_off_white_24dp.xml |  2 +-
 .../res/drawable/ic_volume_up_white_24dp.xml  |  2 +-
 .../main/res/drawable/shape_round_active.xml  |  2 +-
 .../src/main/res/layout/activity_input.xml    |  2 +-
 .../src/main/res/layout/activity_main.xml     |  2 +-
 .../src/main/res/layout/activity_round.xml    |  2 +-
 .../src/main/res/layout/activity_timer.xml    |  2 +-
 .../src/main/res/layout/fragment_timer.xml    |  2 +-
 wearable/src/main/res/layout/item_end.xml     |  2 +-
 .../main/res/layout/item_inline_button.xml    |  2 +-
 wearable/src/main/res/layout/layout_clock.xml |  2 +-
 .../res/menu/timer_action_drawer_menu.xml     |  2 +-
 wearable/src/main/res/values-af/strings.xml   |  6 ++++--
 wearable/src/main/res/values-ar/strings.xml   |  6 ++++--
 wearable/src/main/res/values-ca/strings.xml   |  6 ++++--
 wearable/src/main/res/values-cs/strings.xml   |  6 ++++--
 wearable/src/main/res/values-da/strings.xml   |  6 ++++--
 wearable/src/main/res/values-de/strings.xml   |  6 ++++--
 wearable/src/main/res/values-el/strings.xml   |  6 ++++--
 wearable/src/main/res/values-es/strings.xml   |  6 ++++--
 wearable/src/main/res/values-et/strings.xml   |  6 ++++--
 wearable/src/main/res/values-fi/strings.xml   |  6 ++++--
 wearable/src/main/res/values-fr/strings.xml   |  6 ++++--
 wearable/src/main/res/values-hu/strings.xml   |  6 ++++--
 wearable/src/main/res/values-in/strings.xml   |  6 ++++--
 wearable/src/main/res/values-it/strings.xml   |  6 ++++--
 wearable/src/main/res/values-iw/strings.xml   |  6 ++++--
 wearable/src/main/res/values-ja/strings.xml   |  6 ++++--
 wearable/src/main/res/values-ko/strings.xml   |  6 ++++--
 wearable/src/main/res/values-nl/strings.xml   |  6 ++++--
 wearable/src/main/res/values-no/strings.xml   |  6 ++++--
 wearable/src/main/res/values-pl/strings.xml   |  6 ++++--
 .../src/main/res/values-pt-rBR/strings.xml    |  6 ++++--
 .../src/main/res/values-pt-rPT/strings.xml    |  6 ++++--
 wearable/src/main/res/values-ro/strings.xml   |  6 ++++--
 wearable/src/main/res/values-ru/strings.xml   |  6 ++++--
 wearable/src/main/res/values-sk/strings.xml   |  6 ++++--
 wearable/src/main/res/values-sl/strings.xml   |  6 ++++--
 wearable/src/main/res/values-sr/strings.xml   |  6 ++++--
 wearable/src/main/res/values-sv/strings.xml   |  6 ++++--
 .../main/res/values-sw210dp-round/dimens.xml  |  4 ++--
 wearable/src/main/res/values-tr/strings.xml   |  6 ++++--
 wearable/src/main/res/values-uk/strings.xml   |  6 ++++--
 wearable/src/main/res/values-vi/strings.xml   |  6 ++++--
 .../src/main/res/values-zh-rCN/strings.xml    |  6 ++++--
 .../src/main/res/values-zh-rTW/strings.xml    |  6 ++++--
 wearable/src/main/res/values/colors.xml       | 17 ++++++++++++++++-
 wearable/src/main/res/values/dimens.xml       |  2 +-
 wearable/src/main/res/values/strings.xml      |  2 +-
 965 files changed, 2243 insertions(+), 1135 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 880248496..7350aeaa5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/AndroidManifest.xml b/app/src/androidTest/AndroidManifest.xml
index a86274de3..feb331083 100644
--- a/app/src/androidTest/AndroidManifest.xml
+++ b/app/src/androidTest/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
index f266d20a4..9603568a2 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/arrow/ArrowSelectorTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/arrow/ArrowSelectorTest.kt
index d0f9f1a6b..6b613acc1 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/arrow/ArrowSelectorTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/arrow/ArrowSelectorTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/arrow/EditArrowTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/arrow/EditArrowTest.kt
index 5b2226e1b..0a161e69d 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/arrow/EditArrowTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/arrow/EditArrowTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/bow/BowSelectorTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/bow/BowSelectorTest.kt
index bba33464e..06a8f67c1 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/bow/BowSelectorTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/bow/BowSelectorTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/bow/EditSightMarksTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/bow/EditSightMarksTest.kt
index b46a716b4..010ba7b01 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/bow/EditSightMarksTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/bow/EditSightMarksTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/main/IntroActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/main/IntroActivityTest.kt
index 03badad41..99eb1849a 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/main/IntroActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/main/IntroActivityTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
index ee511fd8d..1dc6d4659 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/settings/SettingsActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/settings/SettingsActivityTest.kt
index 02b67f40b..4b1ea177d 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/settings/SettingsActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/settings/SettingsActivityTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/settings/SettingsManagerTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/settings/SettingsManagerTest.kt
index dc356af74..df9f09f59 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/settings/SettingsManagerTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/settings/SettingsManagerTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt
index 788ed3f80..36c15bb46 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt
index 1076f86f4..8bfe1a60b 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/DeleteTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/DeleteTest.kt
index a94bfe3fd..52ed1f7e3 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/DeleteTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/DeleteTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/EditTrainingActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/EditTrainingActivityTest.kt
index 9c68cdf0e..3185baf0d 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/EditTrainingActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/EditTrainingActivityTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt
index de727a7f6..df17188af 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/TrainingActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/TrainingActivityTest.kt
index c92c41d47..0b4346efe 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/TrainingActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/TrainingActivityTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt
index 868785fb0..1890fa072 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundActivityTest.kt
index accfd95ee..6c876a73c 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundActivityTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt
index ab212b9a8..66cf6a6c5 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/base/InstrumentedTestBase.kt b/app/src/androidTest/java/de/dreier/mytargets/test/base/InstrumentedTestBase.kt
index bfa6fb065..12f457e25 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/base/InstrumentedTestBase.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/base/InstrumentedTestBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/base/UITestBase.kt b/app/src/androidTest/java/de/dreier/mytargets/test/base/UITestBase.kt
index bb294fe16..16984005d 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/base/UITestBase.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/base/UITestBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/ImageCaptureStubbingUtils.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/ImageCaptureStubbingUtils.kt
index 6b8a76e62..e23ba7576 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/ImageCaptureStubbingUtils.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/ImageCaptureStubbingUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/PermissionGranter.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/PermissionGranter.kt
index 9eeae1378..b15e55905 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/PermissionGranter.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/PermissionGranter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/LowLevelActions.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/LowLevelActions.kt
index 515c796e8..a70b53287 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/LowLevelActions.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/LowLevelActions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/NestedScrollToAction.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/NestedScrollToAction.kt
index 318421325..cb1a3fe0e 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/NestedScrollToAction.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/NestedScrollToAction.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/TargetViewActions.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/TargetViewActions.kt
index f8404c4b1..b4775d479 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/TargetViewActions.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/TargetViewActions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/assertions/RecyclerViewAssertions.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/assertions/RecyclerViewAssertions.kt
index 5dd2650bc..63f8f2454 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/assertions/RecyclerViewAssertions.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/assertions/RecyclerViewAssertions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/assertions/TargetViewAssertions.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/assertions/TargetViewAssertions.kt
index 1a0c36fa8..e63cfdcb4 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/assertions/TargetViewAssertions.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/assertions/TargetViewAssertions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/IntentMatcher.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/IntentMatcher.kt
index 515e06aca..35677e2f9 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/IntentMatcher.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/IntentMatcher.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/MatcherUtils.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/MatcherUtils.kt
index ce45ab138..43289c625 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/MatcherUtils.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/MatcherUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/ParentViewMatcher.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/ParentViewMatcher.kt
index 77bafacb6..ac369927a 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/ParentViewMatcher.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/ParentViewMatcher.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/RecyclerViewMatcher.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/RecyclerViewMatcher.kt
index c7605175e..416d28d73 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/RecyclerViewMatcher.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/RecyclerViewMatcher.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/ViewMatcher.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/ViewMatcher.kt
index bb2508842..50076108a 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/ViewMatcher.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/matchers/ViewMatcher.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
index 7076894f3..596b5624d 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/EmptyDbTestRule.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/EmptyDbTestRule.kt
index b791358df..de3f9bdf1 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/EmptyDbTestRule.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/EmptyDbTestRule.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
index af0bb25d8..f9fb345b7 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
index be13a19b0..06f9d2cb7 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/debug/res/values/constants.xml b/app/src/debug/res/values/constants.xml
index 3927b6087..024d05f71 100644
--- a/app/src/debug/res/values/constants.xml
+++ b/app/src/debug/res/values/constants.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 05cb83660..75939bec0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/arrow/ic_arrow_diameter_grey600_24dp.svg b/app/src/main/art/arrow/ic_arrow_diameter_grey600_24dp.svg
index 08a3016e8..c4d9cddc0 100644
--- a/app/src/main/art/arrow/ic_arrow_diameter_grey600_24dp.svg
+++ b/app/src/main/art/arrow/ic_arrow_diameter_grey600_24dp.svg
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -15,4 +15,4 @@
 
 <svg xmlns="http://www.w3.org/2000/svg"  version="1.1" x="0px" y="0px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
 <path fill="#757575" d="M30,1.916L28.085,0l-6.24,6.239C19.956,4.762,17.584,3.873,15,3.873c-6.146,0-11.127,4.982-11.127,11.128  c0,2.584,0.889,4.956,2.366,6.845L0,28.086l1.916,1.916l6.239-6.24c1.889,1.478,4.261,2.367,6.845,2.367  c6.146,0,11.128-4.982,11.128-11.128c0-2.585-0.89-4.957-2.367-6.846L30,1.916z M6.84,15.001c0-4.5,3.661-8.16,8.16-8.16  c1.762,0,3.39,0.566,4.725,1.519L8.359,19.726C7.406,18.391,6.84,16.763,6.84,15.001z M23.16,15.001c0,4.5-3.66,8.16-8.16,8.16  c-1.761,0-3.39-0.567-4.725-1.52L21.64,10.275C22.593,11.611,23.16,13.239,23.16,15.001z" />
-</svg>
\ No newline at end of file
+</svg>
diff --git a/app/src/main/art/arrow/ic_arrow_length_grey600_24dp.svg b/app/src/main/art/arrow/ic_arrow_length_grey600_24dp.svg
index 147d46938..e4690a853 100644
--- a/app/src/main/art/arrow/ic_arrow_length_grey600_24dp.svg
+++ b/app/src/main/art/arrow/ic_arrow_length_grey600_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/arrow/ic_arrow_material_grey600_24dp.svg b/app/src/main/art/arrow/ic_arrow_material_grey600_24dp.svg
index af783ebb3..268e08a4e 100644
--- a/app/src/main/art/arrow/ic_arrow_material_grey600_24dp.svg
+++ b/app/src/main/art/arrow/ic_arrow_material_grey600_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/arrow/ic_arrow_nock_grey600_24dp.svg b/app/src/main/art/arrow/ic_arrow_nock_grey600_24dp.svg
index 2b5278a8e..3d0bb2069 100644
--- a/app/src/main/art/arrow/ic_arrow_nock_grey600_24dp.svg
+++ b/app/src/main/art/arrow/ic_arrow_nock_grey600_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/arrow/ic_arrow_spine_grey600_24dp.svg b/app/src/main/art/arrow/ic_arrow_spine_grey600_24dp.svg
index a3e6d10c6..f1a1a8f26 100644
--- a/app/src/main/art/arrow/ic_arrow_spine_grey600_24dp.svg
+++ b/app/src/main/art/arrow/ic_arrow_spine_grey600_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/arrow/ic_arrow_tip_weight_grey600_24dp.svg b/app/src/main/art/arrow/ic_arrow_tip_weight_grey600_24dp.svg
index 763c7fe1c..f66cbae3e 100644
--- a/app/src/main/art/arrow/ic_arrow_tip_weight_grey600_24dp.svg
+++ b/app/src/main/art/arrow/ic_arrow_tip_weight_grey600_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/arrow/ic_arrow_vanes_grey600_24dp.svg b/app/src/main/art/arrow/ic_arrow_vanes_grey600_24dp.svg
index 5427b6a94..7d3365e4d 100644
--- a/app/src/main/art/arrow/ic_arrow_vanes_grey600_24dp.svg
+++ b/app/src/main/art/arrow/ic_arrow_vanes_grey600_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/arrow/ic_arrow_weight_grey600_24dp.svg b/app/src/main/art/arrow/ic_arrow_weight_grey600_24dp.svg
index cae62981d..3a7dd5768 100644
--- a/app/src/main/art/arrow/ic_arrow_weight_grey600_24dp.svg
+++ b/app/src/main/art/arrow/ic_arrow_weight_grey600_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/bow/ic_bow_bare_black_24dp.svg b/app/src/main/art/bow/ic_bow_bare_black_24dp.svg
index c715198dc..b07061ba9 100644
--- a/app/src/main/art/bow/ic_bow_bare_black_24dp.svg
+++ b/app/src/main/art/bow/ic_bow_bare_black_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/bow/ic_bow_brace_height_grey600_24dp.svg b/app/src/main/art/bow/ic_bow_brace_height_grey600_24dp.svg
index 423489801..58ab4b895 100644
--- a/app/src/main/art/bow/ic_bow_brace_height_grey600_24dp.svg
+++ b/app/src/main/art/bow/ic_bow_brace_height_grey600_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/bow/ic_bow_button_grey600_24dp.svg b/app/src/main/art/bow/ic_bow_button_grey600_24dp.svg
index b8ea90334..c72d799c8 100644
--- a/app/src/main/art/bow/ic_bow_button_grey600_24dp.svg
+++ b/app/src/main/art/bow/ic_bow_button_grey600_24dp.svg
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/bow/ic_bow_cam_grey600_24dp.svg b/app/src/main/art/bow/ic_bow_cam_grey600_24dp.svg
index e1fe2cf78..482ea90cd 100644
--- a/app/src/main/art/bow/ic_bow_cam_grey600_24dp.svg
+++ b/app/src/main/art/bow/ic_bow_cam_grey600_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/bow/ic_bow_clicker_grey600_24dp.svg b/app/src/main/art/bow/ic_bow_clicker_grey600_24dp.svg
index 475310afc..569c8b624 100644
--- a/app/src/main/art/bow/ic_bow_clicker_grey600_24dp.svg
+++ b/app/src/main/art/bow/ic_bow_clicker_grey600_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/bow/ic_bow_compound_black_24dp.svg b/app/src/main/art/bow/ic_bow_compound_black_24dp.svg
index d97c53fdf..677f282b0 100644
--- a/app/src/main/art/bow/ic_bow_compound_black_24dp.svg
+++ b/app/src/main/art/bow/ic_bow_compound_black_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/bow/ic_bow_horse_black_24dp.svg b/app/src/main/art/bow/ic_bow_horse_black_24dp.svg
index fdd99a5d5..f91edb085 100644
--- a/app/src/main/art/bow/ic_bow_horse_black_24dp.svg
+++ b/app/src/main/art/bow/ic_bow_horse_black_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/bow/ic_bow_limb_grey600_24dp.svg b/app/src/main/art/bow/ic_bow_limb_grey600_24dp.svg
index a847f6303..76790fa1a 100644
--- a/app/src/main/art/bow/ic_bow_limb_grey600_24dp.svg
+++ b/app/src/main/art/bow/ic_bow_limb_grey600_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/bow/ic_bow_long_black_24dp.svg b/app/src/main/art/bow/ic_bow_long_black_24dp.svg
index 9a87a89ee..d76b39ac1 100644
--- a/app/src/main/art/bow/ic_bow_long_black_24dp.svg
+++ b/app/src/main/art/bow/ic_bow_long_black_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/bow/ic_bow_nocking_point_grey600_24dp.svg b/app/src/main/art/bow/ic_bow_nocking_point_grey600_24dp.svg
index 713d38aa5..7b7437145 100644
--- a/app/src/main/art/bow/ic_bow_nocking_point_grey600_24dp.svg
+++ b/app/src/main/art/bow/ic_bow_nocking_point_grey600_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/bow/ic_bow_recurve_black_24dp.svg b/app/src/main/art/bow/ic_bow_recurve_black_24dp.svg
index c03e7a338..76e7589f0 100644
--- a/app/src/main/art/bow/ic_bow_recurve_black_24dp.svg
+++ b/app/src/main/art/bow/ic_bow_recurve_black_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/bow/ic_bow_rest_grey600_24dp.svg b/app/src/main/art/bow/ic_bow_rest_grey600_24dp.svg
index f60663726..77cffbcc8 100644
--- a/app/src/main/art/bow/ic_bow_rest_grey600_24dp.svg
+++ b/app/src/main/art/bow/ic_bow_rest_grey600_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/bow/ic_bow_stabilizer_grey600_24dp.svg b/app/src/main/art/bow/ic_bow_stabilizer_grey600_24dp.svg
index 429dc4d5e..c30b17fd4 100644
--- a/app/src/main/art/bow/ic_bow_stabilizer_grey600_24dp.svg
+++ b/app/src/main/art/bow/ic_bow_stabilizer_grey600_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/bow/ic_bow_string_grey600_24dp.svg b/app/src/main/art/bow/ic_bow_string_grey600_24dp.svg
index f09a2daca..594252999 100644
--- a/app/src/main/art/bow/ic_bow_string_grey600_24dp.svg
+++ b/app/src/main/art/bow/ic_bow_string_grey600_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/bow/ic_bow_tiller_grey600_24dp.svg b/app/src/main/art/bow/ic_bow_tiller_grey600_24dp.svg
index 7fe444d6f..23d48bdea 100644
--- a/app/src/main/art/bow/ic_bow_tiller_grey600_24dp.svg
+++ b/app/src/main/art/bow/ic_bow_tiller_grey600_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/bow/ic_bow_yumi_black_24dp.svg b/app/src/main/art/bow/ic_bow_yumi_black_24dp.svg
index 0b31b476b..55b5ff98f 100644
--- a/app/src/main/art/bow/ic_bow_yumi_black_24dp.svg
+++ b/app/src/main/art/bow/ic_bow_yumi_black_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/intro/screen_1_image.svg b/app/src/main/art/intro/screen_1_image.svg
index ec9ab693b..5641715e6 100644
--- a/app/src/main/art/intro/screen_1_image.svg
+++ b/app/src/main/art/intro/screen_1_image.svg
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  x="0px" y="0px"
 	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
diff --git a/app/src/main/art/intro/screen_2_2_image.svg b/app/src/main/art/intro/screen_2_2_image.svg
index 5c063a42d..87e797f89 100644
--- a/app/src/main/art/intro/screen_2_2_image.svg
+++ b/app/src/main/art/intro/screen_2_2_image.svg
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  x="0px" y="0px"
 	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
diff --git a/app/src/main/art/share/ic_dispersion_pattern_grey600_48dp.svg b/app/src/main/art/share/ic_dispersion_pattern_grey600_48dp.svg
index efd73e7ac..c74a40697 100644
--- a/app/src/main/art/share/ic_dispersion_pattern_grey600_48dp.svg
+++ b/app/src/main/art/share/ic_dispersion_pattern_grey600_48dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/share/ic_grid_grey600_48dp.svg b/app/src/main/art/share/ic_grid_grey600_48dp.svg
index 97cf809fa..e65cff911 100644
--- a/app/src/main/art/share/ic_grid_grey600_48dp.svg
+++ b/app/src/main/art/share/ic_grid_grey600_48dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/share/ic_text_grey600_48dp.svg b/app/src/main/art/share/ic_text_grey600_48dp.svg
index 060472475..acbd55684 100644
--- a/app/src/main/art/share/ic_text_grey600_48dp.svg
+++ b/app/src/main/art/share/ic_text_grey600_48dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/store/brand_name.svg b/app/src/main/art/store/brand_name.svg
index d8a94f3ca..5795c8158 100644
--- a/app/src/main/art/store/brand_name.svg
+++ b/app/src/main/art/store/brand_name.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/store/ic_launcher.svg b/app/src/main/art/store/ic_launcher.svg
index 966023017..55b37cd55 100644
--- a/app/src/main/art/store/ic_launcher.svg
+++ b/app/src/main/art/store/ic_launcher.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/beursault.svg b/app/src/main/art/targets/beursault.svg
index 71d045a73..4ca2746fd 100644
--- a/app/src/main/art/targets/beursault.svg
+++ b/app/src/main/art/targets/beursault.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/gridded_dot.svg b/app/src/main/art/targets/gridded_dot.svg
index 2c2f3f137..1edf877e6 100644
--- a/app/src/main/art/targets/gridded_dot.svg
+++ b/app/src/main/art/targets/gridded_dot.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/hit_miss.svg b/app/src/main/art/targets/hit_miss.svg
index 3a0ffacc5..e74e81449 100644
--- a/app/src/main/art/targets/hit_miss.svg
+++ b/app/src/main/art/targets/hit_miss.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/ifaa_animal.svg b/app/src/main/art/targets/ifaa_animal.svg
index b6145140d..5d18b90b1 100644
--- a/app/src/main/art/targets/ifaa_animal.svg
+++ b/app/src/main/art/targets/ifaa_animal.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/nfaa_5_spot.svg b/app/src/main/art/targets/nfaa_5_spot.svg
index 41650a77c..7957b38a2 100644
--- a/app/src/main/art/targets/nfaa_5_spot.svg
+++ b/app/src/main/art/targets/nfaa_5_spot.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/nfaa_animal.svg b/app/src/main/art/targets/nfaa_animal.svg
index 4c051d392..8ce7e28ed 100644
--- a/app/src/main/art/targets/nfaa_animal.svg
+++ b/app/src/main/art/targets/nfaa_animal.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/nfaa_field.svg b/app/src/main/art/targets/nfaa_field.svg
index 667f841fd..4bdc6cf83 100644
--- a/app/src/main/art/targets/nfaa_field.svg
+++ b/app/src/main/art/targets/nfaa_field.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/nfaa_hunter.svg b/app/src/main/art/targets/nfaa_hunter.svg
index aba88af75..6d83ff69b 100644
--- a/app/src/main/art/targets/nfaa_hunter.svg
+++ b/app/src/main/art/targets/nfaa_hunter.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/nfaa_indoor.svg b/app/src/main/art/targets/nfaa_indoor.svg
index cec3dec9c..f4f7cf55e 100644
--- a/app/src/main/art/targets/nfaa_indoor.svg
+++ b/app/src/main/art/targets/nfaa_indoor.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/nfas_field.svg b/app/src/main/art/targets/nfas_field.svg
index 4c051d392..8ce7e28ed 100644
--- a/app/src/main/art/targets/nfas_field.svg
+++ b/app/src/main/art/targets/nfas_field.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/simple_dot.svg b/app/src/main/art/targets/simple_dot.svg
index 404ca3cdf..2106f9595 100644
--- a/app/src/main/art/targets/simple_dot.svg
+++ b/app/src/main/art/targets/simple_dot.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/three_d_asa.svg b/app/src/main/art/targets/three_d_asa.svg
index 539ed64eb..5122bc853 100644
--- a/app/src/main/art/targets/three_d_asa.svg
+++ b/app/src/main/art/targets/three_d_asa.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/three_d_asa_14.svg b/app/src/main/art/targets/three_d_asa_14.svg
index 0045ba0d9..5bf5644f3 100644
--- a/app/src/main/art/targets/three_d_asa_14.svg
+++ b/app/src/main/art/targets/three_d_asa_14.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/three_d_dair.svg b/app/src/main/art/targets/three_d_dair.svg
index f450e2b7e..7e4ba1b2c 100644
--- a/app/src/main/art/targets/three_d_dair.svg
+++ b/app/src/main/art/targets/three_d_dair.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/three_d_ibo.svg b/app/src/main/art/targets/three_d_ibo.svg
index 2e933e543..8e5f195bc 100644
--- a/app/src/main/art/targets/three_d_ibo.svg
+++ b/app/src/main/art/targets/three_d_ibo.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/three_d_nfas.svg b/app/src/main/art/targets/three_d_nfas.svg
index 9bdf8f1ab..234f1306c 100644
--- a/app/src/main/art/targets/three_d_nfas.svg
+++ b/app/src/main/art/targets/three_d_nfas.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/vegas.svg b/app/src/main/art/targets/vegas.svg
index f4a3a7204..9c61419b0 100644
--- a/app/src/main/art/targets/vegas.svg
+++ b/app/src/main/art/targets/vegas.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/vertical_3_spot.svg b/app/src/main/art/targets/vertical_3_spot.svg
index 2b382d17c..50a61a249 100644
--- a/app/src/main/art/targets/vertical_3_spot.svg
+++ b/app/src/main/art/targets/vertical_3_spot.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/wa_3_ring.svg b/app/src/main/art/targets/wa_3_ring.svg
index d50c31fd6..58b889cff 100644
--- a/app/src/main/art/targets/wa_3_ring.svg
+++ b/app/src/main/art/targets/wa_3_ring.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/wa_5_ring.svg b/app/src/main/art/targets/wa_5_ring.svg
index f175090c9..3db05f130 100644
--- a/app/src/main/art/targets/wa_5_ring.svg
+++ b/app/src/main/art/targets/wa_5_ring.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/wa_6_ring.svg b/app/src/main/art/targets/wa_6_ring.svg
index a4ee64114..9f628c711 100644
--- a/app/src/main/art/targets/wa_6_ring.svg
+++ b/app/src/main/art/targets/wa_6_ring.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/wa_field.svg b/app/src/main/art/targets/wa_field.svg
index c1cadbf0a..70648f8a3 100644
--- a/app/src/main/art/targets/wa_field.svg
+++ b/app/src/main/art/targets/wa_field.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/wa_full.svg b/app/src/main/art/targets/wa_full.svg
index 56ee8bd8b..764de6eb8 100644
--- a/app/src/main/art/targets/wa_full.svg
+++ b/app/src/main/art/targets/wa_full.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/targets/worcester.svg b/app/src/main/art/targets/worcester.svg
index d5695b945..3199b094b 100644
--- a/app/src/main/art/targets/worcester.svg
+++ b/app/src/main/art/targets/worcester.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/training/ic_arrow_number_grey600_24dp.svg b/app/src/main/art/training/ic_arrow_number_grey600_24dp.svg
index 73208afe7..ce21a6002 100644
--- a/app/src/main/art/training/ic_arrow_number_grey600_24dp.svg
+++ b/app/src/main/art/training/ic_arrow_number_grey600_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/training/ic_arrow_number_off_grey600_24dp.svg b/app/src/main/art/training/ic_arrow_number_off_grey600_24dp.svg
index 167fd21ab..477ae462a 100644
--- a/app/src/main/art/training/ic_arrow_number_off_grey600_24dp.svg
+++ b/app/src/main/art/training/ic_arrow_number_off_grey600_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/training/ic_inside_out.svg b/app/src/main/art/training/ic_inside_out.svg
index dca8dcc07..f7f691bca 100644
--- a/app/src/main/art/training/ic_inside_out.svg
+++ b/app/src/main/art/training/ic_inside_out.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/training/ic_multiple_archerers.svg b/app/src/main/art/training/ic_multiple_archerers.svg
index 3aeae54fd..e24415d07 100644
--- a/app/src/main/art/training/ic_multiple_archerers.svg
+++ b/app/src/main/art/training/ic_multiple_archerers.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/training/ic_outside_in.svg b/app/src/main/art/training/ic_outside_in.svg
index 5c12f61fd..891ce9d21 100644
--- a/app/src/main/art/training/ic_outside_in.svg
+++ b/app/src/main/art/training/ic_outside_in.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/training/ic_timer_grey600_24dp.svg b/app/src/main/art/training/ic_timer_grey600_24dp.svg
index 32f1ee274..47d75ebce 100644
--- a/app/src/main/art/training/ic_timer_grey600_24dp.svg
+++ b/app/src/main/art/training/ic_timer_grey600_24dp.svg
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/training/ic_timer_off_grey600_24dp.svg b/app/src/main/art/training/ic_timer_off_grey600_24dp.svg
index 9973aaa2e..037534c4d 100644
--- a/app/src/main/art/training/ic_timer_off_grey600_24dp.svg
+++ b/app/src/main/art/training/ic_timer_off_grey600_24dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/weather/ic_cloudy_48dp.svg b/app/src/main/art/weather/ic_cloudy_48dp.svg
index c552af331..b10dab06c 100644
--- a/app/src/main/art/weather/ic_cloudy_48dp.svg
+++ b/app/src/main/art/weather/ic_cloudy_48dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/weather/ic_cloudy_outline_48dp.svg b/app/src/main/art/weather/ic_cloudy_outline_48dp.svg
index 7c8595967..25a1b615d 100644
--- a/app/src/main/art/weather/ic_cloudy_outline_48dp.svg
+++ b/app/src/main/art/weather/ic_cloudy_outline_48dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/weather/ic_light_rain_48dp.svg b/app/src/main/art/weather/ic_light_rain_48dp.svg
index ea0927f9b..19b0275bc 100644
--- a/app/src/main/art/weather/ic_light_rain_48dp.svg
+++ b/app/src/main/art/weather/ic_light_rain_48dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/weather/ic_light_rain_outline_48dp.svg b/app/src/main/art/weather/ic_light_rain_outline_48dp.svg
index 4a8fa83dc..e374ab0ad 100644
--- a/app/src/main/art/weather/ic_light_rain_outline_48dp.svg
+++ b/app/src/main/art/weather/ic_light_rain_outline_48dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/weather/ic_partly_cloudy_48dp.svg b/app/src/main/art/weather/ic_partly_cloudy_48dp.svg
index cb1b541be..d6fae7426 100644
--- a/app/src/main/art/weather/ic_partly_cloudy_48dp.svg
+++ b/app/src/main/art/weather/ic_partly_cloudy_48dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/weather/ic_partly_cloudy_outline_48dp.svg b/app/src/main/art/weather/ic_partly_cloudy_outline_48dp.svg
index 5347f944b..c7863782e 100644
--- a/app/src/main/art/weather/ic_partly_cloudy_outline_48dp.svg
+++ b/app/src/main/art/weather/ic_partly_cloudy_outline_48dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/weather/ic_rain_48dp.svg b/app/src/main/art/weather/ic_rain_48dp.svg
index 05472cd03..50bbc0ff0 100644
--- a/app/src/main/art/weather/ic_rain_48dp.svg
+++ b/app/src/main/art/weather/ic_rain_48dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/weather/ic_rain_outline_48dp.svg b/app/src/main/art/weather/ic_rain_outline_48dp.svg
index f484b7d9f..25e54d6a1 100644
--- a/app/src/main/art/weather/ic_rain_outline_48dp.svg
+++ b/app/src/main/art/weather/ic_rain_outline_48dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/weather/ic_sun_48dp.svg b/app/src/main/art/weather/ic_sun_48dp.svg
index b4f896c6a..26563c96a 100644
--- a/app/src/main/art/weather/ic_sun_48dp.svg
+++ b/app/src/main/art/weather/ic_sun_48dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/art/weather/ic_sun_outline_48dp.svg b/app/src/main/art/weather/ic_sun_outline_48dp.svg
index b50a178f9..69180ffd2 100644
--- a/app/src/main/art/weather/ic_sun_outline_48dp.svg
+++ b/app/src/main/art/weather/ic_sun_outline_48dp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/java/android/support/v7/widget/RebindReportingHolder.kt b/app/src/main/java/android/support/v7/widget/RebindReportingHolder.kt
index 7f75501af..cc94c7fd2 100644
--- a/app/src/main/java/android/support/v7/widget/RebindReportingHolder.kt
+++ b/app/src/main/java/android/support/v7/widget/RebindReportingHolder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
index 72dc61930..a3e62c9ee 100644
--- a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
+++ b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/activities/ChildActivityBase.kt b/app/src/main/java/de/dreier/mytargets/base/activities/ChildActivityBase.kt
index c99f595fe..49fd221a5 100644
--- a/app/src/main/java/de/dreier/mytargets/base/activities/ChildActivityBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/activities/ChildActivityBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/activities/SimpleFragmentActivityBase.kt b/app/src/main/java/de/dreier/mytargets/base/activities/SimpleFragmentActivityBase.kt
index 5f9b07fff..9a74da036 100644
--- a/app/src/main/java/de/dreier/mytargets/base/activities/SimpleFragmentActivityBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/activities/SimpleFragmentActivityBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/ListAdapterBase.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/ListAdapterBase.kt
index d6188ab83..6f242d8b7 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/ListAdapterBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/ListAdapterBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/SimpleListAdapterBase.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/SimpleListAdapterBase.kt
index a7b0185f8..999237ff0 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/SimpleListAdapterBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/SimpleListAdapterBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemAdapter.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemAdapter.kt
index ec4a5358f..867ab559d 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemAdapter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemHolder.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemHolder.kt
index ed7c9779d..bb7b7b470 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemHolder.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemHolder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableHeaderHolder.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableHeaderHolder.kt
index b145f2e65..94bd663d0 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableHeaderHolder.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableHeaderHolder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt
index 268651be6..a816bfffc 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapter.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapter.kt
index e4e14d89d..6028b92df 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt
index 2fe95c7d8..58d0fc394 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditFragmentBase.kt
index 11f8f07e3..6328bfc71 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/EditFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/EditFragmentBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
index 5741b616f..c3c6903fd 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
index 328452c26..d0438202b 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
index 505282333..3e4261161 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/ItemActionModeCallback.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/ItemActionModeCallback.kt
index 41ce5d879..9a6d7f70b 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/ItemActionModeCallback.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/ItemActionModeCallback.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt
index d4fe9ca0e..8acf23a35 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt
index 8b156154c..25c86d8a8 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/CustomViewPager.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/CustomViewPager.kt
index c88f3842b..cbc237adb 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/CustomViewPager.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/CustomViewPager.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
index b70a8abc7..9db1681c5 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/HorizontalImageViewHolder.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/HorizontalImageViewHolder.kt
index 0f4eb28a9..7a2ed033f 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/HorizontalImageViewHolder.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/HorizontalImageViewHolder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/HorizontalListAdapters.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/HorizontalListAdapters.kt
index e56603b67..5ca5d6bf9 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/HorizontalListAdapters.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/HorizontalListAdapters.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/ViewPagerAdapter.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/ViewPagerAdapter.kt
index 8fb0ec241..e3a8c32d7 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/ViewPagerAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/ViewPagerAdapter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt b/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
index 879730f44..895a72826 100644
--- a/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListActivity.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListActivity.kt
index bdb46f6d6..f7711a1dc 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
index e8312755e..41d7670e1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowActivity.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowActivity.kt
index 6133fc529..69af2ab29 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
index 57d87b126..a294e1a8c 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
index cadf17d24..3fa39ac31 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
index f2b7fc95f..7d0a6704e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
index 3f6368c45..673049e35 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowListActivity.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowListActivity.kt
index 640b6ed97..dc94c8019 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowListActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowListActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
index df9cc092f..150f0fd0e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowActivity.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowActivity.kt
index 2b8c38173..a73931fec 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
index 1697338bb..d7633f42a 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
index 2f11eddae..fc902d39f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceActivity.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceActivity.kt
index 0ad81feb1..930f79658 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceFragment.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceFragment.kt
index 4c9528263..8d6bbd3d9 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
index 7358e3910..374f8cea2 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceInputDialog.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceInputDialog.kt
index 0aafedb90..e07b4f42a 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceInputDialog.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceInputDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceItemDecorator.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceItemDecorator.kt
index 2c2d73892..0e1e5b9e2 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceItemDecorator.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceItemDecorator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceTabsFragmentPagerAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceTabsFragmentPagerAdapter.kt
index 15ef07661..a1605f991 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceTabsFragmentPagerAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceTabsFragmentPagerAdapter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/help/HelpActivity.kt b/app/src/main/java/de/dreier/mytargets/features/help/HelpActivity.kt
index 2b14304f0..5d00854aa 100644
--- a/app/src/main/java/de/dreier/mytargets/features/help/HelpActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/help/HelpActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/help/HelpFragment.kt b/app/src/main/java/de/dreier/mytargets/features/help/HelpFragment.kt
index 0b0372dd0..e65d6d8e3 100644
--- a/app/src/main/java/de/dreier/mytargets/features/help/HelpFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/help/HelpFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesActivity.kt b/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesActivity.kt
index 9d31095cf..a62dd47d6 100644
--- a/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesFragment.kt b/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesFragment.kt
index 70ffd69a3..4d9a0ea42 100755
--- a/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/main/IntroActivity.kt b/app/src/main/java/de/dreier/mytargets/features/main/IntroActivity.kt
index 24d8b177a..c19d4b2ca 100644
--- a/app/src/main/java/de/dreier/mytargets/features/main/IntroActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/main/IntroActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/main/MainActivity.kt b/app/src/main/java/de/dreier/mytargets/features/main/MainActivity.kt
index 18a7800ea..fa4e06071 100644
--- a/app/src/main/java/de/dreier/mytargets/features/main/MainActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/main/MainActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
index 09bf4c804..0a7713feb 100644
--- a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/EFileType.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/EFileType.kt
index 0e9071554..042cd9670 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/EFileType.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/EFileType.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardActivity.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardActivity.kt
index f207b1db3..b4d9520f7 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardBuilder.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardBuilder.kt
index 1024c1c0a..cad59aca2 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardBuilder.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardBuilder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardConfiguration.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardConfiguration.kt
index 335658845..dcac5db42 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardConfiguration.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardConfiguration.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
index fc3987515..788d094a5 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
index d9b0e2ff7..f88b62ada 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
index 957944cf2..80416cd29 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/builder/ViewBuilder.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/builder/ViewBuilder.kt
index 5789a6dbc..316748dd8 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/builder/ViewBuilder.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/builder/ViewBuilder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/builder/model/Table.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/builder/model/Table.kt
index 59a49d6cc..3fbda99fa 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/builder/model/Table.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/builder/model/Table.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
index 9435c3b44..17d3dd786 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/InfoTableBuilder.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/InfoTableBuilder.kt
index 80e375338..074233deb 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/InfoTableBuilder.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/InfoTableBuilder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/pdf/ViewPrintDocumentAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/pdf/ViewPrintDocumentAdapter.kt
index 1aea99ea0..502c691f3 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/pdf/ViewPrintDocumentAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/pdf/ViewPrintDocumentAdapter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/pdf/ViewToPdfWriter.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/pdf/ViewToPdfWriter.kt
index c3db919de..fc57a01a8 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/pdf/ViewToPdfWriter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/pdf/ViewToPdfWriter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/DatePreference.kt b/app/src/main/java/de/dreier/mytargets/features/settings/DatePreference.kt
index d644ca2f9..b850e79fd 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/DatePreference.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/DatePreference.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/DatePreferenceDialogFragmentCompat.kt b/app/src/main/java/de/dreier/mytargets/features/settings/DatePreferenceDialogFragmentCompat.kt
index 2ecb31881..2f552ca06 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/DatePreferenceDialogFragmentCompat.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/DatePreferenceDialogFragmentCompat.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/ESettingsScreens.kt b/app/src/main/java/de/dreier/mytargets/features/settings/ESettingsScreens.kt
index 4bde94f85..6a6f90830 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/ESettingsScreens.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/ESettingsScreens.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/InputSettingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/InputSettingsFragment.kt
index 6de6026d6..62c6c33a5 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/InputSettingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/InputSettingsFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/LanguagePreference.kt b/app/src/main/java/de/dreier/mytargets/features/settings/LanguagePreference.kt
index bed39f098..a42dd54f4 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/LanguagePreference.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/LanguagePreference.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/MainSettingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/MainSettingsFragment.kt
index 8ac2dbb53..25828bce4 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/MainSettingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/MainSettingsFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/OverviewSettingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/OverviewSettingsFragment.kt
index f027e2c73..60c0aa87f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/OverviewSettingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/OverviewSettingsFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/ProfileSettingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/ProfileSettingsFragment.kt
index 14ae39e9e..b8da20628 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/ProfileSettingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/ProfileSettingsFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/ScoreboardSettingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/ScoreboardSettingsFragment.kt
index 865069ad7..35f378720 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/ScoreboardSettingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/ScoreboardSettingsFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsActivity.kt b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsActivity.kt
index 1c85f3ebd..ab0618038 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsFragmentBase.kt
index a3bf3614c..153a667d1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsFragmentBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt
index ab7c02e50..8a9a34c58 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/SharedPreferencesUtils.kt b/app/src/main/java/de/dreier/mytargets/features/settings/SharedPreferencesUtils.kt
index 87c10783f..82d5751f9 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/SharedPreferencesUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/SharedPreferencesUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/StatisticsSettingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/StatisticsSettingsFragment.kt
index e53de3fe2..598d13391 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/StatisticsSettingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/StatisticsSettingsFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/TimerSettingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/TimerSettingsFragment.kt
index 01011a471..48a09cb1b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/TimerSettingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/TimerSettingsFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutActivity.kt b/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutActivity.kt
index d6a4c2b13..c48d03b94 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt
index 3551c2ef0..aacb41db2 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/about/DonateActivity.kt b/app/src/main/java/de/dreier/mytargets/features/settings/about/DonateActivity.kt
index 337b662e3..650cfb0c5 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/about/DonateActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/about/DonateActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/about/DonationAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/settings/about/DonationAdapter.kt
index fb4ffa7df..98ca53cd5 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/about/DonationAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/about/DonationAdapter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupAdapter.kt
index 46279ec18..ac413eb06 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupAdapter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupEntry.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupEntry.kt
index 44c98a1bc..c3c99e49a 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupEntry.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupEntry.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupException.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupException.kt
index 70d8f5dc4..808a8fe9a 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupException.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupException.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupSettingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupSettingsFragment.kt
index af14ef490..6ac961262 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupSettingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupSettingsFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/EBackupInterval.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/EBackupInterval.kt
index 3bef4b32f..842d6f36e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/EBackupInterval.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/EBackupInterval.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt
index 9047ff06d..b71019ade 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/EBackupLocation.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/EBackupLocation.kt
index 514077b2d..5c2de5d76 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/EBackupLocation.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/EBackupLocation.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/ExternalStorageBackup.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/ExternalStorageBackup.kt
index fa5049318..b929989b0 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/ExternalStorageBackup.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/ExternalStorageBackup.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt
index 2ce326f62..3d7a4db78 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/IAsyncBackupRestore.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/IAsyncBackupRestore.kt
index f7bb9b1fa..5b7a6cd9e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/IAsyncBackupRestore.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/IAsyncBackupRestore.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/IBlockingBackup.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/IBlockingBackup.kt
index e67cc1043..31b719c2e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/IBlockingBackup.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/IBlockingBackup.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/InternalStorageBackup.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/InternalStorageBackup.kt
index ae144f7cc..5321fa40d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/InternalStorageBackup.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/InternalStorageBackup.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/GenericAccountService.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/GenericAccountService.kt
index 8c6d68b1e..73560a727 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/GenericAccountService.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/GenericAccountService.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/StubProvider.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/StubProvider.kt
index c4b4394ec..252bc3f4b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/StubProvider.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/StubProvider.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncAdapter.kt
index 5e26b3052..664d44659 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncAdapter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncService.java b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncService.java
index d2ce8ae04..8f8bf7ae5 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncService.java
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt
index 320277ad1..a89f9e546 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
index 7227821d7..9f33fc084 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/ChipGroup.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/ChipGroup.kt
index 994aeb31b..61c6e8d00 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/ChipGroup.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/ChipGroup.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
index 69f9dbdba..18c7e5e6a 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
index 62ca953c4..21a66fd70 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternUtils.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternUtils.kt
index d615df89f..f62c685df 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
index b63546b1b..27f41b9a8 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
index 109a189f1..2d2a1dc0d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/Tag.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/Tag.kt
index 17ae8bbd4..616218ce5 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/Tag.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/Tag.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/timer/TimerActivity.kt b/app/src/main/java/de/dreier/mytargets/features/timer/TimerActivity.kt
index 5b3ff965c..6bf1b195f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/timer/TimerActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/timer/TimerActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/timer/TimerFragment.kt b/app/src/main/java/de/dreier/mytargets/features/timer/TimerFragment.kt
index 6fd1cfb42..c2b0aa57c 100644
--- a/app/src/main/java/de/dreier/mytargets/features/timer/TimerFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/timer/TimerFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/ETrainingType.kt b/app/src/main/java/de/dreier/mytargets/features/training/ETrainingType.kt
index 017a00216..15206a56f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/ETrainingType.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/ETrainingType.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/EditRoundActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/EditRoundActivity.kt
index 91a58450c..23e87da25 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/EditRoundActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/EditRoundActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/RoundActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/RoundActivity.kt
index 7eef00e87..87fe7b8a6 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/RoundActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/RoundActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
index c8e416ba0..94e4c2356 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/TrainingActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/TrainingActivity.kt
index e458ea0b5..508549650 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/TrainingActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/TrainingActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlInfoBuilder.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlInfoBuilder.kt
index 5ad06d155..ddcf88fe5 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlInfoBuilder.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlInfoBuilder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
index 08bf3679a..4bf43fa8f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index 258b6073b..72e6b2ba6 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/DatePickerFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/DatePickerFragment.kt
index 8a278c5bc..bbd9bf3c2 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/DatePickerFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/DatePickerFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingActivity.kt
index 11cdb0d5d..fee8b95cc 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
index 091a19618..37a902475 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt
index 980d2e19c..50637b752 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/CurrentWeather.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/CurrentWeather.kt
index db5e1514b..3e1ee57e6 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/CurrentWeather.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/CurrentWeather.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentActivity.kt
index 4987c29e9..3e11cc619 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt
index e465f6f15..4952fea3a 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt
index c383743d4..01c892dd3 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WeatherService.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WeatherService.kt
index e83120f08..5d9e26ca2 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WeatherService.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WeatherService.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionActivity.kt
index b78b8940a..822017515 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
index e5434498f..92cf1e159 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedActivity.kt
index 44e333012..af902909f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
index b3049b08a..e491aa184 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/ETrainingScope.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/ETrainingScope.kt
index 3f8845b42..ff55ac8d7 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/ETrainingScope.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/ETrainingScope.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/FingerSlipDetector.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/FingerSlipDetector.kt
index 8617ffa89..7a0ac1141 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/FingerSlipDetector.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/FingerSlipDetector.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
index 094d95ac7..2e4f647dc 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt
index 2257d5ca5..863c7afd6 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/SummaryConfiguration.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/SummaryConfiguration.kt
index 3e28f6203..e8afb8944 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/SummaryConfiguration.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/SummaryConfiguration.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.kt
index 4eaa7c4ce..d3e586927 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/ExpandableListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/ExpandableListFragment.kt
index 7d8447622..34adab9cc 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/overview/ExpandableListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/ExpandableListFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/Header.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/Header.kt
index b4bfd2481..b2b0515e8 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/overview/Header.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/Header.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
index 3c7d8be29..f893b3ed3 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundActivity.kt
index 55ce1b6a4..2e34eecd9 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
index c6a9101b1..4dca03a03 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivity.kt
index e55910498..7e6f55675 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
index 40b9ed8be..bcb580612 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetActivity.kt
index b9739dd54..a5cb2ccbd 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
index f87228188..597586b3d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/BundleUtils.kt b/app/src/main/java/de/dreier/mytargets/utils/BundleUtils.kt
index ffc9c9ce9..9398093a9 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/BundleUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/BundleUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/DividerItemDecoration.kt b/app/src/main/java/de/dreier/mytargets/utils/DividerItemDecoration.kt
index 09744db5f..e2e97ebb4 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/DividerItemDecoration.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/DividerItemDecoration.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/IntentWrapper.kt b/app/src/main/java/de/dreier/mytargets/utils/IntentWrapper.kt
index 446ed9df4..23a21deb5 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/IntentWrapper.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/IntentWrapper.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableClient.kt b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableClient.kt
index 0eab8f758..c0d89b5c4 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableClient.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableClient.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
index caac24e0f..fed0ebe61 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/RoundedTextDrawable.kt b/app/src/main/java/de/dreier/mytargets/utils/RoundedTextDrawable.kt
index 3bb8c3a83..ed3779462 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/RoundedTextDrawable.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/RoundedTextDrawable.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/SingleSelectorBundler.kt b/app/src/main/java/de/dreier/mytargets/utils/SingleSelectorBundler.kt
index d5817fce3..12a33313b 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/SingleSelectorBundler.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/SingleSelectorBundler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/SlideInItemAnimator.kt b/app/src/main/java/de/dreier/mytargets/utils/SlideInItemAnimator.kt
index f6ef6bbce..4cc53cedd 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/SlideInItemAnimator.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/SlideInItemAnimator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/ToolbarUtils.kt b/app/src/main/java/de/dreier/mytargets/utils/ToolbarUtils.kt
index e10a8269b..5e33dcbb7 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/ToolbarUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/ToolbarUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/Utils.kt b/app/src/main/java/de/dreier/mytargets/utils/Utils.kt
index 77aae37cf..2be5be40d 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/Utils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/Utils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/backup/DbBackupHelper.kt b/app/src/main/java/de/dreier/mytargets/utils/backup/DbBackupHelper.kt
index d1728bed4..3f7c7d39a 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/backup/DbBackupHelper.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/backup/DbBackupHelper.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/backup/MyBackupAgent.kt b/app/src/main/java/de/dreier/mytargets/utils/backup/MyBackupAgent.kt
index 0c67bee66..68ff6cc6f 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/backup/MyBackupAgent.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/backup/MyBackupAgent.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt b/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt
index d9d5397ba..7e4b23d3c 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/multiselector/ExpandableHeaderBindingHolder.kt b/app/src/main/java/de/dreier/mytargets/utils/multiselector/ExpandableHeaderBindingHolder.kt
index 46f723526..b7b402008 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/multiselector/ExpandableHeaderBindingHolder.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/multiselector/ExpandableHeaderBindingHolder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/multiselector/HeaderBindingHolder.kt b/app/src/main/java/de/dreier/mytargets/utils/multiselector/HeaderBindingHolder.kt
index defa51c14..65b3c1056 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/multiselector/HeaderBindingHolder.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/multiselector/HeaderBindingHolder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/multiselector/ItemBindingHolder.kt b/app/src/main/java/de/dreier/mytargets/utils/multiselector/ItemBindingHolder.kt
index ed3fcea55..5c8bad112 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/multiselector/ItemBindingHolder.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/multiselector/ItemBindingHolder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/multiselector/MultiSelector.kt b/app/src/main/java/de/dreier/mytargets/utils/multiselector/MultiSelector.kt
index 0519b6c11..e5b435a16 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/multiselector/MultiSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/multiselector/MultiSelector.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/multiselector/OnItemClickListener.kt b/app/src/main/java/de/dreier/mytargets/utils/multiselector/OnItemClickListener.kt
index 4662075ef..b2d36c717 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/multiselector/OnItemClickListener.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/multiselector/OnItemClickListener.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/multiselector/OnItemLongClickListener.kt b/app/src/main/java/de/dreier/mytargets/utils/multiselector/OnItemLongClickListener.kt
index 3285db858..cfdb6db68 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/multiselector/OnItemLongClickListener.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/multiselector/OnItemLongClickListener.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectableHolder.kt b/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectableHolder.kt
index 56e3479d2..fad46a61d 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectableHolder.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectableHolder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectableViewHolder.kt b/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectableViewHolder.kt
index c0d162e49..2d233123e 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectableViewHolder.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectableViewHolder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectorBase.kt b/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectorBase.kt
index 9c6d2bc55..bee67a17a 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectorBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectorBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/multiselector/SingleSelector.kt b/app/src/main/java/de/dreier/mytargets/utils/multiselector/SingleSelector.kt
index 845e39cb8..d8e21454a 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/multiselector/SingleSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/multiselector/SingleSelector.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/multiselector/WeakHolderTracker.kt b/app/src/main/java/de/dreier/mytargets/utils/multiselector/WeakHolderTracker.kt
index 271af39f8..11ed24959 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/multiselector/WeakHolderTracker.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/multiselector/WeakHolderTracker.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/transitions/FabTransform.kt b/app/src/main/java/de/dreier/mytargets/utils/transitions/FabTransform.kt
index f8feed81f..915bb54dd 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/transitions/FabTransform.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/transitions/FabTransform.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/transitions/GravityArcMotion.kt b/app/src/main/java/de/dreier/mytargets/utils/transitions/GravityArcMotion.kt
index cc8b76157..55191bd28 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/transitions/GravityArcMotion.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/transitions/GravityArcMotion.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt b/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt
index f7891a221..0048fe09c 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/utils/transitions/TransitionAdapter.kt b/app/src/main/java/de/dreier/mytargets/utils/transitions/TransitionAdapter.kt
index b9a0a7d95..4acdbe4f9 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/transitions/TransitionAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/transitions/TransitionAdapter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/views/NumberPicker.kt b/app/src/main/java/de/dreier/mytargets/views/NumberPicker.kt
index 68a059694..706d0c3ff 100644
--- a/app/src/main/java/de/dreier/mytargets/views/NumberPicker.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/NumberPicker.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
index f1bc19691..8ccb1ed86 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
index e7457af91..ee4b9c33c 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/DistanceSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/DistanceSelector.kt
index e9ff8e095..f047ec98a 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/DistanceSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/DistanceSelector.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
index 23a9ec5de..393bd95b4 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/SelectorBase.kt b/app/src/main/java/de/dreier/mytargets/views/selector/SelectorBase.kt
index d0fa6f272..6abed3af7 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/SelectorBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/SelectorBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/SimpleDistanceSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/SimpleDistanceSelector.kt
index b2efa51c8..02f329bf0 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/SimpleDistanceSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/SimpleDistanceSelector.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
index 92dd753f1..0d8971f25 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/TargetSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/TargetSelector.kt
index 9fb0ffe23..1f9bf9e8f 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/TargetSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/TargetSelector.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/WindDirectionSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/WindDirectionSelector.kt
index bb0ba1472..078d9ae77 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/WindDirectionSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/WindDirectionSelector.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/WindSpeedSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/WindSpeedSelector.kt
index dfa44b0e6..f042277f0 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/WindSpeedSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/WindSpeedSelector.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDial.kt b/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDial.kt
index fbed34ec0..47f10e6e7 100755
--- a/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDial.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDial.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt b/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt
index 23b6953fc..3a48c658a 100755
--- a/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/app/src/main/res/anim/left_in.xml b/app/src/main/res/anim/left_in.xml
index a396de656..9b917a659 100644
--- a/app/src/main/res/anim/left_in.xml
+++ b/app/src/main/res/anim/left_in.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/anim/left_out.xml b/app/src/main/res/anim/left_out.xml
index 6fa67523c..b90f61b7e 100644
--- a/app/src/main/res/anim/left_out.xml
+++ b/app/src/main/res/anim/left_out.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -20,4 +20,4 @@
         android:duration="300"
         android:fromXDelta="0"
         android:toXDelta="-50%p"/>
-</set>
\ No newline at end of file
+</set>
diff --git a/app/src/main/res/anim/right_in.xml b/app/src/main/res/anim/right_in.xml
index 4d6b8dec9..fd809919c 100644
--- a/app/src/main/res/anim/right_in.xml
+++ b/app/src/main/res/anim/right_in.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -20,4 +20,4 @@
         android:duration="300"
         android:fromXDelta="100%p"
         android:toXDelta="0"/>
-</set>
\ No newline at end of file
+</set>
diff --git a/app/src/main/res/anim/right_out.xml b/app/src/main/res/anim/right_out.xml
index d071bb638..b85c9b466 100644
--- a/app/src/main/res/anim/right_out.xml
+++ b/app/src/main/res/anim/right_out.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -20,4 +20,4 @@
         android:duration="300"
         android:fromXDelta="0"
         android:toXDelta="100%p"/>
-</set>
\ No newline at end of file
+</set>
diff --git a/app/src/main/res/animator-v21/raise.xml b/app/src/main/res/animator-v21/raise.xml
index 74e38b585..ef8066289 100644
--- a/app/src/main/res/animator-v21/raise.xml
+++ b/app/src/main/res/animator-v21/raise.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -31,4 +31,4 @@
             android:valueTo="0dp"
             android:valueType="floatType"/>
     </item>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/animator/fab_rotator.xml b/app/src/main/res/animator/fab_rotator.xml
index f628641f1..1ba3d066a 100644
--- a/app/src/main/res/animator/fab_rotator.xml
+++ b/app/src/main/res/animator/fab_rotator.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <objectAnimator
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="150"
diff --git a/app/src/main/res/animator/fab_rotator_reverse.xml b/app/src/main/res/animator/fab_rotator_reverse.xml
index 781b4897d..9fe799b15 100644
--- a/app/src/main/res/animator/fab_rotator_reverse.xml
+++ b/app/src/main/res/animator/fab_rotator_reverse.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <objectAnimator
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="150"
diff --git a/app/src/main/res/color-v24/gradient_launcher_finish.xml b/app/src/main/res/color-v24/gradient_launcher_finish.xml
index 2c4264989..5b1f9da46 100644
--- a/app/src/main/res/color-v24/gradient_launcher_finish.xml
+++ b/app/src/main/res/color-v24/gradient_launcher_finish.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <gradient xmlns:android="http://schemas.android.com/apk/res/android"
           android:endColor="#00FFFFFF"
           android:endX="108"
@@ -6,4 +21,4 @@
           android:startColor="#1AFFFFFF"
           android:startX="0"
           android:startY="0"
-          android:type="linear"/>
\ No newline at end of file
+          android:type="linear"/>
diff --git a/app/src/main/res/color/tab_layout_text.xml b/app/src/main/res/color/tab_layout_text.xml
index d0f8c3166..64268671a 100644
--- a/app/src/main/res/color/tab_layout_text.xml
+++ b/app/src/main/res/color/tab_layout_text.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -17,4 +17,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="#CCFFFFFF"/>
     <item android:color="@color/md_white_1000" android:state_selected="true"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/drawable-v21/chip_background_selector.xml b/app/src/main/res/drawable-v21/chip_background_selector.xml
index a5eeb78be..fd41c1f31 100644
--- a/app/src/main/res/drawable-v21/chip_background_selector.xml
+++ b/app/src/main/res/drawable-v21/chip_background_selector.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -31,4 +31,4 @@
         </selector>
     </item>
 
-</ripple>
\ No newline at end of file
+</ripple>
diff --git a/app/src/main/res/drawable-v21/fab_buttonstates.xml b/app/src/main/res/drawable-v21/fab_buttonstates.xml
index 7073fc633..bdb6e3b48 100644
--- a/app/src/main/res/drawable-v21/fab_buttonstates.xml
+++ b/app/src/main/res/drawable-v21/fab_buttonstates.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2016 Yavor Ivanov
+  ~ Copyright (C) 2018 Florian Dreier
   ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
+  ~ This file is part of MyTargets.
   ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
   ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable-v21/launch_screen.xml b/app/src/main/res/drawable-v21/launch_screen.xml
index b5f624e05..bf154cb7c 100644
--- a/app/src/main/res/drawable-v21/launch_screen.xml
+++ b/app/src/main/res/drawable-v21/launch_screen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -29,4 +29,4 @@
         android:bottom="@dimen/launchscreen_brand_logo_bottom"
         android:drawable="@drawable/brand_name"
         android:gravity="bottom|center"/>
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/app/src/main/res/drawable-v24/launcher_foreground.xml b/app/src/main/res/drawable-v24/launcher_foreground.xml
index 0a7faccb8..a38a34799 100644
--- a/app/src/main/res/drawable-v24/launcher_foreground.xml
+++ b/app/src/main/res/drawable-v24/launcher_foreground.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -47,4 +47,4 @@ C46.87,50.0522,50.0622,46.86,54,46.86 Z"/>
         android:fillColor="@color/gradient_launcher_finish"
         android:pathData="M0,0 L108,0 L108,108 L0,108 L0,0 Z"/>
 
-</vector>
\ No newline at end of file
+</vector>
diff --git a/app/src/main/res/drawable-v25/ic_shortcut_album_green_48dp.xml b/app/src/main/res/drawable-v25/ic_shortcut_album_green_48dp.xml
index 87ca0088e..13d4c9ddc 100644
--- a/app/src/main/res/drawable-v25/ic_shortcut_album_green_48dp.xml
+++ b/app/src/main/res/drawable-v25/ic_shortcut_album_green_48dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable-v25/ic_shortcut_trending_up_green_48dp.xml b/app/src/main/res/drawable-v25/ic_shortcut_trending_up_green_48dp.xml
index ce118b314..b80dd4e28 100644
--- a/app/src/main/res/drawable-v25/ic_shortcut_trending_up_green_48dp.xml
+++ b/app/src/main/res/drawable-v25/ic_shortcut_trending_up_green_48dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable-v26/ic_shortcut_album_green_48dp.xml b/app/src/main/res/drawable-v26/ic_shortcut_album_green_48dp.xml
index b3f8351af..ac5e2d9ab 100644
--- a/app/src/main/res/drawable-v26/ic_shortcut_album_green_48dp.xml
+++ b/app/src/main/res/drawable-v26/ic_shortcut_album_green_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -17,4 +17,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/shortcut_background"/>
     <foreground android:drawable="@drawable/ic_shortcut_album_green_foreground"/>
-</adaptive-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/app/src/main/res/drawable-v26/ic_shortcut_album_green_foreground.xml b/app/src/main/res/drawable-v26/ic_shortcut_album_green_foreground.xml
index b49fd2534..6f8bc3179 100644
--- a/app/src/main/res/drawable-v26/ic_shortcut_album_green_foreground.xml
+++ b/app/src/main/res/drawable-v26/ic_shortcut_album_green_foreground.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable-v26/ic_shortcut_trending_up_green_48dp.xml b/app/src/main/res/drawable-v26/ic_shortcut_trending_up_green_48dp.xml
index 15bd94855..1de425e17 100644
--- a/app/src/main/res/drawable-v26/ic_shortcut_trending_up_green_48dp.xml
+++ b/app/src/main/res/drawable-v26/ic_shortcut_trending_up_green_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -17,4 +17,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/shortcut_background"/>
     <foreground android:drawable="@drawable/ic_shortcut_trending_up_green_foreground"/>
-</adaptive-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/app/src/main/res/drawable-v26/ic_shortcut_trending_up_green_foreground.xml b/app/src/main/res/drawable-v26/ic_shortcut_trending_up_green_foreground.xml
index f2296a9d6..3b91bca04 100644
--- a/app/src/main/res/drawable-v26/ic_shortcut_trending_up_green_foreground.xml
+++ b/app/src/main/res/drawable-v26/ic_shortcut_trending_up_green_foreground.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/about_icon_beta_test.xml b/app/src/main/res/drawable/about_icon_beta_test.xml
index 345376094..ea0d1cde9 100644
--- a/app/src/main/res/drawable/about_icon_beta_test.xml
+++ b/app/src/main/res/drawable/about_icon_beta_test.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/about_icon_crowdin.xml b/app/src/main/res/drawable/about_icon_crowdin.xml
index 67732de5c..284863101 100644
--- a/app/src/main/res/drawable/about_icon_crowdin.xml
+++ b/app/src/main/res/drawable/about_icon_crowdin.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/about_icon_donate.xml b/app/src/main/res/drawable/about_icon_donate.xml
index ca84040ef..523a680ba 100644
--- a/app/src/main/res/drawable/about_icon_donate.xml
+++ b/app/src/main/res/drawable/about_icon_donate.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/about_icon_google_plus.xml b/app/src/main/res/drawable/about_icon_google_plus.xml
index ac4349b08..957f6157d 100644
--- a/app/src/main/res/drawable/about_icon_google_plus.xml
+++ b/app/src/main/res/drawable/about_icon_google_plus.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/about_icon_linkedin.xml b/app/src/main/res/drawable/about_icon_linkedin.xml
index b4888efdd..9f0f1e6ea 100644
--- a/app/src/main/res/drawable/about_icon_linkedin.xml
+++ b/app/src/main/res/drawable/about_icon_linkedin.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/about_icon_paypal.xml b/app/src/main/res/drawable/about_icon_paypal.xml
index ab98eed3f..f7c1f0c27 100644
--- a/app/src/main/res/drawable/about_icon_paypal.xml
+++ b/app/src/main/res/drawable/about_icon_paypal.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/about_icon_share.xml b/app/src/main/res/drawable/about_icon_share.xml
index a9033b41b..a9b61363f 100644
--- a/app/src/main/res/drawable/about_icon_share.xml
+++ b/app/src/main/res/drawable/about_icon_share.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/arrow_numbers.xml b/app/src/main/res/drawable/arrow_numbers.xml
index 6e0faca71..578bf94ad 100644
--- a/app/src/main/res/drawable/arrow_numbers.xml
+++ b/app/src/main/res/drawable/arrow_numbers.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -24,4 +24,4 @@
     <item android:state_hovered="true"
           android:drawable="@drawable/ic_arrow_number_off_grey600_24dp"/> <!-- hovered -->
     <item android:drawable="@drawable/ic_arrow_number_off_grey600_24dp"/> <!-- default -->
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/drawable/brand_name.xml b/app/src/main/res/drawable/brand_name.xml
index bb2cf5e22..138f7bb67 100644
--- a/app/src/main/res/drawable/brand_name.xml
+++ b/app/src/main/res/drawable/brand_name.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -89,4 +89,4 @@ c0.8,0.3,1.5,0.7,2.1,1.1c0.5,0.5,0.9,0.9,1.2,1.5c0.3,0.5,0.4,1.2,0.4,1.9c0,0.8-0
 c-0.6,0.5-1.3,0.9-2.2,1.1c-0.9,0.3-1.8,0.4-2.9,0.4c-1.2,0-2.3-0.2-3.2-0.5c-0.9-0.3-1.7-0.8-2.3-1.3s-1.1-1.2-1.5-1.9
 c-0.3-0.7-0.5-1.5-0.5-2.2h3.1c0.1,0.7,0.2,1.2,0.5,1.6c0.3,0.5,0.6,0.8,1.1,1.1c0.4,0.3,0.9,0.5,1.4,0.6c0.5,0.1,1,0.2,1.5,0.2
 c0.7,0,1.2-0.1,1.7-0.2c0.5-0.1,0.9-0.3,1.2-0.5c0.3-0.3,0.6-0.5,0.7-0.9C154.9,20.4,154.9,20.1,154.9,19.7z"/>
-</vector>
\ No newline at end of file
+</vector>
diff --git a/app/src/main/res/drawable/chip_background.xml b/app/src/main/res/drawable/chip_background.xml
index fb05ccaaa..f68673205 100755
--- a/app/src/main/res/drawable/chip_background.xml
+++ b/app/src/main/res/drawable/chip_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/chip_background_selected.xml b/app/src/main/res/drawable/chip_background_selected.xml
index 8d19fd83f..63badcebc 100644
--- a/app/src/main/res/drawable/chip_background_selected.xml
+++ b/app/src/main/res/drawable/chip_background_selected.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -20,4 +20,4 @@
     <solid android:drawable="@color/base30"/>
     <corners android:radius="16dp"/>
 
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/chip_background_selector.xml b/app/src/main/res/drawable/chip_background_selector.xml
index 89c0cd03c..faeda07eb 100644
--- a/app/src/main/res/drawable/chip_background_selector.xml
+++ b/app/src/main/res/drawable/chip_background_selector.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -22,4 +22,4 @@
     <item android:state_activated="true" android:drawable="@drawable/chip_background_selected"/>
     <item android:drawable="@drawable/chip_background"/>
 
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/drawable/fab_add_animated.xml b/app/src/main/res/drawable/fab_add_animated.xml
index a8d99eb44..9b26b1ac0 100644
--- a/app/src/main/res/drawable/fab_add_animated.xml
+++ b/app/src/main/res/drawable/fab_add_animated.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
                  xmlns:tools="http://schemas.android.com/tools"
                  android:drawable="@drawable/ic_add"
diff --git a/app/src/main/res/drawable/fab_add_animated_reverse.xml b/app/src/main/res/drawable/fab_add_animated_reverse.xml
index 0e0bfd2e2..9ff37dbfd 100644
--- a/app/src/main/res/drawable/fab_add_animated_reverse.xml
+++ b/app/src/main/res/drawable/fab_add_animated_reverse.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
                  xmlns:tools="http://schemas.android.com/tools"
                  android:drawable="@drawable/ic_add"
diff --git a/app/src/main/res/drawable/fab_add_white_24dp.xml b/app/src/main/res/drawable/fab_add_white_24dp.xml
index cb497230a..a97d6b94c 100644
--- a/app/src/main/res/drawable/fab_add_white_24dp.xml
+++ b/app/src/main/res/drawable/fab_add_white_24dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/fab_album_24dp.xml b/app/src/main/res/drawable/fab_album_24dp.xml
index 56e95057e..6e9b7e6c5 100644
--- a/app/src/main/res/drawable/fab_album_24dp.xml
+++ b/app/src/main/res/drawable/fab_album_24dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/fab_buttonstates.xml b/app/src/main/res/drawable/fab_buttonstates.xml
index 536bffd30..8fee2e75b 100644
--- a/app/src/main/res/drawable/fab_buttonstates.xml
+++ b/app/src/main/res/drawable/fab_buttonstates.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2016 Yavor Ivanov
+  ~ Copyright (C) 2018 Florian Dreier
   ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
+  ~ This file is part of MyTargets.
   ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
   ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/fab_label_background.xml b/app/src/main/res/drawable/fab_label_background.xml
index 375632cea..5a0016755 100644
--- a/app/src/main/res/drawable/fab_label_background.xml
+++ b/app/src/main/res/drawable/fab_label_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/fab_label_background_pressed.xml b/app/src/main/res/drawable/fab_label_background_pressed.xml
index 0e0ecbc1f..0de2bdb73 100644
--- a/app/src/main/res/drawable/fab_label_background_pressed.xml
+++ b/app/src/main/res/drawable/fab_label_background_pressed.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/fab_label_background_released.xml b/app/src/main/res/drawable/fab_label_background_released.xml
index c23957d17..24f7459a9 100644
--- a/app/src/main/res/drawable/fab_label_background_released.xml
+++ b/app/src/main/res/drawable/fab_label_background_released.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/fab_trending_up_white_24dp.xml b/app/src/main/res/drawable/fab_trending_up_white_24dp.xml
index d7fccdb0e..355e9f9b6 100644
--- a/app/src/main/res/drawable/fab_trending_up_white_24dp.xml
+++ b/app/src/main/res/drawable/fab_trending_up_white_24dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/full_divider.xml b/app/src/main/res/drawable/full_divider.xml
index 51f6a3579..c0d89ebb7 100644
--- a/app/src/main/res/drawable/full_divider.xml
+++ b/app/src/main/res/drawable/full_divider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -20,4 +20,4 @@
         android:width="1dp"
         android:height="1dp"/>
     <solid android:color="@color/dividerColor"/>
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/ic_account_circle_white_24dp.xml b/app/src/main/res/drawable/ic_account_circle_white_24dp.xml
index 870288243..27b7b3d79 100644
--- a/app/src/main/res/drawable/ic_account_circle_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_account_circle_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
index d7f3cafef..acdd28390 100644
--- a/app/src/main/res/drawable/ic_add.xml
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_white_24dp.xml
index a65123fef..2849d9a7f 100644
--- a/app/src/main/res/drawable/ic_add_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_add_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_album_24dp.xml b/app/src/main/res/drawable/ic_album_24dp.xml
index e1fb52866..557058572 100644
--- a/app/src/main/res/drawable/ic_album_24dp.xml
+++ b/app/src/main/res/drawable/ic_album_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_archery_24dp.xml b/app/src/main/res/drawable/ic_archery_24dp.xml
index 02f330139..04be24f80 100644
--- a/app/src/main/res/drawable/ic_archery_24dp.xml
+++ b/app/src/main/res/drawable/ic_archery_24dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_arrow_24dp.xml b/app/src/main/res/drawable/ic_arrow_24dp.xml
index 4437e6dce..878cfee75 100644
--- a/app/src/main/res/drawable/ic_arrow_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_24dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_arrow_diameter_grey600_24dp.xml b/app/src/main/res/drawable/ic_arrow_diameter_grey600_24dp.xml
index 8b7c060e2..078b19122 100644
--- a/app/src/main/res/drawable/ic_arrow_diameter_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_diameter_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_arrow_length_grey600_24dp.xml b/app/src/main/res/drawable/ic_arrow_length_grey600_24dp.xml
index 9b67c3867..28d74418f 100644
--- a/app/src/main/res/drawable/ic_arrow_length_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_length_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_arrow_material_grey600_24dp.xml b/app/src/main/res/drawable/ic_arrow_material_grey600_24dp.xml
index 04a5cf7a1..8283acf5b 100644
--- a/app/src/main/res/drawable/ic_arrow_material_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_material_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_arrow_nock_grey600_24dp.xml b/app/src/main/res/drawable/ic_arrow_nock_grey600_24dp.xml
index 1eefcdc85..1d2803d6d 100644
--- a/app/src/main/res/drawable/ic_arrow_nock_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_nock_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_arrow_number_accent_24dp.xml b/app/src/main/res/drawable/ic_arrow_number_accent_24dp.xml
index 6b477932d..1381114fd 100644
--- a/app/src/main/res/drawable/ic_arrow_number_accent_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_number_accent_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_arrow_number_grey600_24dp.xml b/app/src/main/res/drawable/ic_arrow_number_grey600_24dp.xml
index cc99d33f9..7d90285ff 100644
--- a/app/src/main/res/drawable/ic_arrow_number_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_number_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_arrow_number_off_grey600_24dp.xml b/app/src/main/res/drawable/ic_arrow_number_off_grey600_24dp.xml
index 54b648983..80608f1c0 100644
--- a/app/src/main/res/drawable/ic_arrow_number_off_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_number_off_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_arrow_spine_grey600_24dp.xml b/app/src/main/res/drawable/ic_arrow_spine_grey600_24dp.xml
index 0b77d314e..04238c203 100644
--- a/app/src/main/res/drawable/ic_arrow_spine_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_spine_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_arrow_tip_weight_grey600_24dp.xml b/app/src/main/res/drawable/ic_arrow_tip_weight_grey600_24dp.xml
index 2d9ce709d..897af1127 100644
--- a/app/src/main/res/drawable/ic_arrow_tip_weight_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_tip_weight_grey600_24dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -24,4 +24,4 @@
         android:fillColor="@color/md_grey_600"
         android:pathData="M1.5,13.5v-5.2h13.7c0,0,0.5,0,1,0.2c0.6,0.3,2.9,1.4,3.5,1.7c0.6,0.4,1.9,1.1,2.3,1.5c0.2,0.2,0.5,0.5,0,1
 c-0.7,0.8-5.5,3.5-5.5,3.5s-0.9,0.2-1.2,0.2c-0.3,0-13.8,0-13.8,0V13.5z"/>
-</vector>
\ No newline at end of file
+</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_vanes_grey600_24dp.xml b/app/src/main/res/drawable/ic_arrow_vanes_grey600_24dp.xml
index b27fe6b5a..17170740d 100644
--- a/app/src/main/res/drawable/ic_arrow_vanes_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_vanes_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_arrow_weight_grey600_24dp.xml b/app/src/main/res/drawable/ic_arrow_weight_grey600_24dp.xml
index 75a20a6c1..be618e4ac 100644
--- a/app/src/main/res/drawable/ic_arrow_weight_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_weight_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_backup_grey600_24dp.xml b/app/src/main/res/drawable/ic_backup_grey600_24dp.xml
index daa50d538..28e9ec4d3 100644
--- a/app/src/main/res/drawable/ic_backup_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_backup_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_bow_24dp.xml b/app/src/main/res/drawable/ic_bow_24dp.xml
index fa9ce08a6..7afc395f0 100644
--- a/app/src/main/res/drawable/ic_bow_24dp.xml
+++ b/app/src/main/res/drawable/ic_bow_24dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_bow_brace_height_grey600_24dp.xml b/app/src/main/res/drawable/ic_bow_brace_height_grey600_24dp.xml
index c00b82783..561ea0fea 100644
--- a/app/src/main/res/drawable/ic_bow_brace_height_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_bow_brace_height_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_bow_button_grey600_24dp.xml b/app/src/main/res/drawable/ic_bow_button_grey600_24dp.xml
index f79afbca1..b9f271914 100644
--- a/app/src/main/res/drawable/ic_bow_button_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_bow_button_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_bow_cam_grey600_24dp.xml b/app/src/main/res/drawable/ic_bow_cam_grey600_24dp.xml
index dbe285b2b..2b0cc0557 100644
--- a/app/src/main/res/drawable/ic_bow_cam_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_bow_cam_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_bow_clicker_grey600_24dp.xml b/app/src/main/res/drawable/ic_bow_clicker_grey600_24dp.xml
index 1033db167..ad935d9a9 100644
--- a/app/src/main/res/drawable/ic_bow_clicker_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_bow_clicker_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_bow_limb_grey600_24dp.xml b/app/src/main/res/drawable/ic_bow_limb_grey600_24dp.xml
index 90453a373..89d8c1003 100644
--- a/app/src/main/res/drawable/ic_bow_limb_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_bow_limb_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_bow_nocking_point_grey600_24dp.xml b/app/src/main/res/drawable/ic_bow_nocking_point_grey600_24dp.xml
index b6ded320d..6caecedf7 100644
--- a/app/src/main/res/drawable/ic_bow_nocking_point_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_bow_nocking_point_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_bow_rest_grey600_24dp.xml b/app/src/main/res/drawable/ic_bow_rest_grey600_24dp.xml
index f15a38854..9f6d47596 100644
--- a/app/src/main/res/drawable/ic_bow_rest_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_bow_rest_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_bow_scope_magnification_grey600_24dp.xml b/app/src/main/res/drawable/ic_bow_scope_magnification_grey600_24dp.xml
index b05da32c1..b89dbdceb 100644
--- a/app/src/main/res/drawable/ic_bow_scope_magnification_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_bow_scope_magnification_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_bow_sight_grey600_24dp.xml b/app/src/main/res/drawable/ic_bow_sight_grey600_24dp.xml
index 3e411ade0..20e9cb006 100644
--- a/app/src/main/res/drawable/ic_bow_sight_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_bow_sight_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_bow_stabilizer_grey600_24dp.xml b/app/src/main/res/drawable/ic_bow_stabilizer_grey600_24dp.xml
index 212b1db32..b93a2e7f3 100644
--- a/app/src/main/res/drawable/ic_bow_stabilizer_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_bow_stabilizer_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_bow_string_grey600_24dp.xml b/app/src/main/res/drawable/ic_bow_string_grey600_24dp.xml
index 77f82ce8b..d1384878f 100644
--- a/app/src/main/res/drawable/ic_bow_string_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_bow_string_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_bow_tiller_grey600_24dp.xml b/app/src/main/res/drawable/ic_bow_tiller_grey600_24dp.xml
index 82504821d..d84f93fdb 100644
--- a/app/src/main/res/drawable/ic_bow_tiller_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_bow_tiller_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_brand_grey600_24dp.xml b/app/src/main/res/drawable/ic_brand_grey600_24dp.xml
index 12e8d3524..d2b4cd8ea 100644
--- a/app/src/main/res/drawable/ic_brand_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_brand_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_bubble_chart_grey600_24dp.xml b/app/src/main/res/drawable/ic_bubble_chart_grey600_24dp.xml
index edd150b31..8f25ea623 100644
--- a/app/src/main/res/drawable/ic_bubble_chart_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_bubble_chart_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_cancel_grey600_24dp.xml b/app/src/main/res/drawable/ic_cancel_grey600_24dp.xml
index 694a18319..2b1cdd047 100644
--- a/app/src/main/res/drawable/ic_cancel_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_cancel_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_check_white_24dp.xml b/app/src/main/res/drawable/ic_check_white_24dp.xml
index 21ef65e87..365c8f36b 100644
--- a/app/src/main/res/drawable/ic_check_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_check_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_clear_filter_white_24dp.xml b/app/src/main/res/drawable/ic_clear_filter_white_24dp.xml
index 6bf784224..0e5aa4c5d 100644
--- a/app/src/main/res/drawable/ic_clear_filter_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_clear_filter_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_close_white_24dp.xml b/app/src/main/res/drawable/ic_close_white_24dp.xml
index 49263d771..e3d27d0fd 100644
--- a/app/src/main/res/drawable/ic_close_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_close_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_comment_grey600_24dp.xml b/app/src/main/res/drawable/ic_comment_grey600_24dp.xml
index dbfc4439a..e52a38a27 100644
--- a/app/src/main/res/drawable/ic_comment_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_comment_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_comment_white_24dp.xml b/app/src/main/res/drawable/ic_comment_white_24dp.xml
index f890cb80c..82f01f89c 100644
--- a/app/src/main/res/drawable/ic_comment_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_comment_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_create_white_24dp.xml b/app/src/main/res/drawable/ic_create_white_24dp.xml
index 0ec5a9e4a..7cf7a35f0 100644
--- a/app/src/main/res/drawable/ic_create_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_create_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_delete_black_24dp.xml b/app/src/main/res/drawable/ic_delete_black_24dp.xml
index 0eb4acfd4..0e398997a 100644
--- a/app/src/main/res/drawable/ic_delete_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_delete_black_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.xml b/app/src/main/res/drawable/ic_delete_white_24dp.xml
index 192088915..a5a6add41 100644
--- a/app/src/main/res/drawable/ic_delete_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_delete_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_description_grey600_24dp.xml b/app/src/main/res/drawable/ic_description_grey600_24dp.xml
index 0561760bb..2f35ef6fe 100644
--- a/app/src/main/res/drawable/ic_description_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_description_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_description_white_24dp.xml b/app/src/main/res/drawable/ic_description_white_24dp.xml
index 0fb9a22b6..63e7e6c78 100644
--- a/app/src/main/res/drawable/ic_description_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_description_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_excel_white_24dp.xml b/app/src/main/res/drawable/ic_excel_white_24dp.xml
index 8764969ba..e9783812b 100644
--- a/app/src/main/res/drawable/ic_excel_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_excel_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_expand_more_grey600_24dp.xml b/app/src/main/res/drawable/ic_expand_more_grey600_24dp.xml
index 6ce85aa3e..485ee9f1c 100644
--- a/app/src/main/res/drawable/ic_expand_more_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_expand_more_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_file_grey600_24dp.xml b/app/src/main/res/drawable/ic_file_grey600_24dp.xml
index 5dd0aec6a..a0e85a273 100644
--- a/app/src/main/res/drawable/ic_file_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_file_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_filter_white_24dp.xml b/app/src/main/res/drawable/ic_filter_white_24dp.xml
index 25eda54b7..5cdd5917d 100644
--- a/app/src/main/res/drawable/ic_filter_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_filter_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_google_drive_grey600_24dp.xml b/app/src/main/res/drawable/ic_google_drive_grey600_24dp.xml
index f3af0ebe6..db2b9a1c6 100644
--- a/app/src/main/res/drawable/ic_google_drive_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_google_drive_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_help_grey600_24dp.xml b/app/src/main/res/drawable/ic_help_grey600_24dp.xml
index 5aa69e377..6d3cb698b 100644
--- a/app/src/main/res/drawable/ic_help_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_help_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_home_grey600_24dp.xml b/app/src/main/res/drawable/ic_home_grey600_24dp.xml
index 711fd93b5..fa631d970 100644
--- a/app/src/main/res/drawable/ic_home_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_home_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_house.xml b/app/src/main/res/drawable/ic_house.xml
index c45fceba6..bcd8de01b 100644
--- a/app/src/main/res/drawable/ic_house.xml
+++ b/app/src/main/res/drawable/ic_house.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_house_24dp.xml b/app/src/main/res/drawable/ic_house_24dp.xml
index e2afea264..dbc28d677 100644
--- a/app/src/main/res/drawable/ic_house_24dp.xml
+++ b/app/src/main/res/drawable/ic_house_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_image_grey600_24dp.xml b/app/src/main/res/drawable/ic_image_grey600_24dp.xml
index 3dd3c1684..c6c63fad9 100644
--- a/app/src/main/res/drawable/ic_image_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_image_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_image_white_24dp.xml b/app/src/main/res/drawable/ic_image_white_24dp.xml
index 2d8b8ba78..c0706901d 100644
--- a/app/src/main/res/drawable/ic_image_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_image_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_input_grey600_24dp.xml b/app/src/main/res/drawable/ic_input_grey600_24dp.xml
index 672ae1527..42fb05936 100644
--- a/app/src/main/res/drawable/ic_input_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_input_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_keyboard_grey600_24dp.xml b/app/src/main/res/drawable/ic_keyboard_grey600_24dp.xml
index d54ead4d6..a2656b688 100644
--- a/app/src/main/res/drawable/ic_keyboard_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_keyboard_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_language_grey600_24dp.xml b/app/src/main/res/drawable/ic_language_grey600_24dp.xml
index 047aab7fb..8338a3b90 100644
--- a/app/src/main/res/drawable/ic_language_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_language_grey600_24dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_maximum_score_grey600_24dp.xml b/app/src/main/res/drawable/ic_maximum_score_grey600_24dp.xml
index a7198bb3e..6a3c07246 100644
--- a/app/src/main/res/drawable/ic_maximum_score_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_maximum_score_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_micro_sd_card_grey600_24dp.xml b/app/src/main/res/drawable/ic_micro_sd_card_grey600_24dp.xml
index 8de9adf78..577d3e5c8 100644
--- a/app/src/main/res/drawable/ic_micro_sd_card_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_micro_sd_card_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_pan_tool_grey600_24dp.xml b/app/src/main/res/drawable/ic_pan_tool_grey600_24dp.xml
index 897b305ed..a94e2abce 100644
--- a/app/src/main/res/drawable/ic_pan_tool_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_pan_tool_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_percentage_grey600_24dp.xml b/app/src/main/res/drawable/ic_percentage_grey600_24dp.xml
index d9968338d..db31436a5 100644
--- a/app/src/main/res/drawable/ic_percentage_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_percentage_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_person_grey600_24dp.xml b/app/src/main/res/drawable/ic_person_grey600_24dp.xml
index f32475e31..6370b1180 100644
--- a/app/src/main/res/drawable/ic_person_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_person_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_phone_android_grey600_24dp.xml b/app/src/main/res/drawable/ic_phone_android_grey600_24dp.xml
index 96d96d5b4..d1970d9df 100644
--- a/app/src/main/res/drawable/ic_phone_android_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_phone_android_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_photo_camera_white_24dp.xml b/app/src/main/res/drawable/ic_photo_camera_white_24dp.xml
index aa853652a..08f6a309e 100644
--- a/app/src/main/res/drawable/ic_photo_camera_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_photo_camera_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_print_white_24dp.xml b/app/src/main/res/drawable/ic_print_white_24dp.xml
index f0e1dc6fd..37398e1e8 100644
--- a/app/src/main/res/drawable/ic_print_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_print_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_query_builder_grey600_24dp.xml b/app/src/main/res/drawable/ic_query_builder_grey600_24dp.xml
index 1c9e2a886..8b5bca1bb 100644
--- a/app/src/main/res/drawable/ic_query_builder_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_query_builder_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_reached_score_grey600_24dp.xml b/app/src/main/res/drawable/ic_reached_score_grey600_24dp.xml
index eb53982f2..da2e4851a 100644
--- a/app/src/main/res/drawable/ic_reached_score_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_reached_score_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_screen_lock_portrait_grey600_24dp.xml b/app/src/main/res/drawable/ic_screen_lock_portrait_grey600_24dp.xml
index 3a287262f..9f0790cd1 100644
--- a/app/src/main/res/drawable/ic_screen_lock_portrait_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_screen_lock_portrait_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_search_white_24dp.xml b/app/src/main/res/drawable/ic_search_white_24dp.xml
index 0f87fa334..4c0cbc012 100644
--- a/app/src/main/res/drawable/ic_search_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_search_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_settings_grey600_24dp.xml b/app/src/main/res/drawable/ic_settings_grey600_24dp.xml
index ae6daaa1e..3c43a4a9c 100644
--- a/app/src/main/res/drawable/ic_settings_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_settings_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_settings_white_24dp.xml b/app/src/main/res/drawable/ic_settings_white_24dp.xml
index 1812f7108..5eca8ff74 100644
--- a/app/src/main/res/drawable/ic_settings_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_settings_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_share_white_24dp.xml b/app/src/main/res/drawable/ic_share_white_24dp.xml
index 7c79743fe..c69773b61 100644
--- a/app/src/main/res/drawable/ic_share_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_share_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_show_chart_grey600_24dp.xml b/app/src/main/res/drawable/ic_show_chart_grey600_24dp.xml
index 351ff91b8..9ab99a0f9 100644
--- a/app/src/main/res/drawable/ic_show_chart_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_show_chart_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_show_chart_white_24dp.xml b/app/src/main/res/drawable/ic_show_chart_white_24dp.xml
index c214d7acf..bc79b4f75 100644
--- a/app/src/main/res/drawable/ic_show_chart_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_show_chart_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_sorting_grey600_24dp.xml b/app/src/main/res/drawable/ic_sorting_grey600_24dp.xml
index 7bcf0a766..0b1bffb82 100644
--- a/app/src/main/res/drawable/ic_sorting_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_sorting_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_target_spot_face_grey600_24dp.xml b/app/src/main/res/drawable/ic_target_spot_face_grey600_24dp.xml
index fe5920734..025d5afc9 100644
--- a/app/src/main/res/drawable/ic_target_spot_face_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_target_spot_face_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_timer_grey600_24dp.xml b/app/src/main/res/drawable/ic_timer_grey600_24dp.xml
index 47eb20952..18fbb7913 100644
--- a/app/src/main/res/drawable/ic_timer_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_timer_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_timer_off_white_24dp.xml b/app/src/main/res/drawable/ic_timer_off_white_24dp.xml
index eaeb79dd2..7036a2cc2 100644
--- a/app/src/main/res/drawable/ic_timer_off_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_timer_off_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_timer_white_24dp.xml b/app/src/main/res/drawable/ic_timer_white_24dp.xml
index 0d625ae93..b88ad92d3 100644
--- a/app/src/main/res/drawable/ic_timer_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_timer_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_title_grey600_24dp.xml b/app/src/main/res/drawable/ic_title_grey600_24dp.xml
index cbc0ddf79..1313b3fe5 100644
--- a/app/src/main/res/drawable/ic_title_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_title_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_trending_up_white_24dp.xml b/app/src/main/res/drawable/ic_trending_up_white_24dp.xml
index 3bd812dc9..2b57043d5 100644
--- a/app/src/main/res/drawable/ic_trending_up_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_trending_up_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_view_list_grey600_24dp.xml b/app/src/main/res/drawable/ic_view_list_grey600_24dp.xml
index f31d101a9..2e7927313 100644
--- a/app/src/main/res/drawable/ic_view_list_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_view_list_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_visibility_grey600_24dp.xml b/app/src/main/res/drawable/ic_visibility_grey600_24dp.xml
index 13c92a60b..45e615af3 100644
--- a/app/src/main/res/drawable/ic_visibility_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_visibility_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/ic_zoom_in_grey600_24dp.xml b/app/src/main/res/drawable/ic_zoom_in_grey600_24dp.xml
index e9e7aa25c..9897177ab 100644
--- a/app/src/main/res/drawable/ic_zoom_in_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_zoom_in_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/intro_screen_1.xml b/app/src/main/res/drawable/intro_screen_1.xml
index 240d9e2eb..7fe1d7b11 100644
--- a/app/src/main/res/drawable/intro_screen_1.xml
+++ b/app/src/main/res/drawable/intro_screen_1.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="128dp"
         android:height="128dp"
diff --git a/app/src/main/res/drawable/intro_screen_2.xml b/app/src/main/res/drawable/intro_screen_2.xml
index 6fa525b28..8e8c3aa5a 100644
--- a/app/src/main/res/drawable/intro_screen_2.xml
+++ b/app/src/main/res/drawable/intro_screen_2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/launch_screen.xml b/app/src/main/res/drawable/launch_screen.xml
index 44d2fe9f1..d0aa01f7e 100644
--- a/app/src/main/res/drawable/launch_screen.xml
+++ b/app/src/main/res/drawable/launch_screen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -30,4 +30,4 @@
             android:gravity="bottom|center"
             android:src="@drawable/brand_name_48dp"/>
     </item>
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/app/src/main/res/drawable/md_background_centered.xml b/app/src/main/res/drawable/md_background_centered.xml
index 4ee110654..94a241150 100644
--- a/app/src/main/res/drawable/md_background_centered.xml
+++ b/app/src/main/res/drawable/md_background_centered.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/drawable/selector_item_light.xml b/app/src/main/res/drawable/selector_item_light.xml
index e5131ab63..a4b657b9b 100644
--- a/app/src/main/res/drawable/selector_item_light.xml
+++ b/app/src/main/res/drawable/selector_item_light.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -22,4 +22,4 @@
     <item android:state_activated="true" android:drawable="@color/list_choice_pressed_bg_light"/>
     <item android:drawable="@color/md_white_1000"/>
 
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/drawable/table_cell_border.xml b/app/src/main/res/drawable/table_cell_border.xml
index 65dccb5c1..48f754986 100644
--- a/app/src/main/res/drawable/table_cell_border.xml
+++ b/app/src/main/res/drawable/table_cell_border.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/activity_arrow_ranking_details.xml b/app/src/main/res/layout/activity_arrow_ranking_details.xml
index e998cbd41..9169d0db9 100644
--- a/app/src/main/res/layout/activity_arrow_ranking_details.xml
+++ b/app/src/main/res/layout/activity_arrow_ranking_details.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/activity_gallery.xml b/app/src/main/res/layout/activity_gallery.xml
index 3b0d3ac4e..9931596b5 100755
--- a/app/src/main/res/layout/activity_gallery.xml
+++ b/app/src/main/res/layout/activity_gallery.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto">
 
diff --git a/app/src/main/res/layout/activity_input.xml b/app/src/main/res/layout/activity_input.xml
index 48252e4d4..b8183157e 100644
--- a/app/src/main/res/layout/activity_input.xml
+++ b/app/src/main/res/layout/activity_input.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d031896b4..365b1a107 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/activity_statistics.xml b/app/src/main/res/layout/activity_statistics.xml
index 59effdb96..ac192b9e0 100644
--- a/app/src/main/res/layout/activity_statistics.xml
+++ b/app/src/main/res/layout/activity_statistics.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/dialog_comment.xml b/app/src/main/res/layout/dialog_comment.xml
index 44d9a2f63..912d6e6be 100644
--- a/app/src/main/res/layout/dialog_comment.xml
+++ b/app/src/main/res/layout/dialog_comment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fab_menu_item_end.xml b/app/src/main/res/layout/fab_menu_item_end.xml
index 5ebd5ba8f..cc3a4a5cf 100755
--- a/app/src/main/res/layout/fab_menu_item_end.xml
+++ b/app/src/main/res/layout/fab_menu_item_end.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fab_speed_dial_bottom.xml b/app/src/main/res/layout/fab_speed_dial_bottom.xml
index 6c4b34c7a..9431a8d43 100755
--- a/app/src/main/res/layout/fab_speed_dial_bottom.xml
+++ b/app/src/main/res/layout/fab_speed_dial_bottom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_arrows.xml b/app/src/main/res/layout/fragment_arrows.xml
index 500c32a44..8c7de7b52 100644
--- a/app/src/main/res/layout/fragment_arrows.xml
+++ b/app/src/main/res/layout/fragment_arrows.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_backup.xml b/app/src/main/res/layout/fragment_backup.xml
index 77745bfab..43b1915ad 100644
--- a/app/src/main/res/layout/fragment_backup.xml
+++ b/app/src/main/res/layout/fragment_backup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_bows.xml b/app/src/main/res/layout/fragment_bows.xml
index e2eb08a95..e9c09c091 100644
--- a/app/src/main/res/layout/fragment_bows.xml
+++ b/app/src/main/res/layout/fragment_bows.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_distance.xml b/app/src/main/res/layout/fragment_distance.xml
index 3a799d905..38a9d267a 100644
--- a/app/src/main/res/layout/fragment_distance.xml
+++ b/app/src/main/res/layout/fragment_distance.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_edit_arrow.xml b/app/src/main/res/layout/fragment_edit_arrow.xml
index 41d32e5d2..71b990e71 100644
--- a/app/src/main/res/layout/fragment_edit_arrow.xml
+++ b/app/src/main/res/layout/fragment_edit_arrow.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_edit_bow.xml b/app/src/main/res/layout/fragment_edit_bow.xml
index 64c5137d3..f073974e4 100644
--- a/app/src/main/res/layout/fragment_edit_bow.xml
+++ b/app/src/main/res/layout/fragment_edit_bow.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_edit_image.xml b/app/src/main/res/layout/fragment_edit_image.xml
index 2ba2d67d0..7ff40ebd0 100644
--- a/app/src/main/res/layout/fragment_edit_image.xml
+++ b/app/src/main/res/layout/fragment_edit_image.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_edit_round.xml b/app/src/main/res/layout/fragment_edit_round.xml
index c0afcfb52..17e692502 100644
--- a/app/src/main/res/layout/fragment_edit_round.xml
+++ b/app/src/main/res/layout/fragment_edit_round.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_edit_standard_round.xml b/app/src/main/res/layout/fragment_edit_standard_round.xml
index 3370d0dc9..fc54244ca 100644
--- a/app/src/main/res/layout/fragment_edit_standard_round.xml
+++ b/app/src/main/res/layout/fragment_edit_standard_round.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_edit_training.xml b/app/src/main/res/layout/fragment_edit_training.xml
index 359702e00..0648805ab 100644
--- a/app/src/main/res/layout/fragment_edit_training.xml
+++ b/app/src/main/res/layout/fragment_edit_training.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_environment.xml b/app/src/main/res/layout/fragment_environment.xml
index 80984cebd..8faca2ec5 100644
--- a/app/src/main/res/layout/fragment_environment.xml
+++ b/app/src/main/res/layout/fragment_environment.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_list.xml b/app/src/main/res/layout/fragment_list.xml
index b7253d1e1..2037b72b8 100644
--- a/app/src/main/res/layout/fragment_list.xml
+++ b/app/src/main/res/layout/fragment_list.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_scoreboard.xml b/app/src/main/res/layout/fragment_scoreboard.xml
index dab9f3015..b981be58e 100644
--- a/app/src/main/res/layout/fragment_scoreboard.xml
+++ b/app/src/main/res/layout/fragment_scoreboard.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_signature.xml b/app/src/main/res/layout/fragment_signature.xml
index 659753f2d..1c31502d1 100644
--- a/app/src/main/res/layout/fragment_signature.xml
+++ b/app/src/main/res/layout/fragment_signature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_statistics.xml b/app/src/main/res/layout/fragment_statistics.xml
index 5d383c47b..2e0c3494e 100644
--- a/app/src/main/res/layout/fragment_statistics.xml
+++ b/app/src/main/res/layout/fragment_statistics.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_target_select.xml b/app/src/main/res/layout/fragment_target_select.xml
index 15e6be835..38b3a0c30 100644
--- a/app/src/main/res/layout/fragment_target_select.xml
+++ b/app/src/main/res/layout/fragment_target_select.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_timer.xml b/app/src/main/res/layout/fragment_timer.xml
index 50bd1c7aa..94f22bc11 100644
--- a/app/src/main/res/layout/fragment_timer.xml
+++ b/app/src/main/res/layout/fragment_timer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_training.xml b/app/src/main/res/layout/fragment_training.xml
index 14cfe8d54..581425932 100644
--- a/app/src/main/res/layout/fragment_training.xml
+++ b/app/src/main/res/layout/fragment_training.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_trainings.xml b/app/src/main/res/layout/fragment_trainings.xml
index 4ff97c119..de6b5389c 100644
--- a/app/src/main/res/layout/fragment_trainings.xml
+++ b/app/src/main/res/layout/fragment_trainings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/fragment_web.xml b/app/src/main/res/layout/fragment_web.xml
index 554afb18e..4fc73e0f1 100644
--- a/app/src/main/res/layout/fragment_web.xml
+++ b/app/src/main/res/layout/fragment_web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/item_arrow_number.xml b/app/src/main/res/layout/item_arrow_number.xml
index 31ac4a0fc..88b87237a 100644
--- a/app/src/main/res/layout/item_arrow_number.xml
+++ b/app/src/main/res/layout/item_arrow_number.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/item_details_secondary_action.xml b/app/src/main/res/layout/item_details_secondary_action.xml
index 1c73c5eeb..77e264b1c 100644
--- a/app/src/main/res/layout/item_details_secondary_action.xml
+++ b/app/src/main/res/layout/item_details_secondary_action.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/item_distance.xml b/app/src/main/res/layout/item_distance.xml
index cf9210474..9604ab4a6 100644
--- a/app/src/main/res/layout/item_distance.xml
+++ b/app/src/main/res/layout/item_distance.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/item_donation.xml b/app/src/main/res/layout/item_donation.xml
index 31abbbc62..0065c6aaf 100644
--- a/app/src/main/res/layout/item_donation.xml
+++ b/app/src/main/res/layout/item_donation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/item_end.xml b/app/src/main/res/layout/item_end.xml
index 26ad15132..71b047daf 100644
--- a/app/src/main/res/layout/item_end.xml
+++ b/app/src/main/res/layout/item_end.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/item_header.xml b/app/src/main/res/layout/item_header.xml
index e087b0533..39ea2a427 100644
--- a/app/src/main/res/layout/item_header.xml
+++ b/app/src/main/res/layout/item_header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/item_header_expandable.xml b/app/src/main/res/layout/item_header_expandable.xml
index 5e4d5e90b..79f053394 100644
--- a/app/src/main/res/layout/item_header_expandable.xml
+++ b/app/src/main/res/layout/item_header_expandable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/item_image_details.xml b/app/src/main/res/layout/item_image_details.xml
index 43332c726..a2062981c 100644
--- a/app/src/main/res/layout/item_image_details.xml
+++ b/app/src/main/res/layout/item_image_details.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/item_image_horizontal.xml b/app/src/main/res/layout/item_image_horizontal.xml
index fd450cfe6..b8dd10edb 100755
--- a/app/src/main/res/layout/item_image_horizontal.xml
+++ b/app/src/main/res/layout/item_image_horizontal.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
              xmlns:app="http://schemas.android.com/apk/res-auto"
              android:layout_width="70dp"
diff --git a/app/src/main/res/layout/item_image_simple.xml b/app/src/main/res/layout/item_image_simple.xml
index b12e048b7..46e20b753 100644
--- a/app/src/main/res/layout/item_image_simple.xml
+++ b/app/src/main/res/layout/item_image_simple.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/item_round.xml b/app/src/main/res/layout/item_round.xml
index 130685c89..5fdaca923 100644
--- a/app/src/main/res/layout/item_round.xml
+++ b/app/src/main/res/layout/item_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/item_round_template.xml b/app/src/main/res/layout/item_round_template.xml
index 1b8886e66..d0212cf30 100644
--- a/app/src/main/res/layout/item_round_template.xml
+++ b/app/src/main/res/layout/item_round_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/item_sight_mark.xml b/app/src/main/res/layout/item_sight_mark.xml
index 41f18c4a5..eb5d892c7 100644
--- a/app/src/main/res/layout/item_sight_mark.xml
+++ b/app/src/main/res/layout/item_sight_mark.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/item_standard_round.xml b/app/src/main/res/layout/item_standard_round.xml
index 152c414d0..2e9f585c8 100644
--- a/app/src/main/res/layout/item_standard_round.xml
+++ b/app/src/main/res/layout/item_standard_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/item_text.xml b/app/src/main/res/layout/item_text.xml
index 142634929..4e61a2a04 100644
--- a/app/src/main/res/layout/item_text.xml
+++ b/app/src/main/res/layout/item_text.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/item_training.xml b/app/src/main/res/layout/item_training.xml
index acfae2958..02d9f32dc 100644
--- a/app/src/main/res/layout/item_training.xml
+++ b/app/src/main/res/layout/item_training.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/layout_number_picker.xml b/app/src/main/res/layout/layout_number_picker.xml
index eb64979a6..af4ec1305 100644
--- a/app/src/main/res/layout/layout_number_picker.xml
+++ b/app/src/main/res/layout/layout_number_picker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/layout_switch_label.xml b/app/src/main/res/layout/layout_switch_label.xml
index ebe8f6252..a242aa961 100644
--- a/app/src/main/res/layout/layout_switch_label.xml
+++ b/app/src/main/res/layout/layout_switch_label.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/navigation_drawer_header.xml b/app/src/main/res/layout/navigation_drawer_header.xml
index 2722d8153..a50503e24 100644
--- a/app/src/main/res/layout/navigation_drawer_header.xml
+++ b/app/src/main/res/layout/navigation_drawer_header.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/pager_item.xml b/app/src/main/res/layout/pager_item.xml
index 7fe640112..7b78a3f6a 100755
--- a/app/src/main/res/layout/pager_item.xml
+++ b/app/src/main/res/layout/pager_item.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/partial_divider_full.xml b/app/src/main/res/layout/partial_divider_full.xml
index e7194987a..a61cccdfd 100644
--- a/app/src/main/res/layout/partial_divider_full.xml
+++ b/app/src/main/res/layout/partial_divider_full.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/partial_empty_state.xml b/app/src/main/res/layout/partial_empty_state.xml
index 7d52428dd..96f2934d1 100644
--- a/app/src/main/res/layout/partial_empty_state.xml
+++ b/app/src/main/res/layout/partial_empty_state.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/partial_scoreboard_signatures.xml b/app/src/main/res/layout/partial_scoreboard_signatures.xml
index e35c964a9..83a87a137 100644
--- a/app/src/main/res/layout/partial_scoreboard_signatures.xml
+++ b/app/src/main/res/layout/partial_scoreboard_signatures.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/partial_target_view.xml b/app/src/main/res/layout/partial_target_view.xml
index d19f20949..e1c24319e 100644
--- a/app/src/main/res/layout/partial_target_view.xml
+++ b/app/src/main/res/layout/partial_target_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/preference_image_details.xml b/app/src/main/res/layout/preference_image_details.xml
index b048c5586..fae9a358c 100644
--- a/app/src/main/res/layout/preference_image_details.xml
+++ b/app/src/main/res/layout/preference_image_details.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/selector_item_distance.xml b/app/src/main/res/layout/selector_item_distance.xml
index 3bc8115be..9dc759567 100644
--- a/app/src/main/res/layout/selector_item_distance.xml
+++ b/app/src/main/res/layout/selector_item_distance.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/selector_item_image_details.xml b/app/src/main/res/layout/selector_item_image_details.xml
index 248e482b7..b5194d1ab 100644
--- a/app/src/main/res/layout/selector_item_image_details.xml
+++ b/app/src/main/res/layout/selector_item_image_details.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/selector_item_process.xml b/app/src/main/res/layout/selector_item_process.xml
index 3ec425112..0c4d7cd5f 100644
--- a/app/src/main/res/layout/selector_item_process.xml
+++ b/app/src/main/res/layout/selector_item_process.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/selector_item_simple_text.xml b/app/src/main/res/layout/selector_item_simple_text.xml
index e3b1c15a1..a9d83e45e 100644
--- a/app/src/main/res/layout/selector_item_simple_text.xml
+++ b/app/src/main/res/layout/selector_item_simple_text.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/layout/view_chips.xml b/app/src/main/res/layout/view_chips.xml
index 3a7eb44bb..189052154 100755
--- a/app/src/main/res/layout/view_chips.xml
+++ b/app/src/main/res/layout/view_chips.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/menu/bottom_navigation_main.xml b/app/src/main/res/menu/bottom_navigation_main.xml
index 5e1bb3aef..c81b30ed8 100644
--- a/app/src/main/res/menu/bottom_navigation_main.xml
+++ b/app/src/main/res/menu/bottom_navigation_main.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/menu/context_menu_edit_delete.xml b/app/src/main/res/menu/context_menu_edit_delete.xml
index c1f5aea81..e3bb4dd0a 100644
--- a/app/src/main/res/menu/context_menu_edit_delete.xml
+++ b/app/src/main/res/menu/context_menu_edit_delete.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/menu/context_menu_image.xml b/app/src/main/res/menu/context_menu_image.xml
index c86da1ccf..7bd1d87fd 100644
--- a/app/src/main/res/menu/context_menu_image.xml
+++ b/app/src/main/res/menu/context_menu_image.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -22,4 +22,4 @@
     <item
         android:id="@+id/action_from_gallery"
         android:title="@string/pick_from_gallery"/>
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/environment_switch.xml b/app/src/main/res/menu/environment_switch.xml
index 86ff8bca6..f7b90ffb5 100644
--- a/app/src/main/res/menu/environment_switch.xml
+++ b/app/src/main/res/menu/environment_switch.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/menu/export_filter.xml b/app/src/main/res/menu/export_filter.xml
index b19f95298..2b7804ad3 100644
--- a/app/src/main/res/menu/export_filter.xml
+++ b/app/src/main/res/menu/export_filter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/menu/fab_bows.xml b/app/src/main/res/menu/fab_bows.xml
index bb62a4667..70916ea02 100644
--- a/app/src/main/res/menu/fab_bows.xml
+++ b/app/src/main/res/menu/fab_bows.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/menu/fab_trainings.xml b/app/src/main/res/menu/fab_trainings.xml
index d7bd79c68..e6b3de33b 100644
--- a/app/src/main/res/menu/fab_trainings.xml
+++ b/app/src/main/res/menu/fab_trainings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/menu/gallery.xml b/app/src/main/res/menu/gallery.xml
index 8152067b9..211f27ee7 100644
--- a/app/src/main/res/menu/gallery.xml
+++ b/app/src/main/res/menu/gallery.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/menu/help.xml b/app/src/main/res/menu/help.xml
index a4dbd0bbc..c11c87f46 100644
--- a/app/src/main/res/menu/help.xml
+++ b/app/src/main/res/menu/help.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/menu/input_end.xml b/app/src/main/res/menu/input_end.xml
index af0176c7c..dbed575c7 100644
--- a/app/src/main/res/menu/input_end.xml
+++ b/app/src/main/res/menu/input_end.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/menu/menu_scoreboard.xml b/app/src/main/res/menu/menu_scoreboard.xml
index d7c0bb126..1c62d8600 100644
--- a/app/src/main/res/menu/menu_scoreboard.xml
+++ b/app/src/main/res/menu/menu_scoreboard.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/menu/navigation_drawer_main.xml b/app/src/main/res/menu/navigation_drawer_main.xml
index 4b71a6dbf..2065c702e 100644
--- a/app/src/main/res/menu/navigation_drawer_main.xml
+++ b/app/src/main/res/menu/navigation_drawer_main.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/menu/save.xml b/app/src/main/res/menu/save.xml
index 839f5a65a..cbcb9d539 100644
--- a/app/src/main/res/menu/save.xml
+++ b/app/src/main/res/menu/save.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -23,4 +23,4 @@
         android:title="@string/save"
         app:showAsAction="ifRoom"/>
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/search.xml b/app/src/main/res/menu/search.xml
index 5eed4ba6f..26ac9dd49 100644
--- a/app/src/main/res/menu/search.xml
+++ b/app/src/main/res/menu/search.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -24,4 +24,4 @@
         app:showAsAction="collapseActionView|ifRoom"
         app:actionViewClass="android.support.v7.widget.SearchView"/>
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/settings_backup.xml b/app/src/main/res/menu/settings_backup.xml
index fb913117d..32f2a9b53 100644
--- a/app/src/main/res/menu/settings_backup.xml
+++ b/app/src/main/res/menu/settings_backup.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/menu/statistics.xml b/app/src/main/res/menu/statistics.xml
index b647d025b..486e57903 100644
--- a/app/src/main/res/menu/statistics.xml
+++ b/app/src/main/res/menu/statistics.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/menu/statistics_scoresheet.xml b/app/src/main/res/menu/statistics_scoresheet.xml
index 30b57a325..3c2312b8a 100644
--- a/app/src/main/res/menu/statistics_scoresheet.xml
+++ b/app/src/main/res/menu/statistics_scoresheet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 27a641edf..33b4b480f 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -17,4 +17,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/launcherBackground"/>
     <foreground android:drawable="@drawable/launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/app/src/main/res/raw-af-rZA/help.html b/app/src/main/res/raw-af-rZA/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-af-rZA/help.html
+++ b/app/src/main/res/raw-af-rZA/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-ar-rSA/help.html b/app/src/main/res/raw-ar-rSA/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-ar-rSA/help.html
+++ b/app/src/main/res/raw-ar-rSA/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-ca-rES/help.html b/app/src/main/res/raw-ca-rES/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-ca-rES/help.html
+++ b/app/src/main/res/raw-ca-rES/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-cs-rCZ/help.html b/app/src/main/res/raw-cs-rCZ/help.html
index 882c425f6..17712ad4f 100644
--- a/app/src/main/res/raw-cs-rCZ/help.html
+++ b/app/src/main/res/raw-cs-rCZ/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-da-rDK/help.html b/app/src/main/res/raw-da-rDK/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-da-rDK/help.html
+++ b/app/src/main/res/raw-da-rDK/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-de-rDE/help.html b/app/src/main/res/raw-de-rDE/help.html
index 389bb2ba0..c8d13876e 100644
--- a/app/src/main/res/raw-de-rDE/help.html
+++ b/app/src/main/res/raw-de-rDE/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-el-rGR/help.html b/app/src/main/res/raw-el-rGR/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-el-rGR/help.html
+++ b/app/src/main/res/raw-el-rGR/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-es-rES/help.html b/app/src/main/res/raw-es-rES/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-es-rES/help.html
+++ b/app/src/main/res/raw-es-rES/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-et-rEE/help.html b/app/src/main/res/raw-et-rEE/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-et-rEE/help.html
+++ b/app/src/main/res/raw-et-rEE/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-fi-rFI/help.html b/app/src/main/res/raw-fi-rFI/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-fi-rFI/help.html
+++ b/app/src/main/res/raw-fi-rFI/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-fr-rFR/help.html b/app/src/main/res/raw-fr-rFR/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-fr-rFR/help.html
+++ b/app/src/main/res/raw-fr-rFR/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-hu-rHU/help.html b/app/src/main/res/raw-hu-rHU/help.html
index 3028a92de..caaa020a4 100644
--- a/app/src/main/res/raw-hu-rHU/help.html
+++ b/app/src/main/res/raw-hu-rHU/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-in-rID/help.html b/app/src/main/res/raw-in-rID/help.html
index 432370c69..903d9c1ab 100644
--- a/app/src/main/res/raw-in-rID/help.html
+++ b/app/src/main/res/raw-in-rID/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-it-rIT/help.html b/app/src/main/res/raw-it-rIT/help.html
index b7333ebce..7c5ffeb8e 100644
--- a/app/src/main/res/raw-it-rIT/help.html
+++ b/app/src/main/res/raw-it-rIT/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-iw-rIL/help.html b/app/src/main/res/raw-iw-rIL/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-iw-rIL/help.html
+++ b/app/src/main/res/raw-iw-rIL/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-ja-rJP/help.html b/app/src/main/res/raw-ja-rJP/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-ja-rJP/help.html
+++ b/app/src/main/res/raw-ja-rJP/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-ko-rKR/help.html b/app/src/main/res/raw-ko-rKR/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-ko-rKR/help.html
+++ b/app/src/main/res/raw-ko-rKR/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-nl-rNL/help.html b/app/src/main/res/raw-nl-rNL/help.html
index db2a468ba..1cf8b7b8a 100644
--- a/app/src/main/res/raw-nl-rNL/help.html
+++ b/app/src/main/res/raw-nl-rNL/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-no-rNO/help.html b/app/src/main/res/raw-no-rNO/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-no-rNO/help.html
+++ b/app/src/main/res/raw-no-rNO/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-pl-rPL/help.html b/app/src/main/res/raw-pl-rPL/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-pl-rPL/help.html
+++ b/app/src/main/res/raw-pl-rPL/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-pt-rBR/help.html b/app/src/main/res/raw-pt-rBR/help.html
index a54a67e0a..c2e1eb4dd 100644
--- a/app/src/main/res/raw-pt-rBR/help.html
+++ b/app/src/main/res/raw-pt-rBR/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-pt-rPT/help.html b/app/src/main/res/raw-pt-rPT/help.html
index a54a67e0a..c2e1eb4dd 100644
--- a/app/src/main/res/raw-pt-rPT/help.html
+++ b/app/src/main/res/raw-pt-rPT/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-ro-rRO/help.html b/app/src/main/res/raw-ro-rRO/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-ro-rRO/help.html
+++ b/app/src/main/res/raw-ro-rRO/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-ru-rRU/help.html b/app/src/main/res/raw-ru-rRU/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-ru-rRU/help.html
+++ b/app/src/main/res/raw-ru-rRU/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-sk-rSK/help.html b/app/src/main/res/raw-sk-rSK/help.html
index 1f0fd382d..218f9887e 100644
--- a/app/src/main/res/raw-sk-rSK/help.html
+++ b/app/src/main/res/raw-sk-rSK/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-sl-rSI/help.html b/app/src/main/res/raw-sl-rSI/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-sl-rSI/help.html
+++ b/app/src/main/res/raw-sl-rSI/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-sr-rSP/help.html b/app/src/main/res/raw-sr-rSP/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-sr-rSP/help.html
+++ b/app/src/main/res/raw-sr-rSP/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-sv-rSE/help.html b/app/src/main/res/raw-sv-rSE/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-sv-rSE/help.html
+++ b/app/src/main/res/raw-sv-rSE/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-tr-rTR/help.html b/app/src/main/res/raw-tr-rTR/help.html
index 114713075..27c3192cd 100644
--- a/app/src/main/res/raw-tr-rTR/help.html
+++ b/app/src/main/res/raw-tr-rTR/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-uk-rUA/help.html b/app/src/main/res/raw-uk-rUA/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-uk-rUA/help.html
+++ b/app/src/main/res/raw-uk-rUA/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-vi-rVN/help.html b/app/src/main/res/raw-vi-rVN/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-vi-rVN/help.html
+++ b/app/src/main/res/raw-vi-rVN/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-zh-rCN/help.html b/app/src/main/res/raw-zh-rCN/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-zh-rCN/help.html
+++ b/app/src/main/res/raw-zh-rCN/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw-zh-rTW/help.html b/app/src/main/res/raw-zh-rTW/help.html
index bfe5683e0..1b02bc801 100644
--- a/app/src/main/res/raw-zh-rTW/help.html
+++ b/app/src/main/res/raw-zh-rTW/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/raw/help.html b/app/src/main/res/raw/help.html
index 6164ba20b..e92e3bdac 100644
--- a/app/src/main/res/raw/help.html
+++ b/app/src/main/res/raw/help.html
@@ -1,4 +1,19 @@
 <!DOCTYPE html>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 6bd554056..2c68391f0 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Options</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 3a435f06b..604313c4f 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Options</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 899ff5c34..0ab7d55dd 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Opcions</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 15354ffd6..0b6433f85 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Možnosti</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 97ebf036d..1d388f547 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Indstillinger</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0ffea4bbc..43db1d65d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Einstellungen</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 6bd554056..2c68391f0 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Options</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index e7532cbb7..b2ea4a057 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Opciones</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 382aa49f7..c38812f66 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Seaded</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 26293aa5d..4a67548b6 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Asetukset</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6173e7989..e03008129 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Options</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 3c5150681..b348dc350 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Beállítások</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 8894ed8c2..28320c77c 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Opsi</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 6f39b477b..971cb2ae4 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Opzioni</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 40c92ba3e..c1e8ace9c 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">אפשרויות</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 150854d5f..147787829 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">設定</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 6110097a7..c75b25ad1 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Options</string>
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index c705b3d18..249c64588 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -16,4 +16,4 @@
 
 <resources>
     <dimen name="launchscreen_product_logo_bottom">48dp</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index df0158550..c33de0153 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Opties</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index dd4ac063f..7e9c282c0 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Instillinger</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index ed24e0075..1f0981cbd 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Opcje</string>
diff --git a/app/src/main/res/values-port-v21/dimens.xml b/app/src/main/res/values-port-v21/dimens.xml
index 5dd5907b9..832360700 100644
--- a/app/src/main/res/values-port-v21/dimens.xml
+++ b/app/src/main/res/values-port-v21/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -17,4 +17,4 @@
 <resources>
     <dimen name="launchscreen_product_logo_bottom">64dp</dimen>
     <dimen name="launchscreen_brand_logo_bottom">104dp</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index f55f734db..490b286c6 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Opções</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 384849ce2..879a0863b 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Opções</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 58aad4c17..2751eae43 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Options</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d154b1c01..fefc430ae 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Список опций</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 8cd0fe1df..da6d0e3d3 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Možnosti</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index ebdba6a68..4d1e395ff 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Možnosti</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 58aad4c17..2751eae43 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Options</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 21c407f09..67dd612d0 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Inställningar</string>
diff --git a/app/src/main/res/values-sw600dp-land-v21/dimens.xml b/app/src/main/res/values-sw600dp-land-v21/dimens.xml
index 882950813..41c1769a7 100644
--- a/app/src/main/res/values-sw600dp-land-v21/dimens.xml
+++ b/app/src/main/res/values-sw600dp-land-v21/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -17,4 +17,4 @@
 <resources>
     <dimen name="launchscreen_product_logo_bottom">72dp</dimen>
     <dimen name="launchscreen_brand_logo_bottom">96dp</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
index 018b15971..17adcf2c4 100644
--- a/app/src/main/res/values-sw600dp-land/dimens.xml
+++ b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -16,4 +16,4 @@
 
 <resources>
     <dimen name="launchscreen_product_logo_bottom">24dp</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-sw600dp-port-v21/dimens.xml b/app/src/main/res/values-sw600dp-port-v21/dimens.xml
index 882950813..41c1769a7 100644
--- a/app/src/main/res/values-sw600dp-port-v21/dimens.xml
+++ b/app/src/main/res/values-sw600dp-port-v21/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -17,4 +17,4 @@
 <resources>
     <dimen name="launchscreen_product_logo_bottom">72dp</dimen>
     <dimen name="launchscreen_brand_logo_bottom">96dp</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index d85758cd8..903c5021e 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -19,4 +19,4 @@
     <dimen name="touch_raise">9dp</dimen>
     <dimen name="launchscreen_product_logo_bottom">24dp</dimen>
     <dimen name="launchscreen_brand_logo_bottom">56dp</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-sw720dp/dimens.xml b/app/src/main/res/values-sw720dp/dimens.xml
index 3a560eb72..352b79c19 100644
--- a/app/src/main/res/values-sw720dp/dimens.xml
+++ b/app/src/main/res/values-sw720dp/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -16,4 +16,4 @@
 
 <resources>
     <dimen name="timer_text_size">200sp</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 8b34f30e5..492e58c3b 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Ayarlar</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 3d11d2f48..3ed920dca 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Налаштування</string>
diff --git a/app/src/main/res/values-v19/themes.xml b/app/src/main/res/values-v19/themes.xml
index 5bcd8a540..9983c8d9d 100644
--- a/app/src/main/res/values-v19/themes.xml
+++ b/app/src/main/res/values-v19/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/values-v21/dimens.xml b/app/src/main/res/values-v21/dimens.xml
index d5bf7af35..d2c964b67 100644
--- a/app/src/main/res/values-v21/dimens.xml
+++ b/app/src/main/res/values-v21/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
index d752280f6..49f0175d7 100644
--- a/app/src/main/res/values-v21/themes.xml
+++ b/app/src/main/res/values-v21/themes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 6110097a7..c75b25ad1 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">Options</string>
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
index 8772d5691..b67471c71 100644
--- a/app/src/main/res/values-w820dp/dimens.xml
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 43720d64a..41ca89da6 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">选项</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index ca56f65e9..83f47648a 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- General -->
   <string name="preferences">選擇</string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 29f9e61bd..fff0060d4 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index cabe40d1e..428183b69 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/values/bool.xml b/app/src/main/res/values/bool.xml
index 72614ca49..d40d7cb5e 100644
--- a/app/src/main/res/values/bool.xml
+++ b/app/src/main/res/values/bool.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a700738e6..20428c92d 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"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/values/constants.xml b/app/src/main/res/values/constants.xml
index 10e22e812..6dc331ab5 100644
--- a/app/src/main/res/values/constants.xml
+++ b/app/src/main/res/values/constants.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index b93e3f54d..67494a572 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/values/epl.xml b/app/src/main/res/values/epl.xml
index 3928cb58d..ced04d783 100644
--- a/app/src/main/res/values/epl.xml
+++ b/app/src/main/res/values/epl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/values/pub_key.xml b/app/src/main/res/values/pub_key.xml
index 31a1fb6a3..9e95ddc73 100644
--- a/app/src/main/res/values/pub_key.xml
+++ b/app/src/main/res/values/pub_key.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -16,4 +16,4 @@
 
 <resources>
     <string name="BASE64_PUB_KEY" translatable="false">MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvxNm9AWZrsRqDB04Uic0rJSmsCBlRcDA1OnNPtC14Eth5iy4dTlPKN1HNOUfz+2mqvq4cylrb/NTxpkZSQ1NwLHMqG3pdzJAbwnr7MJoqhum3MKeDxuuM6ptZP8EucPEcFwcGQWQAD5URLFuT2nk9Ezws2TU2EsGnTI97Dpdonv/ans/2NuUz04KW2IrNLuMZp20h+3uekp7CwP1mjs7cqrL63WzEl5cT+RjfFGUH8SpdDvO71duLefnBS/vHftf+tVpv+vD12C+BlfN8Dun3R9EM8QqM32VB6M8ycJcEcmkz+U6IfMu/ShQapOctUCFkud9Bd55tXXnJyoQXEt0YwIDAQAB</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c8873937d..40663d846 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 968ce7440..e51845c5a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 547f62cf1..07b42c607 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/values/translators.xml b/app/src/main/res/values/translators.xml
index b857c6b76..b2c51934f 100644
--- a/app/src/main/res/values/translators.xml
+++ b/app/src/main/res/values/translators.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/xml-v25/shortcuts.xml b/app/src/main/res/xml-v25/shortcuts.xml
index de1f967bf..1df465b19 100644
--- a/app/src/main/res/xml-v25/shortcuts.xml
+++ b/app/src/main/res/xml-v25/shortcuts.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/xml/authenticator.xml b/app/src/main/res/xml/authenticator.xml
index c41b30b56..9ec67cd49 100644
--- a/app/src/main/res/xml/authenticator.xml
+++ b/app/src/main/res/xml/authenticator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/xml/my_file_paths.xml b/app/src/main/res/xml/my_file_paths.xml
index eec060058..a0dbcef7c 100644
--- a/app/src/main/res/xml/my_file_paths.xml
+++ b/app/src/main/res/xml/my_file_paths.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 54cb73186..226420d4c 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/main/res/xml/sync_adapter.xml b/app/src/main/res/xml/sync_adapter.xml
index 8e3cc939b..3a078ac04 100644
--- a/app/src/main/res/xml/sync_adapter.xml
+++ b/app/src/main/res/xml/sync_adapter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/screengrabDebug/AndroidManifest.xml b/app/src/screengrabDebug/AndroidManifest.xml
index 6074e6006..6438a1b1b 100644
--- a/app/src/screengrabDebug/AndroidManifest.xml
+++ b/app/src/screengrabDebug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/app/src/screengrabDebug/res/values/constants.xml b/app/src/screengrabDebug/res/values/constants.xml
index 3b13fc7dd..b872bda60 100644
--- a/app/src/screengrabDebug/res/values/constants.xml
+++ b/app/src/screengrabDebug/res/values/constants.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/build.gradle b/build.gradle
index bfb13e357..7ab3b8d1c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/dependencies.gradle b/dependencies.gradle
index 9f369a571..0e4a5ef31 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 54fc84972..aca76d7e6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,3 +1,18 @@
+#
+# Copyright (C) 2018 Florian Dreier
+#
+# This file is part of MyTargets.
+#
+# MyTargets is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2
+# as published by the Free Software Foundation.
+#
+# MyTargets is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+
 #Sun Sep 10 15:20:25 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index 73b0ef61e..f221c2661 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/build.gradle b/shared/build.gradle
index 747b400ea..c8452bf3b 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/androidTest/java/de/dreier/mytargets/shared/models/db/ShotTest.java b/shared/src/androidTest/java/de/dreier/mytargets/shared/models/db/ShotTest.java
index 9aa957066..d43c9b384 100644
--- a/shared/src/androidTest/java/de/dreier/mytargets/shared/models/db/ShotTest.java
+++ b/shared/src/androidTest/java/de/dreier/mytargets/shared/models/db/ShotTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/DAIR3DTest.java b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/DAIR3DTest.java
index e1460bb86..05b7524ce 100644
--- a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/DAIR3DTest.java
+++ b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/DAIR3DTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.java b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.java
index 13f1751fd..3345cde2f 100644
--- a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.java
+++ b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAFullTest.java b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAFullTest.java
index 2f8eb9eb1..fcb6e2f57 100644
--- a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAFullTest.java
+++ b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAFullTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAVertical3SpotTest.java b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAVertical3SpotTest.java
index 1d140f63a..c1fec34ba 100644
--- a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAVertical3SpotTest.java
+++ b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAVertical3SpotTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
@@ -46,4 +46,4 @@ public void testShouldDrawZone() throws Exception {
         Assert.assertEquals(false, target.shouldDrawZone(1, 2));
         Assert.assertEquals(true, target.shouldDrawZone(2, 2));
     }
-}
\ No newline at end of file
+}
diff --git a/shared/src/main/AndroidManifest.xml b/shared/src/main/AndroidManifest.xml
index 25c762730..398cd30ba 100644
--- a/shared/src/main/AndroidManifest.xml
+++ b/shared/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
index 2305f8763..4f55c7d31 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt b/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt
index beb5356e5..a43f8e9da 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/EAggregationStrategy.kt b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/EAggregationStrategy.kt
index 0876e12df..ee8930c8f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/EAggregationStrategy.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/EAggregationStrategy.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/IAggregationResultRenderer.kt b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/IAggregationResultRenderer.kt
index a7dc6916d..10d8a7b3d 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/IAggregationResultRenderer.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/IAggregationResultRenderer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/IAggregationStrategy.kt b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/IAggregationStrategy.kt
index 86d15814f..865741c94 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/IAggregationStrategy.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/IAggregationStrategy.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/NOPResultRenderer.kt b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/NOPResultRenderer.kt
index 503e3dc21..4e5742b27 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/NOPResultRenderer.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/NOPResultRenderer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/NoneStrategy.kt b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/NoneStrategy.kt
index f043fafae..4b0cc470a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/NoneStrategy.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/NoneStrategy.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/average/Average.kt b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/average/Average.kt
index c4a0f9c67..21faca80f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/average/Average.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/average/Average.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/average/AverageResultRenderer.kt b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/average/AverageResultRenderer.kt
index 6afd4d1b3..418dcd3fa 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/average/AverageResultRenderer.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/average/AverageResultRenderer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/average/AverageStrategy.kt b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/average/AverageStrategy.kt
index 4a768be6b..2aa1fb07e 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/average/AverageStrategy.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/average/AverageStrategy.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/AggregationStrategyBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/AggregationStrategyBase.kt
index 86910a11e..30bab1001 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/AggregationStrategyBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/AggregationStrategyBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/Cluster.kt b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/Cluster.kt
index 7c5979d80..50938ac5e 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/Cluster.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/Cluster.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/ClusterResultRenderer.kt b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/ClusterResultRenderer.kt
index 32f070a18..6e2c71bdc 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/ClusterResultRenderer.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/ClusterResultRenderer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/ClusterStrategy.kt b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/ClusterStrategy.kt
index c8cee0321..802c2a589 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/ClusterStrategy.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/ClusterStrategy.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/ETimerState.kt b/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/ETimerState.kt
index 5b115e79c..53f5d2879 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/ETimerState.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/ETimerState.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/TimerFragmentBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/TimerFragmentBase.kt
index 23f65b6a3..62c8ec9f6 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/TimerFragmentBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/TimerFragmentBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/migration/Migration9.kt b/shared/src/main/java/de/dreier/mytargets/shared/migration/Migration9.kt
index b8d03a73a..e41efee65 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/migration/Migration9.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/migration/Migration9.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Diameter.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Diameter.kt
index 264b9ef5b..8c44b7a64 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Diameter.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Diameter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Dimension.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Dimension.kt
index 6ce008833..716db1e91 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Dimension.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Dimension.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/EBowType.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/EBowType.kt
index 29b541fab..809b6a786 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/EBowType.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/EBowType.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/ETargetType.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/ETargetType.kt
index 2e70f1c61..2605eea4b 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/ETargetType.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/ETargetType.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/EWeather.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/EWeather.kt
index 5aa27e01a..d3adc390f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/EWeather.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/EWeather.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Environment.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Environment.kt
index f17a696e6..a32d682e6 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Environment.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Environment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/IIdProvider.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/IIdProvider.kt
index 0e96d046f..4893f705f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/IIdProvider.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/IIdProvider.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/IIdSettable.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/IIdSettable.kt
index a5843799b..8dbf17473 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/IIdSettable.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/IIdSettable.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Score.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Score.kt
index 52a07f049..29119d1ee 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Score.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Score.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/SelectableZone.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/SelectableZone.kt
index ab967a9e6..4a092d3c5 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/SelectableZone.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/SelectableZone.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
index d09c68943..ccf83a37b 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Thumbnail.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Thumbnail.kt
index d95df0edf..d74a86479 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Thumbnail.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Thumbnail.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/TimerSettings.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/TimerSettings.kt
index 7f1c70d71..8b75b87c9 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/TimerSettings.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/TimerSettings.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/TrainingInfo.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/TrainingInfo.kt
index b70c225b6..9702dea41 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/TrainingInfo.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/TrainingInfo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/WindDirection.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/WindDirection.kt
index 5efd2d868..98b5d25bc 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/WindDirection.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/WindDirection.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/WindSpeed.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/WindSpeed.kt
index ec3052328..b66774b7e 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/WindSpeed.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/WindSpeed.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedEnd.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedEnd.kt
index a58d7484d..03ce7e484 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedEnd.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedEnd.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedRound.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedRound.kt
index c55bd3ecc..f53622e0c 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedRound.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedRound.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
index 9dbb02741..da9dae82f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/ArrowDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/ArrowDAO.kt
index b4363662a..4086155e9 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/ArrowDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/ArrowDAO.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
index 2148a751b..31d80e974 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
index fcdcffe59..881547f60 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
index a307c5857..3c578605d 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
index bf52ed849..3525134f4 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
index 32bee1ce5..04ef6a7a9 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
index 18b8d0268..6ac2d5afd 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Image.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Image.kt
index fda174be2..d37e8dbce 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Image.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Image.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
index db2471d26..fba6a958f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
index 9a33c44e6..947196944 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
index c8122dc83..9538cba7f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
index 8ac996c90..f5b7ed006 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt
index 90ef9f972..27500c349 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
index f28185f25..c8a0db90c 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
index 6c33294ab..6ff1646b2 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/Target3DBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/Target3DBase.kt
index c6cfe573d..900382302 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/Target3DBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/Target3DBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/TargetFactory.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/TargetFactory.kt
index ccfea1082..bdbdc6cfa 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/TargetFactory.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/TargetFactory.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/TargetOvalBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/TargetOvalBase.kt
index ca1d2f4a7..6bed412b0 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/TargetOvalBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/TargetOvalBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/decoration/BeursaultDecorator.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/decoration/BeursaultDecorator.kt
index 5076e5551..09b4a70b8 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/decoration/BeursaultDecorator.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/decoration/BeursaultDecorator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/decoration/CenterMarkDecorator.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/decoration/CenterMarkDecorator.kt
index a90bbedf6..ea7d17b28 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/decoration/CenterMarkDecorator.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/decoration/CenterMarkDecorator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/decoration/TargetDecorator.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/decoration/TargetDecorator.kt
index ab66aadc5..104ed7f96 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/decoration/TargetDecorator.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/decoration/TargetDecorator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/CanvasWrapper.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/CanvasWrapper.kt
index f9fbb5df2..664360cf2 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/CanvasWrapper.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/CanvasWrapper.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/CombinedSpot.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/CombinedSpot.kt
index 3baaba6c3..7fd22fd82 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/CombinedSpot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/CombinedSpot.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetDrawable.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetDrawable.kt
index 71524fe3c..416846f33 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetDrawable.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetDrawable.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetImpactAggregationDrawable.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetImpactAggregationDrawable.kt
index 382068a7f..a9ec4a1f8 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetImpactAggregationDrawable.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetImpactAggregationDrawable.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetImpactDrawable.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetImpactDrawable.kt
index ac3796be7..a96b4ca19 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetImpactDrawable.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetImpactDrawable.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/ASA3D.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/ASA3D.kt
index bd728c96d..c6d9d8a35 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/ASA3D.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/ASA3D.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/ASA3D14.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/ASA3D14.kt
index 8edeadca7..7c8bafcf3 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/ASA3D14.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/ASA3D14.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/Beursault.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/Beursault.kt
index 4d9e62136..99e4c747e 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/Beursault.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/Beursault.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/DAIR3D.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/DAIR3D.kt
index 82a9bf969..a0b12fdd9 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/DAIR3D.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/DAIR3D.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/DBSCBlowpipe.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/DBSCBlowpipe.kt
index 4975a5c7f..88ac72d20 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/DBSCBlowpipe.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/DBSCBlowpipe.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/HitOrMiss.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/HitOrMiss.kt
index 50b164ba2..30644e77a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/HitOrMiss.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/HitOrMiss.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IBO3D.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IBO3D.kt
index f9020b31e..2fa5406b3 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IBO3D.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IBO3D.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IFAAAnimal.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IFAAAnimal.kt
index 5bf71ac82..10485057f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IFAAAnimal.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IFAAAnimal.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAAnimal.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAAnimal.kt
index db33b156a..8a18cc920 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAAnimal.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAAnimal.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAExpertField.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAExpertField.kt
index 6bf7de574..0c8c1d2e7 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAExpertField.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAExpertField.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAField.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAField.kt
index 066f74d64..0b2492ac8 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAField.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAField.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAHunter.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAHunter.kt
index cd6b148cb..634778d72 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAHunter.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAHunter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAIndoor.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAIndoor.kt
index 844279f74..2af42bd2d 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAIndoor.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAIndoor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAIndoor5Spot.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAIndoor5Spot.kt
index 8509653e4..1a542c169 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAIndoor5Spot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAIndoor5Spot.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAS3D.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAS3D.kt
index ffd2936da..9e972828f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAS3D.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAS3D.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFASField.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFASField.kt
index d06857f3e..2f069dd30 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFASField.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFASField.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/SCAPeriod.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/SCAPeriod.kt
index a67985655..796d9c364 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/SCAPeriod.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/SCAPeriod.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/TargetModelBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/TargetModelBase.kt
index f39cd66c3..c60c97510 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/TargetModelBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/TargetModelBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA3Ring.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA3Ring.kt
index 555abad01..58a56762c 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA3Ring.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA3Ring.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA3Ring3Spot.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA3Ring3Spot.kt
index 64e68a4f8..5a989355a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA3Ring3Spot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA3Ring3Spot.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA5Ring.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA5Ring.kt
index 0f71be07e..d8343fabd 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA5Ring.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA5Ring.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA6Ring.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA6Ring.kt
index 736ac9bfc..1e08b85fa 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA6Ring.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA6Ring.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WADanage3Spot.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WADanage3Spot.kt
index 67c664297..de82ca947 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WADanage3Spot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WADanage3Spot.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WADanage6Spot.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WADanage6Spot.kt
index b05a2a2a5..434458759 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WADanage6Spot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WADanage6Spot.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAField.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAField.kt
index 87ff00f85..07e3f98d1 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAField.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAField.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAField3Spot.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAField3Spot.kt
index cf9298c7d..d6a8d732c 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAField3Spot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAField3Spot.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAFull.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAFull.kt
index 99327c503..6cf4ee220 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAFull.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAFull.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAVegas3Spot.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAVegas3Spot.kt
index 5ea030e14..ad8a90479 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAVegas3Spot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAVegas3Spot.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAVertical3Spot.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAVertical3Spot.kt
index 787aa374b..81fcaea20 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAVertical3Spot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAVertical3Spot.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/Worcester.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/Worcester.kt
index bff5fd7fe..4513afccd 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/Worcester.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/Worcester.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ArrowAwareScoringStyle.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ArrowAwareScoringStyle.kt
index f9a9d418f..033fec658 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ArrowAwareScoringStyle.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ArrowAwareScoringStyle.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ColorScoringStyle.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ColorScoringStyle.kt
index 0f5840691..f609f1cfc 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ColorScoringStyle.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ColorScoringStyle.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt
index bcf451e6a..52bb0cac6 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/zone/CircularZone.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/zone/CircularZone.kt
index d72bfe1a4..e13116fc8 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/zone/CircularZone.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/zone/CircularZone.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/zone/EllipseZone.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/zone/EllipseZone.kt
index 029bdabc0..4b41c9250 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/zone/EllipseZone.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/zone/EllipseZone.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/zone/HeartZone.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/zone/HeartZone.kt
index e9ac78be7..08f5345e0 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/zone/HeartZone.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/zone/HeartZone.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/zone/ZoneBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/zone/ZoneBase.kt
index 9d011032a..fdacc4c0e 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/zone/ZoneBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/zone/ZoneBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/BitmapParcelUtils.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/BitmapParcelUtils.kt
index 31058ca43..bb9e23ad5 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/BitmapParcelUtils.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/BitmapParcelUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/BitmapUtils.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/BitmapUtils.kt
index c7e8b81cf..5d0261dbe 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/BitmapUtils.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/BitmapUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/Circle.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/Circle.kt
index afa0f2a52..e0c6078c1 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/Circle.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/Circle.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/CircleDrawable.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/CircleDrawable.kt
index 48c8e7ace..297997816 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/CircleDrawable.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/CircleDrawable.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/Color.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/Color.kt
index 77e2b38c5..69387c9a1 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/Color.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/Color.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/EndRenderer.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/EndRenderer.kt
index d0176689d..4c17ffd2a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/EndRenderer.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/EndRenderer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/FileUtils.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/FileUtils.kt
index 5cabf5fa4..7edb6f257 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/FileUtils.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/FileUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/ImageList.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/ImageList.kt
index 6b69684d7..29fdc2e60 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/ImageList.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/ImageList.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/LongSparseArrayUtils.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/LongSparseArrayUtils.kt
index 45f124561..c8ccf0f00 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/LongSparseArrayUtils.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/LongSparseArrayUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/MatrixEvaluator.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/MatrixEvaluator.kt
index e682be812..a5243ce44 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/MatrixEvaluator.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/MatrixEvaluator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/ParcelableUtil.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/ParcelableUtil.kt
index 4cdf252c3..a3f61d0e2 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/ParcelableUtil.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/ParcelableUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/RectUtils.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/RectUtils.kt
index ed2e20974..8e1f35b20 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/RectUtils.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/RectUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/RegionUtils.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/RegionUtils.kt
index 0461ab8d8..d4224f64c 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/RegionUtils.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/RegionUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/RoundedAvatarDrawable.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/RoundedAvatarDrawable.kt
index 4992daae9..28686e629 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/RoundedAvatarDrawable.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/RoundedAvatarDrawable.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/StandardRoundFactory.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/StandardRoundFactory.kt
index 610dfd49e..8e7dbe418 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/StandardRoundFactory.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/StandardRoundFactory.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/BitmapConverter.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/BitmapConverter.kt
index 5cf657358..162c11b18 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/BitmapConverter.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/BitmapConverter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/DimensionConverter.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/DimensionConverter.kt
index fc433c827..3435d2f2b 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/DimensionConverter.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/DimensionConverter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EBowTypeConverter.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EBowTypeConverter.kt
index c597e433e..5b8d57f05 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EBowTypeConverter.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EBowTypeConverter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EWeatherConverter.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EWeatherConverter.kt
index ad937ac68..51878bd7d 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EWeatherConverter.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EWeatherConverter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalDateConverter.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalDateConverter.kt
index dba1d7bc9..8483cbd86 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalDateConverter.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalDateConverter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalTimeConverter.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalTimeConverter.kt
index c888b6e42..223131364 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalTimeConverter.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalTimeConverter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/ThumbnailConverter.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/ThumbnailConverter.kt
index 1a25b1208..b38f6572e 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/ThumbnailConverter.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/ThumbnailConverter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/views/EndView.kt b/shared/src/main/java/de/dreier/mytargets/shared/views/EndView.kt
index 1d4fa42e1..29e4cb774 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/views/EndView.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/views/EndView.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt
index a32f8cc72..69f00aaca 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/wearable/WearableClientBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/wearable/WearableClientBase.kt
index 16c57e850..fa47fffc3 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/wearable/WearableClientBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/wearable/WearableClientBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/main/res/drawable/ic_arrow_bottom_left_black_24dp.xml b/shared/src/main/res/drawable/ic_arrow_bottom_left_black_24dp.xml
index 264513c46..d9d1d8f6d 100644
--- a/shared/src/main/res/drawable/ic_arrow_bottom_left_black_24dp.xml
+++ b/shared/src/main/res/drawable/ic_arrow_bottom_left_black_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_arrow_bottom_right_black_24dp.xml b/shared/src/main/res/drawable/ic_arrow_bottom_right_black_24dp.xml
index e4b4bbba9..321e57cf6 100644
--- a/shared/src/main/res/drawable/ic_arrow_bottom_right_black_24dp.xml
+++ b/shared/src/main/res/drawable/ic_arrow_bottom_right_black_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_arrow_downward_black_24dp.xml b/shared/src/main/res/drawable/ic_arrow_downward_black_24dp.xml
index 470c4abea..71c57404a 100644
--- a/shared/src/main/res/drawable/ic_arrow_downward_black_24dp.xml
+++ b/shared/src/main/res/drawable/ic_arrow_downward_black_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_arrow_left_black_24dp.xml b/shared/src/main/res/drawable/ic_arrow_left_black_24dp.xml
index 9983f4110..dd31e20d8 100644
--- a/shared/src/main/res/drawable/ic_arrow_left_black_24dp.xml
+++ b/shared/src/main/res/drawable/ic_arrow_left_black_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_arrow_right_black_24px.xml b/shared/src/main/res/drawable/ic_arrow_right_black_24px.xml
index d35ae5d84..3e03afddb 100644
--- a/shared/src/main/res/drawable/ic_arrow_right_black_24px.xml
+++ b/shared/src/main/res/drawable/ic_arrow_right_black_24px.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_arrow_up_left_black_24dp.xml b/shared/src/main/res/drawable/ic_arrow_up_left_black_24dp.xml
index fea3404a1..9ce570dba 100644
--- a/shared/src/main/res/drawable/ic_arrow_up_left_black_24dp.xml
+++ b/shared/src/main/res/drawable/ic_arrow_up_left_black_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_arrow_up_right_black_24dp.xml b/shared/src/main/res/drawable/ic_arrow_up_right_black_24dp.xml
index ce14cbf88..6d05539a2 100644
--- a/shared/src/main/res/drawable/ic_arrow_up_right_black_24dp.xml
+++ b/shared/src/main/res/drawable/ic_arrow_up_right_black_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_arrow_upward_black_24dp.xml b/shared/src/main/res/drawable/ic_arrow_upward_black_24dp.xml
index 783619215..ae2d5e3a5 100644
--- a/shared/src/main/res/drawable/ic_arrow_upward_black_24dp.xml
+++ b/shared/src/main/res/drawable/ic_arrow_upward_black_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_backspace_grey600_24dp.xml b/shared/src/main/res/drawable/ic_backspace_grey600_24dp.xml
index 40959aac8..ff8f9b1f9 100644
--- a/shared/src/main/res/drawable/ic_backspace_grey600_24dp.xml
+++ b/shared/src/main/res/drawable/ic_backspace_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_bft_0_black_24dp.xml b/shared/src/main/res/drawable/ic_bft_0_black_24dp.xml
index 110344d2a..6b3fe3740 100644
--- a/shared/src/main/res/drawable/ic_bft_0_black_24dp.xml
+++ b/shared/src/main/res/drawable/ic_bft_0_black_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_bft_1_black_24dp.xml b/shared/src/main/res/drawable/ic_bft_1_black_24dp.xml
index c7fb95035..cf3d52621 100644
--- a/shared/src/main/res/drawable/ic_bft_1_black_24dp.xml
+++ b/shared/src/main/res/drawable/ic_bft_1_black_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_bft_2_black_24dp.xml b/shared/src/main/res/drawable/ic_bft_2_black_24dp.xml
index 6038f115a..d9ac04068 100644
--- a/shared/src/main/res/drawable/ic_bft_2_black_24dp.xml
+++ b/shared/src/main/res/drawable/ic_bft_2_black_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_bft_3_black_24dp.xml b/shared/src/main/res/drawable/ic_bft_3_black_24dp.xml
index a1ae1c2c9..0acf94df6 100644
--- a/shared/src/main/res/drawable/ic_bft_3_black_24dp.xml
+++ b/shared/src/main/res/drawable/ic_bft_3_black_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_bft_4_black_24dp.xml b/shared/src/main/res/drawable/ic_bft_4_black_24dp.xml
index 31b40a920..0d3d16125 100644
--- a/shared/src/main/res/drawable/ic_bft_4_black_24dp.xml
+++ b/shared/src/main/res/drawable/ic_bft_4_black_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_bft_5_black_24dp.xml b/shared/src/main/res/drawable/ic_bft_5_black_24dp.xml
index b6f308f65..034b660f4 100644
--- a/shared/src/main/res/drawable/ic_bft_5_black_24dp.xml
+++ b/shared/src/main/res/drawable/ic_bft_5_black_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_bft_6_black_24dp.xml b/shared/src/main/res/drawable/ic_bft_6_black_24dp.xml
index c65bc97cb..8621b36e3 100644
--- a/shared/src/main/res/drawable/ic_bft_6_black_24dp.xml
+++ b/shared/src/main/res/drawable/ic_bft_6_black_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_bft_7_black_24dp.xml b/shared/src/main/res/drawable/ic_bft_7_black_24dp.xml
index a3de1b432..f5faa2c09 100644
--- a/shared/src/main/res/drawable/ic_bft_7_black_24dp.xml
+++ b/shared/src/main/res/drawable/ic_bft_7_black_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_bft_8_black_24dp.xml b/shared/src/main/res/drawable/ic_bft_8_black_24dp.xml
index a7fb18bd1..8037ef759 100644
--- a/shared/src/main/res/drawable/ic_bft_8_black_24dp.xml
+++ b/shared/src/main/res/drawable/ic_bft_8_black_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_bft_9_black_24dp.xml b/shared/src/main/res/drawable/ic_bft_9_black_24dp.xml
index 6cb35fb07..29b2f031c 100644
--- a/shared/src/main/res/drawable/ic_bft_9_black_24dp.xml
+++ b/shared/src/main/res/drawable/ic_bft_9_black_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_bow_bare_white_24dp.xml b/shared/src/main/res/drawable/ic_bow_bare_white_24dp.xml
index 5189b67f8..7633aa71f 100644
--- a/shared/src/main/res/drawable/ic_bow_bare_white_24dp.xml
+++ b/shared/src/main/res/drawable/ic_bow_bare_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_bow_compound_white_24dp.xml b/shared/src/main/res/drawable/ic_bow_compound_white_24dp.xml
index 3c2488547..9d2f46771 100644
--- a/shared/src/main/res/drawable/ic_bow_compound_white_24dp.xml
+++ b/shared/src/main/res/drawable/ic_bow_compound_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_bow_horse_white_24dp.xml b/shared/src/main/res/drawable/ic_bow_horse_white_24dp.xml
index 0af339ad7..202b47ba8 100644
--- a/shared/src/main/res/drawable/ic_bow_horse_white_24dp.xml
+++ b/shared/src/main/res/drawable/ic_bow_horse_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_bow_long_white_24dp.xml b/shared/src/main/res/drawable/ic_bow_long_white_24dp.xml
index 2028e575b..1ab884da6 100644
--- a/shared/src/main/res/drawable/ic_bow_long_white_24dp.xml
+++ b/shared/src/main/res/drawable/ic_bow_long_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_bow_recurve_white_24dp.xml b/shared/src/main/res/drawable/ic_bow_recurve_white_24dp.xml
index 468477d19..f90b6e40c 100644
--- a/shared/src/main/res/drawable/ic_bow_recurve_white_24dp.xml
+++ b/shared/src/main/res/drawable/ic_bow_recurve_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_bow_yumi_white_24dp.xml b/shared/src/main/res/drawable/ic_bow_yumi_white_24dp.xml
index f76a45739..a8e96a2a9 100644
--- a/shared/src/main/res/drawable/ic_bow_yumi_white_24dp.xml
+++ b/shared/src/main/res/drawable/ic_bow_yumi_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_cloudy_48dp.xml b/shared/src/main/res/drawable/ic_cloudy_48dp.xml
index 1e31a9400..e6d53404d 100644
--- a/shared/src/main/res/drawable/ic_cloudy_48dp.xml
+++ b/shared/src/main/res/drawable/ic_cloudy_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_cloudy_outline_48dp.xml b/shared/src/main/res/drawable/ic_cloudy_outline_48dp.xml
index f4c81e13b..cdb135e5c 100644
--- a/shared/src/main/res/drawable/ic_cloudy_outline_48dp.xml
+++ b/shared/src/main/res/drawable/ic_cloudy_outline_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_cloudy_outline_color_48dp.xml b/shared/src/main/res/drawable/ic_cloudy_outline_color_48dp.xml
index 720bb9d49..d5556fd88 100644
--- a/shared/src/main/res/drawable/ic_cloudy_outline_color_48dp.xml
+++ b/shared/src/main/res/drawable/ic_cloudy_outline_color_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_compat_bow_bare_white_24dp.xml b/shared/src/main/res/drawable/ic_compat_bow_bare_white_24dp.xml
index ff627791c..5e052a510 100644
--- a/shared/src/main/res/drawable/ic_compat_bow_bare_white_24dp.xml
+++ b/shared/src/main/res/drawable/ic_compat_bow_bare_white_24dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_compat_bow_compound_white_24dp.xml b/shared/src/main/res/drawable/ic_compat_bow_compound_white_24dp.xml
index a232bea81..a5b34570a 100644
--- a/shared/src/main/res/drawable/ic_compat_bow_compound_white_24dp.xml
+++ b/shared/src/main/res/drawable/ic_compat_bow_compound_white_24dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_compat_bow_horse_white_24dp.xml b/shared/src/main/res/drawable/ic_compat_bow_horse_white_24dp.xml
index 9bfb39be8..91529eb14 100644
--- a/shared/src/main/res/drawable/ic_compat_bow_horse_white_24dp.xml
+++ b/shared/src/main/res/drawable/ic_compat_bow_horse_white_24dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_compat_bow_long_white_24dp.xml b/shared/src/main/res/drawable/ic_compat_bow_long_white_24dp.xml
index 607edb3bb..aabacc23f 100644
--- a/shared/src/main/res/drawable/ic_compat_bow_long_white_24dp.xml
+++ b/shared/src/main/res/drawable/ic_compat_bow_long_white_24dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_compat_bow_recurve_white_24dp.xml b/shared/src/main/res/drawable/ic_compat_bow_recurve_white_24dp.xml
index 8fdf97b38..d6f67fce5 100644
--- a/shared/src/main/res/drawable/ic_compat_bow_recurve_white_24dp.xml
+++ b/shared/src/main/res/drawable/ic_compat_bow_recurve_white_24dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_compat_bow_yumi_white_24dp.xml b/shared/src/main/res/drawable/ic_compat_bow_yumi_white_24dp.xml
index 2f05175c6..88324d752 100644
--- a/shared/src/main/res/drawable/ic_compat_bow_yumi_white_24dp.xml
+++ b/shared/src/main/res/drawable/ic_compat_bow_yumi_white_24dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_light_rain_48dp.xml b/shared/src/main/res/drawable/ic_light_rain_48dp.xml
index b4ef0d3d2..572699c0f 100644
--- a/shared/src/main/res/drawable/ic_light_rain_48dp.xml
+++ b/shared/src/main/res/drawable/ic_light_rain_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_light_rain_outline_48dp.xml b/shared/src/main/res/drawable/ic_light_rain_outline_48dp.xml
index f07c45973..76a7cb8e0 100644
--- a/shared/src/main/res/drawable/ic_light_rain_outline_48dp.xml
+++ b/shared/src/main/res/drawable/ic_light_rain_outline_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_light_rain_outline_color_48dp.xml b/shared/src/main/res/drawable/ic_light_rain_outline_color_48dp.xml
index 16b8e3652..809d0c186 100644
--- a/shared/src/main/res/drawable/ic_light_rain_outline_color_48dp.xml
+++ b/shared/src/main/res/drawable/ic_light_rain_outline_color_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_partly_cloudy_48dp.xml b/shared/src/main/res/drawable/ic_partly_cloudy_48dp.xml
index e6ab7b059..4bcab4ae4 100644
--- a/shared/src/main/res/drawable/ic_partly_cloudy_48dp.xml
+++ b/shared/src/main/res/drawable/ic_partly_cloudy_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_partly_cloudy_outline_48dp.xml b/shared/src/main/res/drawable/ic_partly_cloudy_outline_48dp.xml
index 7fa4135f0..8775fafc5 100644
--- a/shared/src/main/res/drawable/ic_partly_cloudy_outline_48dp.xml
+++ b/shared/src/main/res/drawable/ic_partly_cloudy_outline_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_partly_cloudy_outline_color_48dp.xml b/shared/src/main/res/drawable/ic_partly_cloudy_outline_color_48dp.xml
index 8876f4638..ff2c6f51c 100644
--- a/shared/src/main/res/drawable/ic_partly_cloudy_outline_color_48dp.xml
+++ b/shared/src/main/res/drawable/ic_partly_cloudy_outline_color_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_rain_48dp.xml b/shared/src/main/res/drawable/ic_rain_48dp.xml
index ad223e3ec..151eec224 100644
--- a/shared/src/main/res/drawable/ic_rain_48dp.xml
+++ b/shared/src/main/res/drawable/ic_rain_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_rain_outline_48dp.xml b/shared/src/main/res/drawable/ic_rain_outline_48dp.xml
index 518a03e21..b9137509a 100644
--- a/shared/src/main/res/drawable/ic_rain_outline_48dp.xml
+++ b/shared/src/main/res/drawable/ic_rain_outline_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_rain_outline_color_48dp.xml b/shared/src/main/res/drawable/ic_rain_outline_color_48dp.xml
index 814f32fb1..ba295b0f4 100644
--- a/shared/src/main/res/drawable/ic_rain_outline_color_48dp.xml
+++ b/shared/src/main/res/drawable/ic_rain_outline_color_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_sun_48dp.xml b/shared/src/main/res/drawable/ic_sun_48dp.xml
index 42d6aa1f6..6182273a2 100644
--- a/shared/src/main/res/drawable/ic_sun_48dp.xml
+++ b/shared/src/main/res/drawable/ic_sun_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_sun_outline_48dp.xml b/shared/src/main/res/drawable/ic_sun_outline_48dp.xml
index fb97fbd5e..8f706f18d 100644
--- a/shared/src/main/res/drawable/ic_sun_outline_48dp.xml
+++ b/shared/src/main/res/drawable/ic_sun_outline_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/drawable/ic_sun_outline_color_48dp.xml b/shared/src/main/res/drawable/ic_sun_outline_color_48dp.xml
index e707aa670..572639e5b 100644
--- a/shared/src/main/res/drawable/ic_sun_outline_color_48dp.xml
+++ b/shared/src/main/res/drawable/ic_sun_outline_color_48dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/values-af/rounds.xml b/shared/src/main/res/values-af/rounds.xml
index 2d331eb62..e931bf6b4 100644
--- a/shared/src/main/res/values-af/rounds.xml
+++ b/shared/src/main/res/values-af/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-af/strings.xml b/shared/src/main/res/values-af/strings.xml
index ffbf8aeb0..4a0317db1 100644
--- a/shared/src/main/res/values-af/strings.xml
+++ b/shared/src/main/res/values-af/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-af/target_faces.xml b/shared/src/main/res/values-af/target_faces.xml
index 4430ef180..d75138f40 100644
--- a/shared/src/main/res/values-af/target_faces.xml
+++ b/shared/src/main/res/values-af/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-ar/rounds.xml b/shared/src/main/res/values-ar/rounds.xml
index 2d331eb62..e931bf6b4 100644
--- a/shared/src/main/res/values-ar/rounds.xml
+++ b/shared/src/main/res/values-ar/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-ar/strings.xml b/shared/src/main/res/values-ar/strings.xml
index 43a6f8424..c5b95d823 100644
--- a/shared/src/main/res/values-ar/strings.xml
+++ b/shared/src/main/res/values-ar/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-ar/target_faces.xml b/shared/src/main/res/values-ar/target_faces.xml
index 4430ef180..d75138f40 100644
--- a/shared/src/main/res/values-ar/target_faces.xml
+++ b/shared/src/main/res/values-ar/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-ca/rounds.xml b/shared/src/main/res/values-ca/rounds.xml
index 2d331eb62..e931bf6b4 100644
--- a/shared/src/main/res/values-ca/rounds.xml
+++ b/shared/src/main/res/values-ca/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-ca/strings.xml b/shared/src/main/res/values-ca/strings.xml
index 1475ab073..c42475b11 100644
--- a/shared/src/main/res/values-ca/strings.xml
+++ b/shared/src/main/res/values-ca/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Arc recorbat</string>
   <string name="compound_bow">Arc compost</string>
diff --git a/shared/src/main/res/values-ca/target_faces.xml b/shared/src/main/res/values-ca/target_faces.xml
index 4430ef180..d75138f40 100644
--- a/shared/src/main/res/values-ca/target_faces.xml
+++ b/shared/src/main/res/values-ca/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-cs/rounds.xml b/shared/src/main/res/values-cs/rounds.xml
index 8f38cee60..e3eb62d5b 100644
--- a/shared/src/main/res/values-cs/rounds.xml
+++ b/shared/src/main/res/values-cs/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-cs/strings.xml b/shared/src/main/res/values-cs/strings.xml
index a39d71b3c..8bdc6220f 100644
--- a/shared/src/main/res/values-cs/strings.xml
+++ b/shared/src/main/res/values-cs/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Reflexní luk</string>
   <string name="compound_bow">Kladkový luk</string>
diff --git a/shared/src/main/res/values-cs/target_faces.xml b/shared/src/main/res/values-cs/target_faces.xml
index 7bcd0348b..1631a31d3 100644
--- a/shared/src/main/res/values-cs/target_faces.xml
+++ b/shared/src/main/res/values-cs/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Klasický</string>
diff --git a/shared/src/main/res/values-da/rounds.xml b/shared/src/main/res/values-da/rounds.xml
index 17e90992e..a53309924 100644
--- a/shared/src/main/res/values-da/rounds.xml
+++ b/shared/src/main/res/values-da/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-da/strings.xml b/shared/src/main/res/values-da/strings.xml
index b4f5923f7..812ecfa01 100644
--- a/shared/src/main/res/values-da/strings.xml
+++ b/shared/src/main/res/values-da/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Recurvebue</string>
   <string name="compound_bow">Compoundbue</string>
diff --git a/shared/src/main/res/values-da/target_faces.xml b/shared/src/main/res/values-da/target_faces.xml
index 4430ef180..d75138f40 100644
--- a/shared/src/main/res/values-da/target_faces.xml
+++ b/shared/src/main/res/values-da/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-de/rounds.xml b/shared/src/main/res/values-de/rounds.xml
index 50e4801f2..b8b63c33d 100644
--- a/shared/src/main/res/values-de/rounds.xml
+++ b/shared/src/main/res/values-de/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Kombiniert Halle</string>
diff --git a/shared/src/main/res/values-de/strings.xml b/shared/src/main/res/values-de/strings.xml
index 337722856..4b3a946e1 100644
--- a/shared/src/main/res/values-de/strings.xml
+++ b/shared/src/main/res/values-de/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Recurvebogen</string>
   <string name="compound_bow">Compoundbogen</string>
diff --git a/shared/src/main/res/values-de/target_faces.xml b/shared/src/main/res/values-de/target_faces.xml
index 5f73c4dc0..e017ca67a 100644
--- a/shared/src/main/res/values-de/target_faces.xml
+++ b/shared/src/main/res/values-de/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Normal</string>
diff --git a/shared/src/main/res/values-el/rounds.xml b/shared/src/main/res/values-el/rounds.xml
index 2d331eb62..e931bf6b4 100644
--- a/shared/src/main/res/values-el/rounds.xml
+++ b/shared/src/main/res/values-el/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-el/strings.xml b/shared/src/main/res/values-el/strings.xml
index ffbf8aeb0..4a0317db1 100644
--- a/shared/src/main/res/values-el/strings.xml
+++ b/shared/src/main/res/values-el/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-el/target_faces.xml b/shared/src/main/res/values-el/target_faces.xml
index 4430ef180..d75138f40 100644
--- a/shared/src/main/res/values-el/target_faces.xml
+++ b/shared/src/main/res/values-el/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-es/rounds.xml b/shared/src/main/res/values-es/rounds.xml
index 86bf6b0aa..257bd3c66 100644
--- a/shared/src/main/res/values-es/rounds.xml
+++ b/shared/src/main/res/values-es/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australiana combinada Indoor</string>
diff --git a/shared/src/main/res/values-es/strings.xml b/shared/src/main/res/values-es/strings.xml
index 9d95dd2ee..6a90b9381 100644
--- a/shared/src/main/res/values-es/strings.xml
+++ b/shared/src/main/res/values-es/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Arco Recurvo</string>
   <string name="compound_bow">Arco Compuesto</string>
diff --git a/shared/src/main/res/values-es/target_faces.xml b/shared/src/main/res/values-es/target_faces.xml
index 433e42cb8..a43981645 100644
--- a/shared/src/main/res/values-es/target_faces.xml
+++ b/shared/src/main/res/values-es/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-et/rounds.xml b/shared/src/main/res/values-et/rounds.xml
index 12cd9d45b..da18225ef 100644
--- a/shared/src/main/res/values-et/rounds.xml
+++ b/shared/src/main/res/values-et/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Austraalia kombineeritud siselaskmine</string>
diff --git a/shared/src/main/res/values-et/strings.xml b/shared/src/main/res/values-et/strings.xml
index f48e02978..1632fae1f 100644
--- a/shared/src/main/res/values-et/strings.xml
+++ b/shared/src/main/res/values-et/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">recurve vibu</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-et/target_faces.xml b/shared/src/main/res/values-et/target_faces.xml
index 0e47bb4f7..c28b7371c 100644
--- a/shared/src/main/res/values-et/target_faces.xml
+++ b/shared/src/main/res/values-et/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Tavapärane</string>
diff --git a/shared/src/main/res/values-fi/rounds.xml b/shared/src/main/res/values-fi/rounds.xml
index 2d331eb62..e931bf6b4 100644
--- a/shared/src/main/res/values-fi/rounds.xml
+++ b/shared/src/main/res/values-fi/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-fi/strings.xml b/shared/src/main/res/values-fi/strings.xml
index ffbf8aeb0..4a0317db1 100644
--- a/shared/src/main/res/values-fi/strings.xml
+++ b/shared/src/main/res/values-fi/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-fi/target_faces.xml b/shared/src/main/res/values-fi/target_faces.xml
index 4430ef180..d75138f40 100644
--- a/shared/src/main/res/values-fi/target_faces.xml
+++ b/shared/src/main/res/values-fi/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-fr/rounds.xml b/shared/src/main/res/values-fr/rounds.xml
index ddea2f3dd..b0dce0660 100644
--- a/shared/src/main/res/values-fr/rounds.xml
+++ b/shared/src/main/res/values-fr/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australien Combiné Salle</string>
diff --git a/shared/src/main/res/values-fr/strings.xml b/shared/src/main/res/values-fr/strings.xml
index fb4e9db7e..546a08b3f 100644
--- a/shared/src/main/res/values-fr/strings.xml
+++ b/shared/src/main/res/values-fr/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Arc classique</string>
   <string name="compound_bow">Arc à poulies</string>
diff --git a/shared/src/main/res/values-fr/target_faces.xml b/shared/src/main/res/values-fr/target_faces.xml
index 9cfbabfad..840d200ca 100644
--- a/shared/src/main/res/values-fr/target_faces.xml
+++ b/shared/src/main/res/values-fr/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Normal</string>
diff --git a/shared/src/main/res/values-hu/rounds.xml b/shared/src/main/res/values-hu/rounds.xml
index 783a6e8be..a3801f868 100644
--- a/shared/src/main/res/values-hu/rounds.xml
+++ b/shared/src/main/res/values-hu/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Ausztrál kombinált teremben</string>
diff --git a/shared/src/main/res/values-hu/strings.xml b/shared/src/main/res/values-hu/strings.xml
index 424a4d22f..cbf7e9293 100644
--- a/shared/src/main/res/values-hu/strings.xml
+++ b/shared/src/main/res/values-hu/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Olimpiai/Reflex íj</string>
   <string name="compound_bow">Csigás íj</string>
diff --git a/shared/src/main/res/values-hu/target_faces.xml b/shared/src/main/res/values-hu/target_faces.xml
index b69ab5af8..6ae03bac2 100644
--- a/shared/src/main/res/values-hu/target_faces.xml
+++ b/shared/src/main/res/values-hu/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Szokásos</string>
diff --git a/shared/src/main/res/values-in/rounds.xml b/shared/src/main/res/values-in/rounds.xml
index c765314f4..71c3337d0 100644
--- a/shared/src/main/res/values-in/rounds.xml
+++ b/shared/src/main/res/values-in/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australia mengadakan didalam</string>
diff --git a/shared/src/main/res/values-in/strings.xml b/shared/src/main/res/values-in/strings.xml
index af43e8802..39d7f7bd6 100644
--- a/shared/src/main/res/values-in/strings.xml
+++ b/shared/src/main/res/values-in/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-in/target_faces.xml b/shared/src/main/res/values-in/target_faces.xml
index 1999c1975..a6033e968 100644
--- a/shared/src/main/res/values-in/target_faces.xml
+++ b/shared/src/main/res/values-in/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Reguler</string>
diff --git a/shared/src/main/res/values-it/rounds.xml b/shared/src/main/res/values-it/rounds.xml
index 7b1bf77d4..6e001a1a3 100644
--- a/shared/src/main/res/values-it/rounds.xml
+++ b/shared/src/main/res/values-it/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-it/strings.xml b/shared/src/main/res/values-it/strings.xml
index c9a9fa01e..52a7c9500 100644
--- a/shared/src/main/res/values-it/strings.xml
+++ b/shared/src/main/res/values-it/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Arco ricurvo</string>
   <string name="compound_bow">Arco compound</string>
diff --git a/shared/src/main/res/values-it/target_faces.xml b/shared/src/main/res/values-it/target_faces.xml
index a97a58db9..0601e5f56 100644
--- a/shared/src/main/res/values-it/target_faces.xml
+++ b/shared/src/main/res/values-it/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regolamentari</string>
diff --git a/shared/src/main/res/values-iw/rounds.xml b/shared/src/main/res/values-iw/rounds.xml
index 2d331eb62..e931bf6b4 100644
--- a/shared/src/main/res/values-iw/rounds.xml
+++ b/shared/src/main/res/values-iw/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-iw/strings.xml b/shared/src/main/res/values-iw/strings.xml
index a343c8d00..a0ee40589 100644
--- a/shared/src/main/res/values-iw/strings.xml
+++ b/shared/src/main/res/values-iw/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">קימור קשת</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-iw/target_faces.xml b/shared/src/main/res/values-iw/target_faces.xml
index 4430ef180..d75138f40 100644
--- a/shared/src/main/res/values-iw/target_faces.xml
+++ b/shared/src/main/res/values-iw/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-ja/rounds.xml b/shared/src/main/res/values-ja/rounds.xml
index 1711c61e1..d2d49848e 100644
--- a/shared/src/main/res/values-ja/rounds.xml
+++ b/shared/src/main/res/values-ja/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-ja/strings.xml b/shared/src/main/res/values-ja/strings.xml
index a2f3e30e4..6828f540f 100644
--- a/shared/src/main/res/values-ja/strings.xml
+++ b/shared/src/main/res/values-ja/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">リカーブボウ</string>
   <string name="compound_bow">コンパウンドボウ</string>
diff --git a/shared/src/main/res/values-ja/target_faces.xml b/shared/src/main/res/values-ja/target_faces.xml
index 6747af0e2..6403fcae5 100644
--- a/shared/src/main/res/values-ja/target_faces.xml
+++ b/shared/src/main/res/values-ja/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-ko/rounds.xml b/shared/src/main/res/values-ko/rounds.xml
index 2d331eb62..e931bf6b4 100644
--- a/shared/src/main/res/values-ko/rounds.xml
+++ b/shared/src/main/res/values-ko/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-ko/strings.xml b/shared/src/main/res/values-ko/strings.xml
index 52da1f9c8..d05aa6b49 100644
--- a/shared/src/main/res/values-ko/strings.xml
+++ b/shared/src/main/res/values-ko/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-ko/target_faces.xml b/shared/src/main/res/values-ko/target_faces.xml
index 4430ef180..d75138f40 100644
--- a/shared/src/main/res/values-ko/target_faces.xml
+++ b/shared/src/main/res/values-ko/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-nl/rounds.xml b/shared/src/main/res/values-nl/rounds.xml
index ff4093c70..5cc1c677e 100644
--- a/shared/src/main/res/values-nl/rounds.xml
+++ b/shared/src/main/res/values-nl/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australische gecombineerde Indoor</string>
diff --git a/shared/src/main/res/values-nl/strings.xml b/shared/src/main/res/values-nl/strings.xml
index 740b788b3..d5ee0bed9 100644
--- a/shared/src/main/res/values-nl/strings.xml
+++ b/shared/src/main/res/values-nl/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Recurve boog</string>
   <string name="compound_bow">Compound boog</string>
diff --git a/shared/src/main/res/values-nl/target_faces.xml b/shared/src/main/res/values-nl/target_faces.xml
index b8e814fd8..ca7ab5e5d 100644
--- a/shared/src/main/res/values-nl/target_faces.xml
+++ b/shared/src/main/res/values-nl/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Normaal</string>
diff --git a/shared/src/main/res/values-no/rounds.xml b/shared/src/main/res/values-no/rounds.xml
index e289f246a..bf5bbc0dc 100644
--- a/shared/src/main/res/values-no/rounds.xml
+++ b/shared/src/main/res/values-no/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australsk kombinert innendørs</string>
diff --git a/shared/src/main/res/values-no/strings.xml b/shared/src/main/res/values-no/strings.xml
index 7273f0128..d4dd592af 100644
--- a/shared/src/main/res/values-no/strings.xml
+++ b/shared/src/main/res/values-no/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Recurve</string>
   <string name="compound_bow">Compound</string>
diff --git a/shared/src/main/res/values-no/target_faces.xml b/shared/src/main/res/values-no/target_faces.xml
index 9876d0cf8..9a9506cca 100644
--- a/shared/src/main/res/values-no/target_faces.xml
+++ b/shared/src/main/res/values-no/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Vanlig</string>
diff --git a/shared/src/main/res/values-pl/rounds.xml b/shared/src/main/res/values-pl/rounds.xml
index 6f78fddc0..c4315a44e 100644
--- a/shared/src/main/res/values-pl/rounds.xml
+++ b/shared/src/main/res/values-pl/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-pl/strings.xml b/shared/src/main/res/values-pl/strings.xml
index 839402b14..b90782121 100644
--- a/shared/src/main/res/values-pl/strings.xml
+++ b/shared/src/main/res/values-pl/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Łuk klasyczny</string>
   <string name="compound_bow">Łuk bloczkowy</string>
diff --git a/shared/src/main/res/values-pl/target_faces.xml b/shared/src/main/res/values-pl/target_faces.xml
index b754195d2..7ef353b69 100644
--- a/shared/src/main/res/values-pl/target_faces.xml
+++ b/shared/src/main/res/values-pl/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Standardowe</string>
diff --git a/shared/src/main/res/values-pt-rBR/rounds.xml b/shared/src/main/res/values-pt-rBR/rounds.xml
index 6f2626e49..e15824bfc 100644
--- a/shared/src/main/res/values-pt-rBR/rounds.xml
+++ b/shared/src/main/res/values-pt-rBR/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Indoor Combinado Australiano</string>
diff --git a/shared/src/main/res/values-pt-rBR/strings.xml b/shared/src/main/res/values-pt-rBR/strings.xml
index 4d7cef660..ff4c7eea5 100644
--- a/shared/src/main/res/values-pt-rBR/strings.xml
+++ b/shared/src/main/res/values-pt-rBR/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Arco recurvo</string>
   <string name="compound_bow">Arco Composto</string>
diff --git a/shared/src/main/res/values-pt-rBR/target_faces.xml b/shared/src/main/res/values-pt-rBR/target_faces.xml
index 0f0283842..e1d792ca3 100644
--- a/shared/src/main/res/values-pt-rBR/target_faces.xml
+++ b/shared/src/main/res/values-pt-rBR/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Normal</string>
diff --git a/shared/src/main/res/values-pt-rPT/rounds.xml b/shared/src/main/res/values-pt-rPT/rounds.xml
index 6f2626e49..e15824bfc 100644
--- a/shared/src/main/res/values-pt-rPT/rounds.xml
+++ b/shared/src/main/res/values-pt-rPT/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Indoor Combinado Australiano</string>
diff --git a/shared/src/main/res/values-pt-rPT/strings.xml b/shared/src/main/res/values-pt-rPT/strings.xml
index ffbf8aeb0..4a0317db1 100644
--- a/shared/src/main/res/values-pt-rPT/strings.xml
+++ b/shared/src/main/res/values-pt-rPT/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-pt-rPT/target_faces.xml b/shared/src/main/res/values-pt-rPT/target_faces.xml
index 4430ef180..d75138f40 100644
--- a/shared/src/main/res/values-pt-rPT/target_faces.xml
+++ b/shared/src/main/res/values-pt-rPT/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-ro/rounds.xml b/shared/src/main/res/values-ro/rounds.xml
index 2d331eb62..e931bf6b4 100644
--- a/shared/src/main/res/values-ro/rounds.xml
+++ b/shared/src/main/res/values-ro/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-ro/strings.xml b/shared/src/main/res/values-ro/strings.xml
index 729fbb7d2..6b91892fe 100644
--- a/shared/src/main/res/values-ro/strings.xml
+++ b/shared/src/main/res/values-ro/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-ro/target_faces.xml b/shared/src/main/res/values-ro/target_faces.xml
index 4430ef180..d75138f40 100644
--- a/shared/src/main/res/values-ro/target_faces.xml
+++ b/shared/src/main/res/values-ro/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-ru/rounds.xml b/shared/src/main/res/values-ru/rounds.xml
index 5d5f42857..c2e10bc81 100644
--- a/shared/src/main/res/values-ru/rounds.xml
+++ b/shared/src/main/res/values-ru/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Австралийский комбинированный для крытых помещений</string>
diff --git a/shared/src/main/res/values-ru/strings.xml b/shared/src/main/res/values-ru/strings.xml
index 959b7cc3b..d16babe1a 100644
--- a/shared/src/main/res/values-ru/strings.xml
+++ b/shared/src/main/res/values-ru/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Спортивный классический лук</string>
   <string name="compound_bow">Блочный лук</string>
diff --git a/shared/src/main/res/values-ru/target_faces.xml b/shared/src/main/res/values-ru/target_faces.xml
index a03b3b8e4..44454f7fa 100644
--- a/shared/src/main/res/values-ru/target_faces.xml
+++ b/shared/src/main/res/values-ru/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Стандартный</string>
diff --git a/shared/src/main/res/values-sk/rounds.xml b/shared/src/main/res/values-sk/rounds.xml
index fc5f9d4a5..ece9ccba4 100644
--- a/shared/src/main/res/values-sk/rounds.xml
+++ b/shared/src/main/res/values-sk/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-sk/strings.xml b/shared/src/main/res/values-sk/strings.xml
index bb50ab7fb..6af45f8ad 100644
--- a/shared/src/main/res/values-sk/strings.xml
+++ b/shared/src/main/res/values-sk/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Zvratný luk</string>
   <string name="compound_bow">Kladkový luk</string>
diff --git a/shared/src/main/res/values-sk/target_faces.xml b/shared/src/main/res/values-sk/target_faces.xml
index de3de0fbd..b96685974 100644
--- a/shared/src/main/res/values-sk/target_faces.xml
+++ b/shared/src/main/res/values-sk/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Štandardné</string>
diff --git a/shared/src/main/res/values-sl/rounds.xml b/shared/src/main/res/values-sl/rounds.xml
index 2d331eb62..e931bf6b4 100644
--- a/shared/src/main/res/values-sl/rounds.xml
+++ b/shared/src/main/res/values-sl/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-sl/strings.xml b/shared/src/main/res/values-sl/strings.xml
index 824800801..44c152fe2 100644
--- a/shared/src/main/res/values-sl/strings.xml
+++ b/shared/src/main/res/values-sl/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Ukrivljeni lok</string>
   <string name="compound_bow">Sestavljeni lok</string>
diff --git a/shared/src/main/res/values-sl/target_faces.xml b/shared/src/main/res/values-sl/target_faces.xml
index 4430ef180..d75138f40 100644
--- a/shared/src/main/res/values-sl/target_faces.xml
+++ b/shared/src/main/res/values-sl/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-sr/rounds.xml b/shared/src/main/res/values-sr/rounds.xml
index 2d331eb62..e931bf6b4 100644
--- a/shared/src/main/res/values-sr/rounds.xml
+++ b/shared/src/main/res/values-sr/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-sr/strings.xml b/shared/src/main/res/values-sr/strings.xml
index 729fbb7d2..6b91892fe 100644
--- a/shared/src/main/res/values-sr/strings.xml
+++ b/shared/src/main/res/values-sr/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-sr/target_faces.xml b/shared/src/main/res/values-sr/target_faces.xml
index 4430ef180..d75138f40 100644
--- a/shared/src/main/res/values-sr/target_faces.xml
+++ b/shared/src/main/res/values-sr/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-sv/rounds.xml b/shared/src/main/res/values-sv/rounds.xml
index 3d44bbdcc..0e7f2664b 100644
--- a/shared/src/main/res/values-sv/rounds.xml
+++ b/shared/src/main/res/values-sv/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australiska Kombinerade Inomhus</string>
diff --git a/shared/src/main/res/values-sv/strings.xml b/shared/src/main/res/values-sv/strings.xml
index d203d83ef..deb26b54f 100644
--- a/shared/src/main/res/values-sv/strings.xml
+++ b/shared/src/main/res/values-sv/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Recurvebåge</string>
   <string name="compound_bow">Compoundbåge</string>
diff --git a/shared/src/main/res/values-sv/target_faces.xml b/shared/src/main/res/values-sv/target_faces.xml
index b3a714c53..a1450c70f 100644
--- a/shared/src/main/res/values-sv/target_faces.xml
+++ b/shared/src/main/res/values-sv/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-tr/rounds.xml b/shared/src/main/res/values-tr/rounds.xml
index 9ff64296f..1f10fa2f1 100644
--- a/shared/src/main/res/values-tr/rounds.xml
+++ b/shared/src/main/res/values-tr/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Avustralya kombine kapalı</string>
diff --git a/shared/src/main/res/values-tr/strings.xml b/shared/src/main/res/values-tr/strings.xml
index e684b177b..da6475735 100644
--- a/shared/src/main/res/values-tr/strings.xml
+++ b/shared/src/main/res/values-tr/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Olimpik Yay</string>
   <string name="compound_bow">Makaralı Yay</string>
diff --git a/shared/src/main/res/values-tr/target_faces.xml b/shared/src/main/res/values-tr/target_faces.xml
index b9a7b1b59..ec17ae163 100644
--- a/shared/src/main/res/values-tr/target_faces.xml
+++ b/shared/src/main/res/values-tr/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Standart</string>
diff --git a/shared/src/main/res/values-uk/rounds.xml b/shared/src/main/res/values-uk/rounds.xml
index 2d331eb62..e931bf6b4 100644
--- a/shared/src/main/res/values-uk/rounds.xml
+++ b/shared/src/main/res/values-uk/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-uk/strings.xml b/shared/src/main/res/values-uk/strings.xml
index 729fbb7d2..6b91892fe 100644
--- a/shared/src/main/res/values-uk/strings.xml
+++ b/shared/src/main/res/values-uk/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-uk/target_faces.xml b/shared/src/main/res/values-uk/target_faces.xml
index 4430ef180..d75138f40 100644
--- a/shared/src/main/res/values-uk/target_faces.xml
+++ b/shared/src/main/res/values-uk/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-vi/rounds.xml b/shared/src/main/res/values-vi/rounds.xml
index 2d331eb62..e931bf6b4 100644
--- a/shared/src/main/res/values-vi/rounds.xml
+++ b/shared/src/main/res/values-vi/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-vi/strings.xml b/shared/src/main/res/values-vi/strings.xml
index 52da1f9c8..d05aa6b49 100644
--- a/shared/src/main/res/values-vi/strings.xml
+++ b/shared/src/main/res/values-vi/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-vi/target_faces.xml b/shared/src/main/res/values-vi/target_faces.xml
index 4430ef180..d75138f40 100644
--- a/shared/src/main/res/values-vi/target_faces.xml
+++ b/shared/src/main/res/values-vi/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-zh-rCN/rounds.xml b/shared/src/main/res/values-zh-rCN/rounds.xml
index dd5ac2d59..f3e456aae 100644
--- a/shared/src/main/res/values-zh-rCN/rounds.xml
+++ b/shared/src/main/res/values-zh-rCN/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-zh-rCN/strings.xml b/shared/src/main/res/values-zh-rCN/strings.xml
index 7a51390b9..65e93f72c 100644
--- a/shared/src/main/res/values-zh-rCN/strings.xml
+++ b/shared/src/main/res/values-zh-rCN/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">反曲弓</string>
   <string name="compound_bow">复合弓</string>
diff --git a/shared/src/main/res/values-zh-rCN/target_faces.xml b/shared/src/main/res/values-zh-rCN/target_faces.xml
index 34e4e1a62..20bd1e175 100644
--- a/shared/src/main/res/values-zh-rCN/target_faces.xml
+++ b/shared/src/main/res/values-zh-rCN/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-zh-rTW/rounds.xml b/shared/src/main/res/values-zh-rTW/rounds.xml
index 2d331eb62..e931bf6b4 100644
--- a/shared/src/main/res/values-zh-rTW/rounds.xml
+++ b/shared/src/main/res/values-zh-rTW/rounds.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-zh-rTW/strings.xml b/shared/src/main/res/values-zh-rTW/strings.xml
index b2ba17a0f..f35a8e221 100644
--- a/shared/src/main/res/values-zh-rTW/strings.xml
+++ b/shared/src/main/res/values-zh-rTW/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="recurve_bow">反曲弓</string>
   <string name="compound_bow">複合弓</string>
diff --git a/shared/src/main/res/values-zh-rTW/target_faces.xml b/shared/src/main/res/values-zh-rTW/target_faces.xml
index 4430ef180..d75138f40 100644
--- a/shared/src/main/res/values-zh-rTW/target_faces.xml
+++ b/shared/src/main/res/values-zh-rTW/target_faces.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values/colors.xml b/shared/src/main/res/values/colors.xml
index 073407809..2585c1eff 100644
--- a/shared/src/main/res/values/colors.xml
+++ b/shared/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -19,4 +19,4 @@
     <color name="timer_green">@color/md_green_600</color>
     <color name="timer_orange">@color/md_orange_600</color>
     <color name="timer_red">@color/md_red_600</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/shared/src/main/res/values/material_design_colors.xml b/shared/src/main/res/values/material_design_colors.xml
index b9e3666b2..b55b527cd 100644
--- a/shared/src/main/res/values/material_design_colors.xml
+++ b/shared/src/main/res/values/material_design_colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/values/rounds.xml b/shared/src/main/res/values/rounds.xml
index b27f5c292..ca06b573e 100644
--- a/shared/src/main/res/values/rounds.xml
+++ b/shared/src/main/res/values/rounds.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -225,4 +225,4 @@
     <string name="big_game_36">Big Game 36</string>
     <string name="big_game_40">Big Game 40</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/shared/src/main/res/values/strings.xml b/shared/src/main/res/values/strings.xml
index 44d1c5b91..55accaa84 100644
--- a/shared/src/main/res/values/strings.xml
+++ b/shared/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/shared/src/main/res/values/target_faces.xml b/shared/src/main/res/values/target_faces.xml
index 151b730ec..13b4e9e56 100644
--- a/shared/src/main/res/values/target_faces.xml
+++ b/shared/src/main/res/values/target_faces.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -61,4 +61,4 @@
     <string name="recurve_style_x_8">Recurve style (X–8)</string>
     <string name="recurve_style_10_8">Recurve style (10–8)</string>
     <string name="compound_style">Compound style</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/shared/src/test/java/de/dreier/mytargets/shared/models/ScoreTest.kt b/shared/src/test/java/de/dreier/mytargets/shared/models/ScoreTest.kt
index 6b93b03ba..9fcf51557 100644
--- a/shared/src/test/java/de/dreier/mytargets/shared/models/ScoreTest.kt
+++ b/shared/src/test/java/de/dreier/mytargets/shared/models/ScoreTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/shared/src/test/java/de/dreier/mytargets/shared/utils/ImageListTest.kt b/shared/src/test/java/de/dreier/mytargets/shared/utils/ImageListTest.kt
index 660f9e139..fb0f9a053 100644
--- a/shared/src/test/java/de/dreier/mytargets/shared/utils/ImageListTest.kt
+++ b/shared/src/test/java/de/dreier/mytargets/shared/utils/ImageListTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/tools/script-codacy.gradle b/tools/script-codacy.gradle
index 19d814531..613ac0825 100644
--- a/tools/script-codacy.gradle
+++ b/tools/script-codacy.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/tools/script-crowdin.gradle b/tools/script-crowdin.gradle
index 12cc3a5a0..66dcd97c4 100644
--- a/tools/script-crowdin.gradle
+++ b/tools/script-crowdin.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/tools/script-dependency-updates.gradle b/tools/script-dependency-updates.gradle
index 851a207a1..5678163b0 100644
--- a/tools/script-dependency-updates.gradle
+++ b/tools/script-dependency-updates.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/tools/script-git-version.gradle b/tools/script-git-version.gradle
index bad48f899..8bc88850c 100644
--- a/tools/script-git-version.gradle
+++ b/tools/script-git-version.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/tools/script-keystore-fallback.gradle b/tools/script-keystore-fallback.gradle
index 2256e3c95..2354bcf2a 100644
--- a/tools/script-keystore-fallback.gradle
+++ b/tools/script-keystore-fallback.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/tools/script-play-store.gradle b/tools/script-play-store.gradle
index 8bdacaea9..b3a1ba50e 100644
--- a/tools/script-play-store.gradle
+++ b/tools/script-play-store.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/wearable/build.gradle b/wearable/build.gradle
index 111979e65..7797dc143 100644
--- a/wearable/build.gradle
+++ b/wearable/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/wearable/src/main/AndroidManifest.xml b/wearable/src/main/AndroidManifest.xml
index cad24c500..bfa773433 100644
--- a/wearable/src/main/AndroidManifest.xml
+++ b/wearable/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -12,7 +12,7 @@
   ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
--->
+  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="de.dreier.mytargets">
 
diff --git a/wearable/src/main/java/de/dreier/mytargets/ApplicationInstance.kt b/wearable/src/main/java/de/dreier/mytargets/ApplicationInstance.kt
index 2785f3a19..745a5d615 100644
--- a/wearable/src/main/java/de/dreier/mytargets/ApplicationInstance.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/ApplicationInstance.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/wearable/src/main/java/de/dreier/mytargets/InputActivity.kt b/wearable/src/main/java/de/dreier/mytargets/InputActivity.kt
index 1a36c2dc3..e4e6228d2 100644
--- a/wearable/src/main/java/de/dreier/mytargets/InputActivity.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/InputActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/wearable/src/main/java/de/dreier/mytargets/MainActivity.kt b/wearable/src/main/java/de/dreier/mytargets/MainActivity.kt
index 12611fca2..f1d191f08 100644
--- a/wearable/src/main/java/de/dreier/mytargets/MainActivity.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/MainActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/wearable/src/main/java/de/dreier/mytargets/RoundActivity.kt b/wearable/src/main/java/de/dreier/mytargets/RoundActivity.kt
index 09573a40b..a356906a0 100644
--- a/wearable/src/main/java/de/dreier/mytargets/RoundActivity.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/RoundActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/wearable/src/main/java/de/dreier/mytargets/TargetSelectView.kt b/wearable/src/main/java/de/dreier/mytargets/TargetSelectView.kt
index c2689fde3..bc0ca84c8 100644
--- a/wearable/src/main/java/de/dreier/mytargets/TargetSelectView.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/TargetSelectView.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/wearable/src/main/java/de/dreier/mytargets/TimerActivity.kt b/wearable/src/main/java/de/dreier/mytargets/TimerActivity.kt
index 5238be5db..a8b78c04c 100644
--- a/wearable/src/main/java/de/dreier/mytargets/TimerActivity.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/TimerActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/wearable/src/main/java/de/dreier/mytargets/WearWearableListener.kt b/wearable/src/main/java/de/dreier/mytargets/WearWearableListener.kt
index 7f66262a1..380bda0eb 100644
--- a/wearable/src/main/java/de/dreier/mytargets/WearWearableListener.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/WearWearableListener.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/wearable/src/main/java/de/dreier/mytargets/utils/WearSettingsManager.kt b/wearable/src/main/java/de/dreier/mytargets/utils/WearSettingsManager.kt
index b7c1a77c8..bb8aac5ee 100644
--- a/wearable/src/main/java/de/dreier/mytargets/utils/WearSettingsManager.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/utils/WearSettingsManager.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/wearable/src/main/java/de/dreier/mytargets/utils/WearWearableClient.kt b/wearable/src/main/java/de/dreier/mytargets/utils/WearWearableClient.kt
index f0fe70574..9e36b2a5b 100644
--- a/wearable/src/main/java/de/dreier/mytargets/utils/WearWearableClient.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/utils/WearWearableClient.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Florian Dreier
+ * Copyright (C) 2018 Florian Dreier
  *
  * This file is part of MyTargets.
  *
diff --git a/wearable/src/main/res/drawable/ic_add_white_24dp.xml b/wearable/src/main/res/drawable/ic_add_white_24dp.xml
index 6b6146ecc..daf4396e6 100644
--- a/wearable/src/main/res/drawable/ic_add_white_24dp.xml
+++ b/wearable/src/main/res/drawable/ic_add_white_24dp.xml
@@ -1,3 +1,18 @@
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/wearable/src/main/res/drawable/ic_close_white_18dp.xml b/wearable/src/main/res/drawable/ic_close_white_18dp.xml
index e744c766b..0e18db708 100644
--- a/wearable/src/main/res/drawable/ic_close_white_18dp.xml
+++ b/wearable/src/main/res/drawable/ic_close_white_18dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/wearable/src/main/res/drawable/ic_more_vert_white_24dp.xml b/wearable/src/main/res/drawable/ic_more_vert_white_24dp.xml
index fff488b6e..4d17c7d7c 100644
--- a/wearable/src/main/res/drawable/ic_more_vert_white_24dp.xml
+++ b/wearable/src/main/res/drawable/ic_more_vert_white_24dp.xml
@@ -1,3 +1,18 @@
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/wearable/src/main/res/drawable/ic_play_arrow_white_48dp.xml b/wearable/src/main/res/drawable/ic_play_arrow_white_48dp.xml
index 33ac748aa..247fb9d99 100644
--- a/wearable/src/main/res/drawable/ic_play_arrow_white_48dp.xml
+++ b/wearable/src/main/res/drawable/ic_play_arrow_white_48dp.xml
@@ -1,3 +1,18 @@
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <vector android:height="48dp"
         android:viewportHeight="24.0"
         android:viewportWidth="24.0"
diff --git a/wearable/src/main/res/drawable/ic_stop_white_24dp.xml b/wearable/src/main/res/drawable/ic_stop_white_24dp.xml
index 7b22ab479..7b79d5c1f 100644
--- a/wearable/src/main/res/drawable/ic_stop_white_24dp.xml
+++ b/wearable/src/main/res/drawable/ic_stop_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/wearable/src/main/res/drawable/ic_timer_off_white_24dp.xml b/wearable/src/main/res/drawable/ic_timer_off_white_24dp.xml
index 170520b48..1e25f42f8 100644
--- a/wearable/src/main/res/drawable/ic_timer_off_white_24dp.xml
+++ b/wearable/src/main/res/drawable/ic_timer_off_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/wearable/src/main/res/drawable/ic_traffic_white_24dp.xml b/wearable/src/main/res/drawable/ic_traffic_white_24dp.xml
index f84b2c484..acc4d2dee 100644
--- a/wearable/src/main/res/drawable/ic_traffic_white_24dp.xml
+++ b/wearable/src/main/res/drawable/ic_traffic_white_24dp.xml
@@ -1,3 +1,18 @@
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/wearable/src/main/res/drawable/ic_vibration_off_white_24dp.xml b/wearable/src/main/res/drawable/ic_vibration_off_white_24dp.xml
index d5729278b..74a9031d2 100644
--- a/wearable/src/main/res/drawable/ic_vibration_off_white_24dp.xml
+++ b/wearable/src/main/res/drawable/ic_vibration_off_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/wearable/src/main/res/drawable/ic_vibration_white_24dp.xml b/wearable/src/main/res/drawable/ic_vibration_white_24dp.xml
index ec1fe5be5..c105f9aff 100644
--- a/wearable/src/main/res/drawable/ic_vibration_white_24dp.xml
+++ b/wearable/src/main/res/drawable/ic_vibration_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/wearable/src/main/res/drawable/ic_volume_off_white_24dp.xml b/wearable/src/main/res/drawable/ic_volume_off_white_24dp.xml
index ca0636b9d..6dfab723f 100644
--- a/wearable/src/main/res/drawable/ic_volume_off_white_24dp.xml
+++ b/wearable/src/main/res/drawable/ic_volume_off_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/wearable/src/main/res/drawable/ic_volume_up_white_24dp.xml b/wearable/src/main/res/drawable/ic_volume_up_white_24dp.xml
index 880f11753..3fe2de396 100644
--- a/wearable/src/main/res/drawable/ic_volume_up_white_24dp.xml
+++ b/wearable/src/main/res/drawable/ic_volume_up_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/wearable/src/main/res/drawable/shape_round_active.xml b/wearable/src/main/res/drawable/shape_round_active.xml
index 814037d0b..05cfad78b 100644
--- a/wearable/src/main/res/drawable/shape_round_active.xml
+++ b/wearable/src/main/res/drawable/shape_round_active.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/wearable/src/main/res/layout/activity_input.xml b/wearable/src/main/res/layout/activity_input.xml
index d6d0d49b0..f22c417e4 100644
--- a/wearable/src/main/res/layout/activity_input.xml
+++ b/wearable/src/main/res/layout/activity_input.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/wearable/src/main/res/layout/activity_main.xml b/wearable/src/main/res/layout/activity_main.xml
index 8dde6f4f0..20d0b3e4e 100644
--- a/wearable/src/main/res/layout/activity_main.xml
+++ b/wearable/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/wearable/src/main/res/layout/activity_round.xml b/wearable/src/main/res/layout/activity_round.xml
index f8cec6024..2894fe7c1 100644
--- a/wearable/src/main/res/layout/activity_round.xml
+++ b/wearable/src/main/res/layout/activity_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/wearable/src/main/res/layout/activity_timer.xml b/wearable/src/main/res/layout/activity_timer.xml
index 67f98c6a7..b5402b32c 100644
--- a/wearable/src/main/res/layout/activity_timer.xml
+++ b/wearable/src/main/res/layout/activity_timer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/wearable/src/main/res/layout/fragment_timer.xml b/wearable/src/main/res/layout/fragment_timer.xml
index 5f859a667..dfc6c7d3e 100644
--- a/wearable/src/main/res/layout/fragment_timer.xml
+++ b/wearable/src/main/res/layout/fragment_timer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/wearable/src/main/res/layout/item_end.xml b/wearable/src/main/res/layout/item_end.xml
index 4d7f70874..07f80edde 100644
--- a/wearable/src/main/res/layout/item_end.xml
+++ b/wearable/src/main/res/layout/item_end.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/wearable/src/main/res/layout/item_inline_button.xml b/wearable/src/main/res/layout/item_inline_button.xml
index 1fa88d79e..13c6df6c4 100644
--- a/wearable/src/main/res/layout/item_inline_button.xml
+++ b/wearable/src/main/res/layout/item_inline_button.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/wearable/src/main/res/layout/layout_clock.xml b/wearable/src/main/res/layout/layout_clock.xml
index 4e661493d..708c3396e 100644
--- a/wearable/src/main/res/layout/layout_clock.xml
+++ b/wearable/src/main/res/layout/layout_clock.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/wearable/src/main/res/menu/timer_action_drawer_menu.xml b/wearable/src/main/res/menu/timer_action_drawer_menu.xml
index d3c6b1e32..0627bc769 100644
--- a/wearable/src/main/res/menu/timer_action_drawer_menu.xml
+++ b/wearable/src/main/res/menu/timer_action_drawer_menu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/wearable/src/main/res/values-af/strings.xml b/wearable/src/main/res/values-af/strings.xml
index 68a3288b5..df0bae07f 100644
--- a/wearable/src/main/res/values-af/strings.xml
+++ b/wearable/src/main/res/values-af/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-ar/strings.xml b/wearable/src/main/res/values-ar/strings.xml
index 68a3288b5..df0bae07f 100644
--- a/wearable/src/main/res/values-ar/strings.xml
+++ b/wearable/src/main/res/values-ar/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-ca/strings.xml b/wearable/src/main/res/values-ca/strings.xml
index 2c4d1522c..d37ad05ca 100644
--- a/wearable/src/main/res/values-ca/strings.xml
+++ b/wearable/src/main/res/values-ca/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Guardat</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-cs/strings.xml b/wearable/src/main/res/values-cs/strings.xml
index 1de277e34..b74082333 100644
--- a/wearable/src/main/res/values-cs/strings.xml
+++ b/wearable/src/main/res/values-cs/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Uloženo</string>
   <string name="start_phone_app">Spusťte aplikaci ve svém telefonu...</string>
diff --git a/wearable/src/main/res/values-da/strings.xml b/wearable/src/main/res/values-da/strings.xml
index a1a121351..6d45f26d1 100644
--- a/wearable/src/main/res/values-da/strings.xml
+++ b/wearable/src/main/res/values-da/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Gemt</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-de/strings.xml b/wearable/src/main/res/values-de/strings.xml
index ca326e194..b1eeddb07 100644
--- a/wearable/src/main/res/values-de/strings.xml
+++ b/wearable/src/main/res/values-de/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Gespeichert</string>
   <string name="start_phone_app">Starte die App auf deinem Handy um fortzufahren…</string>
diff --git a/wearable/src/main/res/values-el/strings.xml b/wearable/src/main/res/values-el/strings.xml
index 68a3288b5..df0bae07f 100644
--- a/wearable/src/main/res/values-el/strings.xml
+++ b/wearable/src/main/res/values-el/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-es/strings.xml b/wearable/src/main/res/values-es/strings.xml
index f9456fe37..23ea43a17 100644
--- a/wearable/src/main/res/values-es/strings.xml
+++ b/wearable/src/main/res/values-es/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Guardado</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-et/strings.xml b/wearable/src/main/res/values-et/strings.xml
index 7187f4213..0e76ea256 100644
--- a/wearable/src/main/res/values-et/strings.xml
+++ b/wearable/src/main/res/values-et/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Salvestatud</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-fi/strings.xml b/wearable/src/main/res/values-fi/strings.xml
index 68a3288b5..df0bae07f 100644
--- a/wearable/src/main/res/values-fi/strings.xml
+++ b/wearable/src/main/res/values-fi/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-fr/strings.xml b/wearable/src/main/res/values-fr/strings.xml
index 716a97dbb..b8f522c9b 100644
--- a/wearable/src/main/res/values-fr/strings.xml
+++ b/wearable/src/main/res/values-fr/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Enregistré</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-hu/strings.xml b/wearable/src/main/res/values-hu/strings.xml
index e5c5726b8..3514260c4 100644
--- a/wearable/src/main/res/values-hu/strings.xml
+++ b/wearable/src/main/res/values-hu/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Mentve</string>
   <string name="start_phone_app">A folytatáshoz a fő eszközön is indítsd el a MyTargets-t</string>
diff --git a/wearable/src/main/res/values-in/strings.xml b/wearable/src/main/res/values-in/strings.xml
index ad508aed1..5bfef256f 100644
--- a/wearable/src/main/res/values-in/strings.xml
+++ b/wearable/src/main/res/values-in/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Disimpan</string>
   <string name="start_phone_app">Jalankan aplikasi di ponsel Anda untuk melanjutkan …</string>
diff --git a/wearable/src/main/res/values-it/strings.xml b/wearable/src/main/res/values-it/strings.xml
index d7fb0c4d5..e96b563a2 100644
--- a/wearable/src/main/res/values-it/strings.xml
+++ b/wearable/src/main/res/values-it/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Salvato</string>
   <string name="start_phone_app">Avvia l\'app dal telefono per continuare…</string>
diff --git a/wearable/src/main/res/values-iw/strings.xml b/wearable/src/main/res/values-iw/strings.xml
index 68a3288b5..df0bae07f 100644
--- a/wearable/src/main/res/values-iw/strings.xml
+++ b/wearable/src/main/res/values-iw/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-ja/strings.xml b/wearable/src/main/res/values-ja/strings.xml
index 9bf770f89..8bfb343b7 100644
--- a/wearable/src/main/res/values-ja/strings.xml
+++ b/wearable/src/main/res/values-ja/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">保存</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-ko/strings.xml b/wearable/src/main/res/values-ko/strings.xml
index 68a3288b5..df0bae07f 100644
--- a/wearable/src/main/res/values-ko/strings.xml
+++ b/wearable/src/main/res/values-ko/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-nl/strings.xml b/wearable/src/main/res/values-nl/strings.xml
index 97004bf4c..c366c094f 100644
--- a/wearable/src/main/res/values-nl/strings.xml
+++ b/wearable/src/main/res/values-nl/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Opgeslagen</string>
   <string name="start_phone_app">Start de app op uw telefoon om verder te gaan…</string>
diff --git a/wearable/src/main/res/values-no/strings.xml b/wearable/src/main/res/values-no/strings.xml
index 4727d0e51..861b40775 100644
--- a/wearable/src/main/res/values-no/strings.xml
+++ b/wearable/src/main/res/values-no/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Lagret</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-pl/strings.xml b/wearable/src/main/res/values-pl/strings.xml
index 97e431ab7..f1c4245c8 100644
--- a/wearable/src/main/res/values-pl/strings.xml
+++ b/wearable/src/main/res/values-pl/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Zapisano</string>
   <string name="start_phone_app">Włącz aplikację na swoim telefonie aby kontynuować…</string>
diff --git a/wearable/src/main/res/values-pt-rBR/strings.xml b/wearable/src/main/res/values-pt-rBR/strings.xml
index e26d5e3a6..053d7cde0 100644
--- a/wearable/src/main/res/values-pt-rBR/strings.xml
+++ b/wearable/src/main/res/values-pt-rBR/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Salvo</string>
   <string name="start_phone_app">Inicie o aplicativo em seu telefone para continuar…</string>
diff --git a/wearable/src/main/res/values-pt-rPT/strings.xml b/wearable/src/main/res/values-pt-rPT/strings.xml
index 515f0a177..bfacdbc43 100644
--- a/wearable/src/main/res/values-pt-rPT/strings.xml
+++ b/wearable/src/main/res/values-pt-rPT/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Salvo</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-ro/strings.xml b/wearable/src/main/res/values-ro/strings.xml
index 68a3288b5..df0bae07f 100644
--- a/wearable/src/main/res/values-ro/strings.xml
+++ b/wearable/src/main/res/values-ro/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-ru/strings.xml b/wearable/src/main/res/values-ru/strings.xml
index 4ac62dbd0..0c34b17b4 100644
--- a/wearable/src/main/res/values-ru/strings.xml
+++ b/wearable/src/main/res/values-ru/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Сохранено</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-sk/strings.xml b/wearable/src/main/res/values-sk/strings.xml
index f79077411..7a64da5de 100644
--- a/wearable/src/main/res/values-sk/strings.xml
+++ b/wearable/src/main/res/values-sk/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Uložené</string>
   <string name="start_phone_app">Pre pokračovanie spustite na telefóne aplikáciu…</string>
diff --git a/wearable/src/main/res/values-sl/strings.xml b/wearable/src/main/res/values-sl/strings.xml
index f597f0e40..6d37605e5 100644
--- a/wearable/src/main/res/values-sl/strings.xml
+++ b/wearable/src/main/res/values-sl/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Shranjeno</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-sr/strings.xml b/wearable/src/main/res/values-sr/strings.xml
index 68a3288b5..df0bae07f 100644
--- a/wearable/src/main/res/values-sr/strings.xml
+++ b/wearable/src/main/res/values-sr/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-sv/strings.xml b/wearable/src/main/res/values-sv/strings.xml
index bcb51e35a..29dd3e55a 100644
--- a/wearable/src/main/res/values-sv/strings.xml
+++ b/wearable/src/main/res/values-sv/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Sparad</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-sw210dp-round/dimens.xml b/wearable/src/main/res/values-sw210dp-round/dimens.xml
index 630c43e51..a3ba5f52f 100644
--- a/wearable/src/main/res/values-sw210dp-round/dimens.xml
+++ b/wearable/src/main/res/values-sw210dp-round/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -16,4 +16,4 @@
 
 <resources>
     <dimen name="peek_drawer_icon_size">24dp</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/wearable/src/main/res/values-tr/strings.xml b/wearable/src/main/res/values-tr/strings.xml
index 55b266472..94c4da02d 100644
--- a/wearable/src/main/res/values-tr/strings.xml
+++ b/wearable/src/main/res/values-tr/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Kaydedildi</string>
   <string name="start_phone_app">Devam etmek için telefonunuzdaki uygulamayı başlatın…</string>
diff --git a/wearable/src/main/res/values-uk/strings.xml b/wearable/src/main/res/values-uk/strings.xml
index 68a3288b5..df0bae07f 100644
--- a/wearable/src/main/res/values-uk/strings.xml
+++ b/wearable/src/main/res/values-uk/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-vi/strings.xml b/wearable/src/main/res/values-vi/strings.xml
index 68a3288b5..df0bae07f 100644
--- a/wearable/src/main/res/values-vi/strings.xml
+++ b/wearable/src/main/res/values-vi/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-zh-rCN/strings.xml b/wearable/src/main/res/values-zh-rCN/strings.xml
index f181eefbf..52b1036f6 100644
--- a/wearable/src/main/res/values-zh-rCN/strings.xml
+++ b/wearable/src/main/res/values-zh-rCN/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">已保存</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-zh-rTW/strings.xml b/wearable/src/main/res/values-zh-rTW/strings.xml
index 90468e881..4d8e5a0f1 100644
--- a/wearable/src/main/res/values-zh-rTW/strings.xml
+++ b/wearable/src/main/res/values-zh-rTW/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
@@ -14,6 +13,9 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
+
+<!--Generated by crowdin.com-->
+
 <resources>
   <string name="saved">已儲存</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values/colors.xml b/wearable/src/main/res/values/colors.xml
index 501e11b25..790835896 100644
--- a/wearable/src/main/res/values/colors.xml
+++ b/wearable/src/main/res/values/colors.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 Florian Dreier
+  ~
+  ~ This file is part of MyTargets.
+  ~
+  ~ MyTargets is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License version 2
+  ~ as published by the Free Software Foundation.
+  ~
+  ~ MyTargets is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  -->
+
 <resources>
     <color name="md_wear_green_accent">#80ff84</color>
     <color name="md_wear_green_active_ui_element">#47a64a</color>
@@ -6,4 +21,4 @@
     <color name="md_wear_green_darker_ui_element">#2c662e</color>
     <color name="md_wear_green_lighter_background">#214d22</color>
     <color name="md_wear_green_dark_background">#102611</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/wearable/src/main/res/values/dimens.xml b/wearable/src/main/res/values/dimens.xml
index 0c30a8fa9..7ef9eba63 100644
--- a/wearable/src/main/res/values/dimens.xml
+++ b/wearable/src/main/res/values/dimens.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~
diff --git a/wearable/src/main/res/values/strings.xml b/wearable/src/main/res/values/strings.xml
index 3e6862f52..2e15b845e 100644
--- a/wearable/src/main/res/values/strings.xml
+++ b/wearable/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Florian Dreier
+  ~ Copyright (C) 2018 Florian Dreier
   ~
   ~ This file is part of MyTargets.
   ~

From 823e9971d406e7f6299036d8b8c4c464bfdf9d6b Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Mon, 15 Jan 2018 10:55:30 +0100
Subject: [PATCH 028/102] Made Round a POJO and introduced RoundDAO

---
 .../de/dreier/mytargets/app/MigrationTest.kt  |   9 +-
 .../features/rounds/EditRoundFragment.kt      |  15 ++-
 .../features/scoreboard/ScoreboardUtils.kt    |   3 +-
 .../layout/DefaultScoreboardLayout.kt         |   5 +-
 .../features/statistics/ArrowStatistic.kt     |   6 +-
 .../features/statistics/CsvExporter.kt        |   3 +-
 .../features/statistics/StatisticsActivity.kt |   3 +-
 .../features/statistics/StatisticsFragment.kt |   9 +-
 .../features/training/RoundFragment.kt        |  24 ++--
 .../training/details/TrainingFragment.kt      |   6 +-
 .../training/overview/TrainingsFragment.kt    |   4 +-
 .../mytargets/utils/MobileWearableListener.kt |   3 +-
 .../shared/models/augmented/AugmentedRound.kt |   3 +-
 .../models/augmented/AugmentedTraining.kt     |  17 +++
 .../mytargets/shared/models/dao/EndDAO.kt     |   9 ++
 .../mytargets/shared/models/dao/RoundDAO.kt   |  95 +++++++++++++
 .../mytargets/shared/models/db/Round.kt       | 127 +-----------------
 .../mytargets/shared/models/db/Training.kt    |  14 +-
 .../mytargets/shared/utils/ScoreUtils.kt      |   3 +-
 19 files changed, 179 insertions(+), 179 deletions(-)
 create mode 100644 shared/src/main/java/de/dreier/mytargets/shared/models/dao/RoundDAO.kt

diff --git a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
index 9603568a2..0a704e7b6 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
@@ -34,6 +34,7 @@ import de.dreier.mytargets.shared.models.Dimension.Unit.METER
 import de.dreier.mytargets.shared.models.EWeather
 import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.dao.EndDAO
+import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.test.base.InstrumentedTestBase
@@ -124,7 +125,7 @@ class MigrationTest : InstrumentedTestBase() {
         Truth.assertThat(rounds[1].target.id).isEqualTo(0)
         Truth.assertThat(rounds[1].target.scoringStyleIndex).isEqualTo(0)
         Truth.assertThat(rounds[1].target.diameter).isEqualTo(Dimension(60f, CENTIMETER))
-        Truth.assertThat(rounds[1].loadEnds()).hasSize(2)
+        Truth.assertThat(RoundDAO.loadEnds(rounds[1].id)).hasSize(2)
     }
 
     private fun assertRound11(rounds: List<Round>) {
@@ -139,7 +140,7 @@ class MigrationTest : InstrumentedTestBase() {
         Truth.assertThat(round1.target.id).isEqualTo(1)
         Truth.assertThat(round1.target.scoringStyleIndex).isEqualTo(2)
         Truth.assertThat(round1.target.diameter).isEqualTo(Dimension(40f, CENTIMETER))
-        val ends = round1.loadEnds()
+        val ends = RoundDAO.loadEnds(round1.id)
         Truth.assertThat(ends).hasSize(3)
         Truth.assertThat(ends[0].id).isEqualTo(1L)
         Truth.assertThat(ends[0].roundId).isEqualTo(1L)
@@ -175,8 +176,8 @@ class MigrationTest : InstrumentedTestBase() {
         Truth.assertThat(training.windSpeed).isEqualTo(3)
         Truth.assertThat(training.location).isEqualTo("Neufahrn bei Freising")
         val rounds = training.loadRounds()
-        Truth.assertThat(rounds[0].loadEnds()).hasSize(6)
-        Truth.assertThat(rounds[1].loadEnds()).hasSize(6)
+        Truth.assertThat(RoundDAO.loadEnds(rounds[0].id)).hasSize(6)
+        Truth.assertThat(RoundDAO.loadEnds(rounds[1].id)).hasSize(6)
     }
 
     @Test
diff --git a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
index 0a7713feb..48bb61562 100644
--- a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
@@ -26,6 +26,7 @@ import de.dreier.mytargets.base.fragments.EditableListFragmentBase.Companion.ITE
 import de.dreier.mytargets.databinding.FragmentEditRoundBinding
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.features.training.target.TargetListFragment
+import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.utils.ToolbarUtils
@@ -76,11 +77,11 @@ class EditRoundFragment : EditFragmentBase() {
             loadRoundDefaultValues()
         } else {
             ToolbarUtils.setTitle(this, R.string.edit_round)
-            val round = Round[roundId!!]
-            binding.distance.setItem(round!!.distance)
+            val round = RoundDAO.loadRound(roundId!!)
+            binding.distance.setItem(round.distance)
             binding.target.setItem(round.target)
             binding.notEditable.visibility = View.GONE
-            if (round.training.standardRoundId != null) {
+            if (Training[round.trainingId!!]!!.standardRoundId != null) {
                 binding.distanceLayout.visibility = View.GONE
             }
         }
@@ -109,7 +110,7 @@ class EditRoundFragment : EditFragmentBase() {
     private fun onSaveRound(): Round? {
         val training = Training[trainingId]
 
-        val round: Round?
+        val round: Round
         if (roundId == null) {
             round = Round()
             round.trainingId = trainingId
@@ -117,11 +118,11 @@ class EditRoundFragment : EditFragmentBase() {
             round.maxEndCount = null
             round.index = training!!.loadRounds().size
         } else {
-            round = Round[roundId!!]
+            round = RoundDAO.loadRound(roundId!!)
         }
-        round!!.distance = binding.distance.selectedItem!!
+        round.distance = binding.distance.selectedItem!!
         round.target = binding.target.selectedItem!!
-        round.save()
+        RoundDAO.saveRound(round)
         return round
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
index f88b62ada..9d3d19559 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
@@ -29,6 +29,7 @@ import de.dreier.mytargets.features.scoreboard.builder.ViewBuilder
 import de.dreier.mytargets.features.scoreboard.layout.DefaultScoreboardLayout
 import de.dreier.mytargets.features.scoreboard.pdf.ViewPrintDocumentAdapter
 import de.dreier.mytargets.features.scoreboard.pdf.ViewToPdfWriter
+import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.utils.writeToJPGFile
@@ -46,7 +47,7 @@ object ScoreboardUtils {
         val rounds: List<Round>? = if (roundId == -1L) {
             training.loadRounds()
         } else {
-            listOf(Round[roundId]!!)
+            listOf(RoundDAO.loadRound(roundId))
         }
 
         val scoreboardLayout = DefaultScoreboardLayout(context, locale, configuration)
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
index 17d3dd786..76b76e0f9 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
@@ -26,6 +26,7 @@ import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.SelectableZone
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.dao.EndDAO
+import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.models.db.Training
@@ -219,7 +220,7 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
         val table = Table(false)
         appendTableHeader(table, round.shotsPerEnd)
         var carry = 0
-        for (end in round.loadEnds()) {
+        for (end in RoundDAO.loadEnds(round.id)) {
             val row = table.startRow()
             row.addCell(end.index + 1)
             var sum = 0
@@ -277,7 +278,7 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
 
         var commentsCount = 0
         for (round in rounds) {
-            val ends = round.loadEnds()
+            val ends = RoundDAO.loadEnds(round.id)
             for ((_, index, _, _, _, comment) in ends) {
                 if (!TextUtils.isEmpty(comment)) {
                     comments.startRow()
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
index 9f33fc084..30ea143fc 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
@@ -25,8 +25,10 @@ import de.dreier.mytargets.shared.models.Score
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.dao.EndDAO
+import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
+import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.models.sum
 import kotlinx.android.parcel.Parcelize
 import java.lang.Math.ceil
@@ -71,11 +73,11 @@ data class ArrowStatistic(
 
         fun getAll(target: Target, rounds: List<Round>): List<ArrowStatistic> {
             return rounds
-                    .groupBy { r -> r.training.arrowId ?: 0 }
+                    .groupBy { r -> Training[r.trainingId!!]!!.arrowId ?: 0 }
                     .flatMap { t ->
                         val arrow = ArrowDAO.loadArrowOrNull(t.key)
                         val name = arrow?.name ?: SharedApplicationInstance.getStr(R.string.unknown)
-                        t.value.flatMap { it.loadEnds() }
+                        t.value.flatMap { RoundDAO.loadEnds(it.id) }
                                 .flatMap { EndDAO.loadShots(it.id) }
                                 .filter { it.arrowNumber != null }
                                 .groupBy {it.arrowNumber!! }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
index 18c7e5e6a..13ba37247 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
@@ -18,6 +18,7 @@ package de.dreier.mytargets.features.statistics
 import android.content.Context
 import de.dreier.mytargets.R
 import de.dreier.mytargets.shared.models.dao.EndDAO
+import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import org.threeten.bp.format.DateTimeFormatter
@@ -94,7 +95,7 @@ class CsvExporter(private val context: Context) {
         // Target
         val target = r.target
         csv.add("${target.model} (${target.diameter})")
-        for (e in r.loadEnds()) {
+        for (e in RoundDAO.loadEnds(r.id)) {
             csv.enterScope()
             // End
             csv.add((e.index + 1).toString())
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
index 27f41b9a8..884934b01 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
@@ -40,6 +40,7 @@ import de.dreier.mytargets.databinding.ActivityStatisticsBinding
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.dao.BowDAO
+import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.utils.toSparseArray
@@ -88,7 +89,7 @@ class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<Li
         val roundIds = intent.getLongArrayExtra(ROUND_IDS)
         return object : AsyncTaskLoader<List<Pair<Training, Round>>>(this) {
             override fun loadInBackground(): List<Pair<Training, Round>> {
-                val rounds = Round.getAll(roundIds)
+                val rounds = RoundDAO.loadRounds(roundIds)
                 val trainingsMap = rounds.map { (_, trainingId) -> trainingId!! }
                         .distinct()
                         .map { id -> Pair(id, Training[id]!!) }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
index 2d2a1dc0d..eb09ce47d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
@@ -43,6 +43,7 @@ import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.SelectableZone
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.dao.EndDAO
+import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
@@ -82,7 +83,7 @@ class StatisticsFragment : FragmentBase() {
     private val hitMissText: String
         get() {
             val shots = rounds!!
-                    .flatMap { r -> r.loadEnds() }
+                    .flatMap { r -> RoundDAO.loadEnds(r.id) }
                     .flatMap { EndDAO.loadShots(it.id) }
                     .filter { (_, _, _, _, _, scoringRing) -> scoringRing != Shot.NOTHING_SELECTED }
             val missCount = shots.filter { (_, _, _, _, _, scoringRing) -> scoringRing == Shot.MISS }.count().toLong()
@@ -106,7 +107,7 @@ class StatisticsFragment : FragmentBase() {
             val values = rounds!!
                     .map { r -> Pair(trainingsMap[r.trainingId]!!.date, r) }
                     .flatMap { roundIdPair ->
-                        roundIdPair.second.loadEnds()
+                        RoundDAO.loadEnds(roundIdPair.second.id)
                                 .map { end -> Pair(roundIdPair.first, end) }
                     }
                     .map { endPair -> getPairEndSummary(target!!, endPair.second, endPair.first) }
@@ -163,7 +164,7 @@ class StatisticsFragment : FragmentBase() {
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
         rounds = roundIds!!
-                .map { Round[it] }
+                .map { RoundDAO.loadRoundOrNull(it) }
                 .filterNotNull()
 
         val data = ArrowStatistic.getAll(target!!, rounds!!)
@@ -183,7 +184,7 @@ class StatisticsFragment : FragmentBase() {
 
     private fun showDispersionView() {
         val exactShots = rounds!!
-                .flatMap { it.loadEnds() }
+                .flatMap { RoundDAO.loadEnds(it.id) }
                 .filter { (_, _, _, exact) -> exact }
                 .flatMap { EndDAO.loadShots(it.id) }
                 .filter { (_, _, _, _, _, scoringRing) -> scoringRing != Shot.NOTHING_SELECTED }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
index 94e4c2356..7ddc15300 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
@@ -32,13 +32,11 @@ import de.dreier.mytargets.databinding.ItemEndBinding
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 import de.dreier.mytargets.shared.models.dao.EndDAO
+import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
-import de.dreier.mytargets.utils.DividerItemDecoration
-import de.dreier.mytargets.utils.MobileWearableClient
+import de.dreier.mytargets.utils.*
 import de.dreier.mytargets.utils.MobileWearableClient.Companion.BROADCAST_UPDATE_TRAINING_FROM_REMOTE
-import de.dreier.mytargets.utils.SlideInItemAnimator
-import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 import java.util.*
 
@@ -81,8 +79,7 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_list, container, false)
         binding.recyclerView.setHasFixedSize(true)
-        binding.recyclerView.addItemDecoration(
-                DividerItemDecoration(context!!, R.drawable.full_divider))
+        binding.recyclerView.addItemDecoration(DividerItemDecoration(context!!, R.drawable.full_divider))
         adapter = EndAdapter()
         binding.recyclerView.itemAnimator = SlideInItemAnimator()
         binding.recyclerView.adapter = adapter
@@ -94,9 +91,7 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
                     .start()
         }
 
-        if (arguments != null) {
-            roundId = arguments!!.getLong(ROUND_ID, -1)
-        }
+        roundId = arguments!!.getLongOrNull(ROUND_ID) ?: throw IllegalStateException("Missing required argument round id!")
 
         setHasOptionsMenu(true)
         return binding.root
@@ -108,8 +103,8 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        round = Round[roundId]
-        val ends = round!!.loadEnds().map { AugmentedEnd(it) }.toMutableList()
+        round = RoundDAO.loadRound(roundId)
+        val ends = RoundDAO.loadEnds(round!!.id).map { AugmentedEnd(it) }.toMutableList()
         val showFab = round!!.maxEndCount == null || ends.size < round!!.maxEndCount!!
 
         return {
@@ -117,8 +112,7 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
             binding.fab.visibility = if (showFab) View.VISIBLE else View.GONE
 
             ToolbarUtils.setTitle(this@RoundFragment,
-                    String.format(Locale.US, "%s %d", getString(R.string.round),
-                            round!!.index + 1))
+                    String.format(Locale.US, "%s %d", getString(R.string.round), round!!.index + 1))
             ToolbarUtils.setSubtitle(this@RoundFragment, round!!.reachedScore.toString())
         }
     }
@@ -130,7 +124,7 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.action_statistics -> {
-                navigationController.navigateToStatistics(listOf(round!!.id))
+                navigationController.navigateToStatistics(listOf(roundId))
                 return true
             }
             R.id.action_comment -> {
@@ -139,7 +133,7 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
                         .inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE)
                         .input("", round!!.comment) { _, input ->
                             round!!.comment = input.toString()
-                            round!!.save()
+                            RoundDAO.saveRound(round!!)
                         }
                         .negativeText(android.R.string.cancel)
                         .show()
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index 72e6b2ba6..2d2258148 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -31,6 +31,7 @@ import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.databinding.FragmentTrainingBinding
 import de.dreier.mytargets.databinding.ItemRoundBinding
 import de.dreier.mytargets.features.settings.SettingsManager
+import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
@@ -185,9 +186,10 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
     }
 
     override fun deleteItem(item: Round): () -> Round {
-        item.delete()
+        val round = RoundDAO.loadAugmentedRound(item)
+        RoundDAO.deleteRound(item)
         return {
-            item.saveRecursively()
+            RoundDAO.insertRound(round)
             item
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
index f893b3ed3..e5a9e59a1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
@@ -32,6 +32,7 @@ import de.dreier.mytargets.databinding.ItemTrainingBinding
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.features.training.edit.EditTrainingFragment.Companion.CREATE_FREE_TRAINING_ACTION
 import de.dreier.mytargets.features.training.edit.EditTrainingFragment.Companion.CREATE_TRAINING_WITH_STANDARD_ROUND_ACTION
+import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.utils.DividerItemDecoration
 import de.dreier.mytargets.utils.MobileWearableClient.Companion.BROADCAST_CREATE_TRAINING_FROM_REMOTE
@@ -151,9 +152,10 @@ open class TrainingsFragment : ExpandableListFragment<Header, Training>() {
     }
 
     override fun deleteItem(item: Training): () -> Training {
+        val training = AugmentedTraining(item)
         item.delete()
         return {
-            item.saveRecursively()
+            training.saveRecursively()
             item
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
index fed0ebe61..08b4e7c52 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
@@ -25,6 +25,7 @@ import de.dreier.mytargets.shared.models.TimerSettings
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
 import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
+import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.utils.unmarshall
@@ -97,7 +98,7 @@ class MobileWearableListener : WearableListenerService() {
 
     private fun endUpdated(messageEvent: MessageEvent) {
         val (end, shots) = messageEvent.data.unmarshall(AugmentedEnd.CREATOR)
-        val round = AugmentedRound(Round[end.roundId!!]!!)
+        val round = AugmentedRound(RoundDAO.loadRound(end.roundId!!))
         val newEnd = getLastEmptyOrCreateNewEnd(round)
         newEnd.end.exact = false
         newEnd.shots = shots
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedRound.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedRound.kt
index f53622e0c..0b2c3f5a7 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedRound.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedRound.kt
@@ -18,6 +18,7 @@ package de.dreier.mytargets.shared.models.augmented
 import android.os.Parcel
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Score
+import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
@@ -27,7 +28,7 @@ data class AugmentedRound(
         val round: Round,
         var ends: MutableList<AugmentedEnd>
 ) : Parcelable {
-    constructor(round: Round) : this(round, round.loadEnds()
+    constructor(round: Round) : this(round, RoundDAO.loadEnds(round.id)
             .map { AugmentedEnd(it) }
             .toMutableList())
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
index da9dae82f..97c7d0fef 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
@@ -17,6 +17,9 @@ package de.dreier.mytargets.shared.models.augmented
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.raizlabs.android.dbflow.config.FlowManager
+import com.raizlabs.android.dbflow.kotlinextensions.save
+import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.StandardRound
 import de.dreier.mytargets.shared.models.db.Training
@@ -64,4 +67,18 @@ data class AugmentedTraining(
             override fun newArray(size: Int): Array<AugmentedTraining?> = arrayOfNulls(size)
         }
     }
+
+    fun saveRecursively() {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction {
+            training.save(it)
+            rounds.forEach { round ->
+                round.round.trainingId = training.id
+                round.save(it)
+                for (end in round.ends) {
+                    end.end.roundId = round.round.id
+                    end.save(it)
+                }
+            }
+        }
+    }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
index 4e19b5c8d..b8457a118 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
@@ -21,12 +21,21 @@ import com.raizlabs.android.dbflow.kotlinextensions.save
 import com.raizlabs.android.dbflow.sql.language.SQLite
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 import de.dreier.mytargets.shared.models.db.*
 import org.threeten.bp.LocalTime
 
 object EndDAO {
     fun loadEnds(): List<End> = SQLite.select().from(End::class.java).queryList()
 
+    fun loadAugmentedEnds(roundId: Long): MutableList<AugmentedEnd> = SQLite.select()
+            .from(End::class.java)
+            .where(End_Table.round.eq(roundId))
+            .orderBy(End_Table.index, true)
+            .queryList()
+            .map { AugmentedEnd(it) }
+            .toMutableList()
+
     fun loadEnd(id: Long): End = SQLite.select()
             .from(End::class.java)
             .where(End_Table._id.eq(id))
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/RoundDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/RoundDAO.kt
new file mode 100644
index 000000000..4260862c0
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/RoundDAO.kt
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.shared.models.dao
+
+import com.raizlabs.android.dbflow.config.FlowManager
+import com.raizlabs.android.dbflow.kotlinextensions.delete
+import com.raizlabs.android.dbflow.kotlinextensions.save
+import com.raizlabs.android.dbflow.sql.language.SQLite
+import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
+import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.shared.models.augmented.AugmentedRound
+import de.dreier.mytargets.shared.models.db.End
+import de.dreier.mytargets.shared.models.db.End_Table
+import de.dreier.mytargets.shared.models.db.Round
+import de.dreier.mytargets.shared.models.db.Round_Table
+
+object RoundDAO {
+    fun loadRounds(roundIds: LongArray): List<Round> = SQLite.select()
+            .from(Round::class.java)
+            .where(Round_Table._id.`in`(roundIds.toList()))
+            .queryList()
+
+    fun loadRound(id: Long): Round = SQLite.select()
+            .from(Round::class.java)
+            .where(Round_Table._id.eq(id))
+            .querySingle() ?: throw IllegalStateException("Round $id does not exist")
+
+    fun loadRoundOrNull(id: Long): Round? = SQLite.select()
+            .from(Round::class.java)
+            .where(Round_Table._id.eq(id))
+            .querySingle()
+
+    fun loadEnds(id: Long): MutableList<End> = SQLite.select()
+            .from(End::class.java)
+            .where(End_Table.round.eq(id))
+            .orderBy(End_Table.index, true)
+            .queryList().toMutableList()
+
+    fun saveRound(round: Round) {
+        round.save()
+    }
+
+    fun saveRound(round: Round, ends: List<End>) {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
+            saveRound(round, db, ends)
+        }
+    }
+
+    fun insertRound(round: Round, ends: List<End>) {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
+            db.execSQL("UPDATE Round SET `index` = `index` + 1 WHERE `index` >= ${round.index}")
+            saveRound(round, db, ends)
+        }
+    }
+
+    private fun saveRound(round: Round, db: DatabaseWrapper, ends: List<End>) {
+        round.save(db)
+        SQLite.delete(End::class.java)
+                .where(End_Table.round.eq(round.id))
+                .execute(db)
+        for (end in ends) {
+            end.roundId = round.id
+            end.save(db)
+        }
+    }
+
+    fun deleteRound(round: Round) {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
+            round.delete(db)
+            db.execSQL("UPDATE Round SET `index` = `index` - 1 WHERE `index` > ${round.index}")
+        }
+    }
+
+    fun insertRound(round: AugmentedRound) {
+        RoundDAO.insertRound(round.round, round.ends.map { it.end })
+        round.ends.forEach {
+            EndDAO.saveEnd(it.end, it.images, it.shots)
+        }
+    }
+
+    fun loadAugmentedRound(item: Round) = AugmentedRound(item)
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
index fba6a958f..0e6ae802c 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
@@ -18,20 +18,13 @@ package de.dreier.mytargets.shared.models.db
 import android.annotation.SuppressLint
 import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.*
-import com.raizlabs.android.dbflow.config.FlowManager
-import com.raizlabs.android.dbflow.kotlinextensions.delete
-import com.raizlabs.android.dbflow.kotlinextensions.save
-import com.raizlabs.android.dbflow.sql.language.SQLite
-import com.raizlabs.android.dbflow.structure.BaseModel
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.*
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.dao.EndDAO
+import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.utils.typeconverters.DimensionConverter
-import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
-import java.util.*
 
 @SuppressLint("ParcelCreator")
 @Parcelize
@@ -67,10 +60,7 @@ data class Round(
 
         @Column(typeConverter = DimensionConverter::class)
         var targetDiameter: Dimension = Dimension.UNKNOWN
-) : BaseModel(), IIdSettable, Comparable<Round>, Parcelable {
-
-    @IgnoredOnParcel
-    var ends: MutableList<End>? = null
+) : IIdSettable, Parcelable {
 
     constructor(info: RoundTemplate) : this(
             distance = info.distance,
@@ -82,21 +72,6 @@ data class Round(
             targetDiameter = info.targetDiameter
     )
 
-    constructor(round: Round) : this(
-            id = round.id,
-            trainingId = round.trainingId,
-            index = round.index,
-            shotsPerEnd = round.shotsPerEnd,
-            maxEndCount = round.maxEndCount,
-            distance = round.distance,
-            comment = round.comment,
-            targetId = round.targetId,
-            targetScoringStyle = round.targetScoringStyle,
-            targetDiameter = round.targetDiameter
-    ) {
-        ends = round.ends
-    }
-
     var target: Target
         get() = Target(targetId.toLong(), targetScoringStyle, targetDiameter)
         set(targetTemplate) {
@@ -108,103 +83,7 @@ data class Round(
     val reachedScore: Score
         get() {
             val target = target
-            return loadEnds().
-                    map { end: End -> target.getReachedScore(EndDAO.loadShots(end.id)) }
+            return RoundDAO.loadEnds(id).map { end: End -> target.getReachedScore(EndDAO.loadShots(end.id)) }
                     .sum()
         }
-
-    val training: Training
-        get() = Training[trainingId!!]!!
-
-    override fun delete(): Boolean {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ this.delete(it) })
-        return true
-    }
-
-    override fun delete(databaseWrapper: DatabaseWrapper): Boolean {
-        loadEnds().forEach { it.delete(databaseWrapper) }
-        super.delete(databaseWrapper)
-        updateRoundIndicesForTraining(databaseWrapper)
-        return true
-    }
-
-    private fun updateRoundIndicesForTraining(databaseWrapper: DatabaseWrapper) {
-        // TODO very inefficient
-        val training = Training[trainingId!!] ?: return  //FIXME This should not happen, but does for some users
-        for ((i, r) in training.loadRounds().withIndex()) {
-            r.index = i
-            r.save(databaseWrapper)
-        }
-    }
-
-    @OneToMany(methods = [], variableName = "ends")
-    fun loadEnds(): MutableList<End> {
-        if (ends == null) {
-            ends = SQLite.select()
-                    .from(End::class.java)
-                    .where(End_Table.round.eq(id))
-                    .orderBy(End_Table.index, true)
-                    .queryList().toMutableList()
-        }
-        return ends!!
-    }
-
-    fun loadEnds(databaseWrapper: DatabaseWrapper): List<End> {
-        return SQLite.select()
-                .from(End::class.java)
-                .where(End_Table.round.eq(id))
-                .orderBy(End_Table.index, true)
-                .queryList(databaseWrapper)
-    }
-
-    override fun compareTo(other: Round): Int {
-        return index - other.index
-    }
-
-    fun saveRecursively() {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ this.saveRecursively(it) })
-    }
-
-    /**
-     * Saves this round and all of its ends and updates all sibling round indices.
-     * Gets called when deletion of a round has been canceled by the user via undo
-     * or when deleting a training has been canceled.
-     */
-    fun saveRecursively(databaseWrapper: DatabaseWrapper) {
-        val training = Training[trainingId!!]!!
-        val rounds = training.loadRounds(databaseWrapper).toMutableList()
-
-        val pos = Collections.binarySearch(rounds, this)
-        if (pos < 0) {
-            rounds.add(-pos - 1, this)
-        } else {
-            rounds.add(pos, this)
-        }
-
-        for ((i, round) in rounds.withIndex()) {
-            round.index = i
-            round.save(databaseWrapper)
-        }
-        for (end in ends!!) {
-            end.roundId = id
-            end.save(databaseWrapper)
-        }
-    }
-
-    companion object {
-
-        operator fun get(id: Long): Round? {
-            return SQLite.select()
-                    .from(Round::class.java)
-                    .where(Round_Table._id.eq(id))
-                    .querySingle()
-        }
-
-        fun getAll(roundIds: LongArray): List<Round> {
-            return SQLite.select()
-                    .from(Round::class.java)
-                    .where(Round_Table._id.`in`(roundIds.toList()))
-                    .queryList()
-        }
-    }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
index 6ff1646b2..37eaddba7 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
@@ -19,6 +19,8 @@ import android.annotation.SuppressLint
 import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.*
 import com.raizlabs.android.dbflow.config.FlowManager
+import com.raizlabs.android.dbflow.kotlinextensions.delete
+import com.raizlabs.android.dbflow.kotlinextensions.save
 import com.raizlabs.android.dbflow.sql.language.SQLite
 import com.raizlabs.android.dbflow.structure.BaseModel
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
@@ -203,18 +205,6 @@ data class Training(
         return true
     }
 
-    fun saveRecursively() {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ this.saveRecursively(it) })
-    }
-
-    private fun saveRecursively(databaseWrapper: DatabaseWrapper) {
-        super.save(databaseWrapper)
-        loadRounds().forEach { s ->
-            s.trainingId = id
-            s.saveRecursively(databaseWrapper)
-        }
-    }
-
     fun loadRounds(databaseWrapper: DatabaseWrapper): List<Round> {
         return SQLite.select()
                 .from(Round::class.java)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/ScoreUtils.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/ScoreUtils.kt
index ece759e67..8932d578a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/ScoreUtils.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/ScoreUtils.kt
@@ -19,6 +19,7 @@ import android.support.v4.util.Pair
 import de.dreier.mytargets.shared.models.SelectableZone
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.dao.EndDAO
+import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
 import java.util.*
@@ -51,7 +52,7 @@ object ScoreUtils {
     private fun getRoundScores(rounds: List<Round>): Map<SelectableZone, Int> {
         val t = rounds[0].target
         val scoreCount = getAllPossibleZones(t)
-        rounds.flatMap { it.loadEnds() }
+        rounds.flatMap { RoundDAO.loadEnds(it.id) }
                 .forEach {
                     EndDAO.loadShots(it.id).forEach { s ->
                                 if (s.scoringRing != Shot.NOTHING_SELECTED) {

From ee5b36a6d4aa97c7fe4c43f897307611402c88b8 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Mon, 15 Jan 2018 11:44:22 +0100
Subject: [PATCH 029/102] Made StandardRound a POJO and introduced
 StandardRoundDAO

---
 .../training/input/InputActivityTest.kt       |  13 +-
 .../StandardRoundActivityTest.kt              |   6 +-
 .../test/utils/rules/MiniDbTestRule.kt        |   4 +-
 .../test/utils/rules/SimpleDbTestRule.kt      |   5 +-
 .../training/edit/EditTrainingFragment.kt     |  17 +--
 .../EditStandardRoundFragment.kt              |   7 +-
 .../StandardRoundListFragment.kt              |  47 ++++----
 .../mytargets/utils/MobileWearableListener.kt |   6 +-
 .../views/selector/StandardRoundSelector.kt   |  17 +--
 .../de/dreier/mytargets/shared/AppDatabase.kt |   7 +-
 .../mytargets/shared/migration/Migration9.kt  |  25 ++--
 .../augmented/AugmentedStandardRound.kt       |  32 ++++-
 .../models/augmented/AugmentedTraining.kt     |   5 +-
 .../shared/models/dao/StandardRoundDAO.kt     |  83 +++++++++++++
 .../shared/models/db/RoundTemplate.kt         |  12 +-
 .../shared/models/db/StandardRound.kt         | 112 +-----------------
 .../shared/utils/StandardRoundFactory.kt      |  20 ++--
 17 files changed, 205 insertions(+), 213 deletions(-)
 create mode 100644 shared/src/main/java/de/dreier/mytargets/shared/models/dao/StandardRoundDAO.kt

diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt
index 1890fa072..1d9b6aee7 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt
@@ -25,8 +25,9 @@ import android.support.test.runner.AndroidJUnit4
 import android.support.test.uiautomator.UiObjectNotFoundException
 import de.dreier.mytargets.R
 import de.dreier.mytargets.features.settings.SettingsManager
+import de.dreier.mytargets.shared.models.dao.RoundDAO
+import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.db.Round
-import de.dreier.mytargets.shared.models.db.StandardRound
 import de.dreier.mytargets.shared.views.TargetViewBase
 import de.dreier.mytargets.test.base.UITestBase
 import de.dreier.mytargets.test.utils.actions.TargetViewActions
@@ -52,19 +53,19 @@ class InputActivityTest : UITestBase() {
     val rule: RuleChain = RuleChain.outerRule(object : DbTestRuleBase() {
         override fun addDatabaseContent() {
             val generator = Random(3435)
-            val standardRound = StandardRound[32L]
+            val standardRound = StandardRoundDAO.loadStandardRoundOrNull(32L)
 
             val (id) = saveDefaultTraining(standardRound!!.id, generator)
 
-            round = Round(standardRound.loadRounds()[0])
+            round = Round(StandardRoundDAO.loadRoundTemplates(standardRound.id)[0])
             round.trainingId = id
             round.comment = ""
-            round.save()
+            RoundDAO.saveRound(round)
 
-            val round2 = Round(standardRound.loadRounds()[1])
+            val round2 = Round(StandardRoundDAO.loadRoundTemplates(standardRound.id)[1])
             round2.trainingId = id
             round2.comment = ""
-            round2.save()
+            RoundDAO.saveRound(round2)
         }
     }).around(activityTestRule)
 
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt
index 66cf6a6c5..46b156bbb 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt
@@ -28,7 +28,7 @@ import android.support.v7.widget.RecyclerView
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.navigation.NavigationController
 import de.dreier.mytargets.features.settings.SettingsManager
-import de.dreier.mytargets.shared.models.db.StandardRound
+import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.test.base.UITestBase
 import de.dreier.mytargets.test.utils.matchers.RecyclerViewMatcher.Companion.withRecyclerView
 import org.junit.Before
@@ -56,7 +56,7 @@ class StandardRoundActivityTest : UITestBase() {
     @Test
     fun searchTest() {
         val i = Intent()
-        i.putExtra(NavigationController.ITEM, StandardRound[32L]!!)
+        i.putExtra(NavigationController.ITEM, StandardRoundDAO.loadStandardRoundOrNull(32L)!!)
         activityTestRule.launchActivity(i)
 
         clickActionBarItem(R.id.action_search, R.string.search)
@@ -76,7 +76,7 @@ class StandardRoundActivityTest : UITestBase() {
     @Test
     fun recentlyUsedTest() {
         val i = Intent()
-        i.putExtra(NavigationController.ITEM, StandardRound[32L]!!)
+        i.putExtra(NavigationController.ITEM, StandardRoundDAO.loadStandardRoundOrNull(32L)!!)
         activityTestRule.launchActivity(i)
 
         onView(withRecyclerView(R.id.recyclerView).atPosition(0))
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
index f9fb345b7..80a1c90b6 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
@@ -19,7 +19,7 @@ import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
-import de.dreier.mytargets.shared.models.db.StandardRound
+import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.targets.models.WAFull
 import de.dreier.mytargets.shared.views.TargetViewBase
 import java.util.*
@@ -39,7 +39,7 @@ class MiniDbTestRule : DbTestRuleBase() {
 
     private fun addRandomTraining(seed: Int) {
         val generator = Random(seed.toLong())
-        val standardRound = StandardRound[32L]
+        val standardRound = StandardRoundDAO.loadStandardRoundOrNull(32L)
 
         val training = saveDefaultTraining(standardRound!!.id, generator)
         val at = AugmentedTraining(training)
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
index 06f9d2cb7..6f6c34613 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
@@ -23,6 +23,7 @@ import de.dreier.mytargets.shared.models.EWeather
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
 import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
+import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.db.*
 import de.dreier.mytargets.shared.targets.models.WAFull
 import de.dreier.mytargets.shared.views.TargetViewBase
@@ -98,7 +99,7 @@ class SimpleDbTestRule : DbTestRuleBase() {
 
     private fun addRandomTraining(seed: Int) {
         val generator = Random(seed.toLong())
-        val standardRound = StandardRound[32L]
+        val standardRound = StandardRoundDAO.loadStandardRoundOrNull(32L)
 
         val training = saveDefaultTraining(standardRound!!.id, generator)
 
@@ -126,7 +127,7 @@ class SimpleDbTestRule : DbTestRuleBase() {
     }
 
     private fun addFullTraining(bow: Bow) {
-        val standardRound = StandardRound[32L]
+        val standardRound = StandardRoundDAO.loadStandardRoundOrNull(32L)
 
         val training = Training()
         training.title = InstrumentationRegistry.getTargetContext().getString(R.string.training)
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
index 37a902475..6e6717c47 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
@@ -130,10 +130,10 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
             navigationController.navigateToDistance(selectedItem!!, index)
         }
         binding.standardRound.setOnClickListener { selectedItem, _ ->
-            navigationController.navigateToStandardRoundList(selectedItem!!)
+            navigationController.navigateToStandardRoundList(selectedItem!!.standardRound)
         }
         binding.standardRound.setOnUpdateListener { item ->
-            roundTarget = item!!.loadRounds()[0].targetTemplate
+            roundTarget = item!!.roundTemplates[0].targetTemplate
         }
         binding.changeTargetFace.setOnClickListener {
             navigationController.navigateToTarget(roundTarget!!,
@@ -268,12 +268,13 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
                 training.rounds = ArrayList()
                 training.rounds.add(AugmentedRound(round))
             } else {
-                val standardRound = binding.standardRound.selectedItem
-                SettingsManager.standardRound = standardRound!!.id
-                if (standardRound.id == 0L) {
-                    standardRound.save()
+                val standardRound = binding.standardRound.selectedItem!!
+                if (standardRound.standardRound.id == 0L) {
+                    throw IllegalStateException("I assumed the standard round would have already been saved")
+                    //StandardRoundDAO.saveStandardRound(standardRound.standardRound, standardRound.roundTemplates)
                 }
-                training.training.standardRoundId = standardRound.id
+                SettingsManager.standardRound = standardRound.standardRound.id
+                training.training.standardRoundId = standardRound.standardRound.id
                 training.initRoundsFromTemplate(standardRound)
                 for (round in training.rounds) {
                     round.round.target = roundTarget!!
@@ -308,7 +309,7 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
         if (resultCode == Activity.RESULT_OK && requestCode == SR_TARGET_REQUEST_CODE && data != null) {
             val target = data.getParcelableExtra<Target>(ITEM)
             val item = binding.standardRound.selectedItem
-            item!!.loadRounds().forEach { it.targetTemplate = target }
+            item!!.roundTemplates.forEach { it.targetTemplate = target }
             binding.standardRound.setItem(item)
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
index 4dca03a03..432610fb5 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
@@ -33,6 +33,7 @@ import de.dreier.mytargets.databinding.FragmentEditStandardRoundBinding
 import de.dreier.mytargets.databinding.ItemRoundTemplateBinding
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
+import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.StandardRound
 import de.dreier.mytargets.shared.utils.StandardRoundFactory
@@ -74,7 +75,7 @@ class EditStandardRoundFragment : EditFragmentBase() {
                 } else {
                     standardRound!!.standardRound.id = 0L
                     binding.name.setText(
-                            String.format("%s %s", getString(R.string.custom), standardRound!!.standardRound
+                            "%s %s".format(getString(R.string.custom), standardRound!!.standardRound
                                     .name))
                     // When copying an existing standard round make sure
                     // we don't overwrite the other rounds templates
@@ -125,7 +126,7 @@ class EditStandardRoundFragment : EditFragmentBase() {
     }
 
     private fun onDeleteStandardRound() {
-        standardRound!!.standardRound.delete()
+        StandardRoundDAO.deleteStandardRound(standardRound!!.standardRound)
         navigationController.setResult(RESULT_STANDARD_ROUND_DELETED)
         navigationController.finish()
     }
@@ -133,7 +134,7 @@ class EditStandardRoundFragment : EditFragmentBase() {
     override fun onSave() {
         standardRound!!.standardRound.club = StandardRoundFactory.CUSTOM
         standardRound!!.standardRound.name = binding.name.text.toString()
-        standardRound!!.toStandardRound().save()
+        StandardRoundDAO.saveStandardRound(standardRound!!.standardRound, standardRound!!.roundTemplates)
 
         val round = standardRound!!.roundTemplates[0]
         SettingsManager.shotsPerEnd = round.shotsPerEnd
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
index bcb580612..be37e9ba2 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
@@ -36,7 +36,7 @@ import de.dreier.mytargets.databinding.FragmentListBinding
 import de.dreier.mytargets.databinding.ItemStandardRoundBinding
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
-import de.dreier.mytargets.shared.models.db.StandardRound
+import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.utils.StandardRoundFactory
 import de.dreier.mytargets.shared.utils.contains
 import de.dreier.mytargets.utils.SlideInItemAnimator
@@ -44,11 +44,11 @@ import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.multiselector.OnItemLongClickListener
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 
-class StandardRoundListFragment : SelectItemFragmentBase<StandardRound, HeaderListAdapter<StandardRound>>(),
-        SearchView.OnQueryTextListener, OnItemLongClickListener<StandardRound> {
+class StandardRoundListFragment : SelectItemFragmentBase<AugmentedStandardRound, HeaderListAdapter<AugmentedStandardRound>>(),
+        SearchView.OnQueryTextListener, OnItemLongClickListener<AugmentedStandardRound> {
 
     @State
-    var currentSelection: StandardRound? = null
+    var currentSelection: AugmentedStandardRound? = null
     private var searchView: SearchView? = null
 
     private lateinit var binding: FragmentListBinding
@@ -81,15 +81,14 @@ class StandardRoundListFragment : SelectItemFragmentBase<StandardRound, HeaderLi
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        val data: List<StandardRound>
-        data = if (args != null && args.containsKey(KEY_QUERY)) {
+        val data = if (args != null && args.containsKey(KEY_QUERY)) {
             val query = args.getString(KEY_QUERY)
-            StandardRound.getAllSearch(query!!)
+            StandardRoundDAO.getAllSearch(query!!)
         } else {
-            StandardRound.all
-        }
+            StandardRoundDAO.loadStandardRounds()
+        }.map { AugmentedStandardRound(it) }.toMutableList()
         return {
-            adapter!!.setList(data.toMutableList())
+            adapter!!.setList(data)
             selectItem(binding.recyclerView, currentSelection!!)
         }
     }
@@ -105,15 +104,15 @@ class StandardRoundListFragment : SelectItemFragmentBase<StandardRound, HeaderLi
         }
     }
 
-    override fun onClick(holder: SelectableViewHolder<StandardRound>, item: StandardRound?) {
+    override fun onClick(holder: SelectableViewHolder<AugmentedStandardRound>, item: AugmentedStandardRound?) {
         currentSelection = item
         super.onClick(holder, item)
     }
 
-    override fun onLongClick(holder: SelectableViewHolder<StandardRound>) {
+    override fun onLongClick(holder: SelectableViewHolder<AugmentedStandardRound>) {
         val item = holder.item!!
-        if (item.club == StandardRoundFactory.CUSTOM) {
-            navigationController.navigateToEditStandardRound(AugmentedStandardRound(item))
+        if (item.standardRound.club == StandardRoundFactory.CUSTOM) {
+            navigationController.navigateToEditStandardRound(item)
                     .forResult(EDIT_STANDARD_ROUND)
                     .start()
         } else {
@@ -124,7 +123,7 @@ class StandardRoundListFragment : SelectItemFragmentBase<StandardRound, HeaderLi
                     .negativeText(android.R.string.cancel)
                     .onPositive { _, _ ->
                         navigationController
-                                .navigateToEditStandardRound(AugmentedStandardRound(item))
+                                .navigateToEditStandardRound(item)
                                 .forResult(NEW_STANDARD_ROUND)
                                 .start()
                     }
@@ -170,19 +169,19 @@ class StandardRoundListFragment : SelectItemFragmentBase<StandardRound, HeaderLi
                 currentSelection = data.getParcelableExtra(ITEM)
                 reloadData()
             } else if (resultCode == EditStandardRoundFragment.RESULT_STANDARD_ROUND_DELETED) {
-                currentSelection = StandardRound[32L]
+                currentSelection = AugmentedStandardRound(StandardRoundDAO.loadStandardRound(32L))
                 saveItem()
                 reloadData()
             }
         }
     }
 
-    override fun onSave(): StandardRound {
+    override fun onSave(): AugmentedStandardRound {
         persistSelection(currentSelection!!)
         return currentSelection!!
     }
 
-    private fun persistSelection(standardRound: StandardRound) {
+    private fun persistSelection(standardRound: AugmentedStandardRound) {
         val map = SettingsManager.standardRoundsLastUsed
         val counter = map.get(standardRound.id)
         if (counter == null) {
@@ -196,13 +195,13 @@ class StandardRoundListFragment : SelectItemFragmentBase<StandardRound, HeaderLi
     private inner class StandardRoundListAdapter internal constructor(
             context: Context,
             usedIds: LongSparseArray<Int>
-    ) : HeaderListAdapter<StandardRound>({ id ->
+    ) : HeaderListAdapter<AugmentedStandardRound>({ id ->
         if (usedIds.contains(id.id)) {
             HeaderListAdapter.SimpleHeader(0L, context.getString(R.string.recently_used))
         } else {
             HeaderListAdapter.SimpleHeader(1L, "")
         }
-    }, compareBy({ usedIds.get(it.id) ?: 0 }, StandardRound::name, StandardRound::id)) {
+    }, compareBy({ usedIds.get(it.standardRound.id) ?: 0 }, { it.standardRound.name }, { it.standardRound.id })) {
 
         override fun getSecondLevelViewHolder(parent: ViewGroup): ViewHolder {
             val itemView = LayoutInflater.from(parent.context)
@@ -211,15 +210,15 @@ class StandardRoundListFragment : SelectItemFragmentBase<StandardRound, HeaderLi
         }
     }
 
-    private inner class ViewHolder(itemView: View) : SelectableViewHolder<StandardRound>(itemView,
+    private inner class ViewHolder(itemView: View) : SelectableViewHolder<AugmentedStandardRound>(itemView,
             selector, this@StandardRoundListFragment, this@StandardRoundListFragment) {
 
         private val binding: ItemStandardRoundBinding = DataBindingUtil.bind(itemView)
 
-        override fun bindItem(item: StandardRound) {
-            binding.name.text = item.name
+        override fun bindItem(item: AugmentedStandardRound) {
+            binding.name.text = item.standardRound.name
 
-            if (item == currentSelection) {
+            if (item.id == currentSelection!!.id) {
                 binding.image.visibility = View.VISIBLE
                 binding.details.visibility = View.VISIBLE
                 binding.details.text = item.getDescription(activity!!)
diff --git a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
index 08b4e7c52..4243a99d0 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
@@ -24,6 +24,7 @@ import de.dreier.mytargets.shared.models.Environment
 import de.dreier.mytargets.shared.models.TimerSettings
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
+import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
 import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
 import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.db.Round
@@ -79,10 +80,9 @@ class MobileWearableListener : WearableListenerService() {
                 round.shotsPerEnd = SettingsManager.shotsPerEnd
                 round.maxEndCount = null
                 round.distance = SettingsManager.distance
-                aTraining.rounds = ArrayList()
-                aTraining.rounds.add(AugmentedRound(round))
+                aTraining.rounds = mutableListOf(AugmentedRound(round))
             } else {
-                aTraining.initRoundsFromTemplate(lastTraining!!.standardRound!!)
+                aTraining.initRoundsFromTemplate(AugmentedStandardRound(lastTraining!!.standardRound!!))
             }
             ApplicationInstance.wearableClient.sendTrainingTemplate(aTraining)
         }
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
index 0d8971f25..1cb002c00 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
@@ -21,28 +21,29 @@ import android.util.AttributeSet
 import android.view.View
 import de.dreier.mytargets.R
 import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
-import de.dreier.mytargets.shared.models.db.StandardRound
+import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
+import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 
 class StandardRoundSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null)
-    : SelectorBase<StandardRound>(context, attrs, R.layout.selector_item_image_details, STANDARD_ROUND_REQUEST_CODE) {
+    : SelectorBase<AugmentedStandardRound>(context, attrs, R.layout.selector_item_image_details, STANDARD_ROUND_REQUEST_CODE) {
 
     private lateinit var binding: SelectorItemImageDetailsBinding
 
-    override fun bindView(item: StandardRound) {
+    override fun bindView(item: AugmentedStandardRound) {
         binding = DataBindingUtil.bind(view)
-        binding.name.text = item.name
+        binding.name.text = item.standardRound.name
         binding.details.visibility = View.VISIBLE
         binding.details.text = item.getDescription(context)
         binding.image.setImageDrawable(item.targetDrawable)
     }
 
     fun setItemId(standardRoundId: Long?) {
-        var standardRound = StandardRound[standardRoundId!!]
+        var standardRound = StandardRoundDAO.loadStandardRoundOrNull(standardRoundId!!)
         // If the round has been removed, choose default one
-        if (standardRound == null || standardRound.loadRounds().isEmpty()) {
-            standardRound = StandardRound[32L]
+        if (standardRound == null || StandardRoundDAO.loadRoundTemplates(standardRound.id).isEmpty()) {
+            standardRound = StandardRoundDAO.loadStandardRoundOrNull(32L)
         }
-        setItem(standardRound)
+        setItem(AugmentedStandardRound(standardRound!!))
     }
 
     companion object {
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
index 4f55c7d31..38db951bc 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
@@ -22,6 +22,7 @@ import com.raizlabs.android.dbflow.kotlinextensions.save
 import com.raizlabs.android.dbflow.sql.language.SQLite
 import com.raizlabs.android.dbflow.sql.migration.BaseMigration
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
+import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.db.ArrowImage
 import de.dreier.mytargets.shared.models.db.BowImage
 import de.dreier.mytargets.shared.models.db.EndImage
@@ -109,9 +110,9 @@ object AppDatabase {
     }
 
     private fun fillStandardRound(db: DatabaseWrapper) {
-        val rounds = StandardRoundFactory.initTable()
-        for (round in rounds) {
-            round.save(db)
+        val standardRounds = StandardRoundFactory.initTable()
+        for (standardRound in standardRounds) {
+            StandardRoundDAO.saveStandardRound(db, standardRound.standardRound, standardRound.roundTemplates)
         }
     }
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/migration/Migration9.kt b/shared/src/main/java/de/dreier/mytargets/shared/migration/Migration9.kt
index e41efee65..404df6e28 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/migration/Migration9.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/migration/Migration9.kt
@@ -25,10 +25,11 @@ import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Target
+import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
+import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.StandardRound
 import de.dreier.mytargets.shared.utils.StandardRoundFactory
-import java.util.*
 
 @Migration(version = 9, database = AppDatabase::class)
 class Migration9 : BaseMigration() {
@@ -164,7 +165,7 @@ class Migration9 : BaseMigration() {
         val sr = StandardRound()
         sr.name = "Practice"
         sr.club = 512
-        sr.setRounds(ArrayList())
+        val rounds = mutableListOf<RoundTemplate>()
         if (res.moveToFirst()) {
             do {
                 val template = RoundTemplate()
@@ -174,37 +175,37 @@ class Migration9 : BaseMigration() {
                         (if (target == 4) 5 else target).toLong(), if (target == 5) 1 else 0)
                 template.distance = Dimension.from(res.getInt(2).toFloat(), res.getString(3))
                 template.endCount = res.getInt(4)
-                template.index = sr.loadRounds().size
-                sr.loadRounds().add(template)
+                template.index = rounds.size
+                rounds.add(template)
             } while (res.moveToNext())
         }
         res.close()
 
-        if (sr.loadRounds().isEmpty()) {
+        if (StandardRoundDAO.loadRoundTemplates(sr.id).isEmpty()) {
             return 0L
         }
-        insertStandardRound(db, sr)
+        insertStandardRound(db, AugmentedStandardRound(sr, rounds))
         return sr.id
     }
 
     companion object {
 
-        private fun insertStandardRound(database: DatabaseWrapper, item: StandardRound) {
+        private fun insertStandardRound(database: DatabaseWrapper, item: AugmentedStandardRound) {
             val values = ContentValues()
-            values.put("name", item.name)
-            values.put("club", item.club)
+            values.put("name", item.standardRound.name)
+            values.put("club", item.standardRound.club)
             values.put("indoor", 0)
             if (item.id == 0L) {
-                item.id = database
+                item.standardRound.id = database
                         .insertWithOnConflict("STANDARD_ROUND_TEMPLATE", null, values, SQLiteDatabase.CONFLICT_NONE)
-                for (r in item.loadRounds()) {
+                for (r in item.roundTemplates) {
                     r.standardRound = item.id
                 }
             } else {
                 values.put("_id", item.id)
                 database.insertWithOnConflict("STANDARD_ROUND_TEMPLATE", null, values, SQLiteDatabase.CONFLICT_REPLACE)
             }
-            for (template in item.loadRounds()) {
+            for (template in item.roundTemplates) {
                 template.standardRound = item.id
                 insertRoundTemplate(database, template)
             }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedStandardRound.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedStandardRound.kt
index 30cc0f5a1..225c4980a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedStandardRound.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedStandardRound.kt
@@ -15,21 +15,43 @@
 
 package de.dreier.mytargets.shared.models.augmented
 
+import android.content.Context
+import android.graphics.drawable.Drawable
 import android.os.Parcel
 import android.os.Parcelable
+import de.dreier.mytargets.shared.R
+import de.dreier.mytargets.shared.models.IIdProvider
+import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.StandardRound
+import de.dreier.mytargets.shared.targets.drawable.CombinedSpot
 
 data class AugmentedStandardRound(
         val standardRound: StandardRound,
         var roundTemplates: MutableList<RoundTemplate>
-) : Parcelable {
+) : Parcelable, IIdProvider {
 
-    constructor(standardRound: StandardRound) : this(standardRound, standardRound.loadRounds())
+    override val id: Long
+        get() = standardRound.id
 
-    fun toStandardRound(): StandardRound {
-        standardRound.rounds = roundTemplates
-        return standardRound
+    constructor(standardRound: StandardRound) : this(standardRound, StandardRoundDAO.loadRoundTemplates(standardRound.id))
+
+    val targetDrawable: Drawable
+        get() {
+            val targets = roundTemplates.map { it.targetTemplate.drawable }
+            return CombinedSpot(targets)
+        }
+
+    fun getDescription(context: Context): String {
+        var desc = ""
+        for (r in roundTemplates) {
+            if (!desc.isEmpty()) {
+                desc += "\n"
+            }
+            desc += context.getString(R.string.round_desc, r.distance, r.endCount,
+                    r.shotsPerEnd, r.targetTemplate.diameter)
+        }
+        return desc
     }
 
     constructor(source: Parcel) : this(
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
index 97c7d0fef..9c3964e82 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
@@ -21,7 +21,6 @@ import com.raizlabs.android.dbflow.config.FlowManager
 import com.raizlabs.android.dbflow.kotlinextensions.save
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.db.Round
-import de.dreier.mytargets.shared.models.db.StandardRound
 import de.dreier.mytargets.shared.models.db.Training
 
 data class AugmentedTraining(
@@ -37,9 +36,9 @@ data class AugmentedTraining(
         return training
     }
 
-    fun initRoundsFromTemplate(standardRound: StandardRound) {
+    fun initRoundsFromTemplate(standardRound: AugmentedStandardRound) {
         rounds = mutableListOf()
-        for (template in standardRound.loadRounds()) {
+        for (template in standardRound.roundTemplates) {
             val round = AugmentedRound(Round(template))
             round.round.trainingId = training.id
             round.round.target = template.targetTemplate
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/StandardRoundDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/StandardRoundDAO.kt
new file mode 100644
index 000000000..010d6224e
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/StandardRoundDAO.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.shared.models.dao
+
+import com.raizlabs.android.dbflow.config.FlowManager
+import com.raizlabs.android.dbflow.kotlinextensions.delete
+import com.raizlabs.android.dbflow.kotlinextensions.save
+import com.raizlabs.android.dbflow.sql.language.SQLite
+import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
+import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.shared.models.db.RoundTemplate
+import de.dreier.mytargets.shared.models.db.RoundTemplate_Table
+import de.dreier.mytargets.shared.models.db.StandardRound
+import de.dreier.mytargets.shared.models.db.StandardRound_Table
+
+object StandardRoundDAO {
+    fun loadStandardRounds(): List<StandardRound> = SQLite.select().from(StandardRound::class.java).queryList()
+
+    fun loadStandardRound(id: Long): StandardRound = SQLite.select()
+            .from(StandardRound::class.java)
+            .where(StandardRound_Table._id.eq(id))
+            .querySingle() ?: throw IllegalStateException("StandardRound $id does not exist")
+
+    fun loadStandardRoundOrNull(id: Long): StandardRound? = SQLite.select()
+            .from(StandardRound::class.java)
+            .where(StandardRound_Table._id.eq(id))
+            .querySingle()
+
+    fun getAllSearch(query: String): List<StandardRound> {
+        val queryString = "%${query.replace(' ', '%')}%"
+        return SQLite.select()
+                .from(StandardRound::class.java)
+                .where(StandardRound_Table.name.like(queryString))
+                .and(StandardRound_Table.club.notEq(512))
+                .queryList()
+    }
+
+    fun loadRoundTemplates(id: Long): ArrayList<RoundTemplate> = ArrayList(SQLite.select()
+            .from(RoundTemplate::class.java)
+            .where(RoundTemplate_Table.standardRound.eq(id))
+            .queryList()
+            .sortedBy { roundTemplate -> roundTemplate.distance }
+            .toMutableList())
+
+    fun saveStandardRound(standardRound: StandardRound, roundTemplates: List<RoundTemplate>) {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
+            saveStandardRound(db, standardRound, roundTemplates)
+        }
+    }
+
+    fun saveStandardRound(db: DatabaseWrapper, standardRound: StandardRound, roundTemplates: List<RoundTemplate>) {
+        standardRound.save(db)
+        SQLite.delete(RoundTemplate::class.java)
+                .where(RoundTemplate_Table.standardRound.eq(standardRound.id))
+                .execute(db)
+        for (roundTemplate in roundTemplates) {
+            roundTemplate.standardRound = standardRound.id
+            roundTemplate.save(db)
+        }
+    }
+
+    fun deleteStandardRound(standardRound: StandardRound) {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
+            SQLite.delete(RoundTemplate::class.java)
+                    .where(RoundTemplate_Table.standardRound.eq(standardRound.id))
+                    .execute(db)
+            standardRound.delete(db)
+        }
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
index 947196944..ef543d457 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
@@ -18,8 +18,6 @@ package de.dreier.mytargets.shared.models.db
 import android.os.Parcel
 import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.*
-import com.raizlabs.android.dbflow.sql.language.SQLite
-import com.raizlabs.android.dbflow.structure.BaseModel
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.IIdSettable
@@ -55,7 +53,7 @@ data class RoundTemplate(
 
         @Column(typeConverter = DimensionConverter::class)
         var targetDiameter: Dimension = Dimension.UNKNOWN
-) : BaseModel(), IIdSettable, Parcelable {
+) : IIdSettable, Parcelable {
     var targetTemplate: Target
         get() = Target(targetId.toLong(), targetScoringStyle, targetDiameter)
         set(targetTemplate) {
@@ -91,14 +89,6 @@ data class RoundTemplate(
     }
 
     companion object {
-        operator fun get(sid: Long, index: Int): RoundTemplate? {
-            return SQLite.select()
-                    .from(RoundTemplate::class.java)
-                    .where(RoundTemplate_Table.standardRound.eq(sid))
-                    .and(RoundTemplate_Table.index.eq(index))
-                    .querySingle()
-        }
-
         @JvmField
         val CREATOR: Parcelable.Creator<RoundTemplate> = object : Parcelable.Creator<RoundTemplate> {
             override fun createFromParcel(source: Parcel): RoundTemplate = RoundTemplate(source)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
index c8a0db90c..4bae15344 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
@@ -15,22 +15,12 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
-import android.content.Context
-import android.graphics.drawable.Drawable
 import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.Column
-import com.raizlabs.android.dbflow.annotation.OneToMany
 import com.raizlabs.android.dbflow.annotation.PrimaryKey
 import com.raizlabs.android.dbflow.annotation.Table
-import com.raizlabs.android.dbflow.config.FlowManager
-import com.raizlabs.android.dbflow.sql.language.SQLite
-import com.raizlabs.android.dbflow.structure.BaseModel
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
-import de.dreier.mytargets.shared.R
 import de.dreier.mytargets.shared.models.IIdSettable
-import de.dreier.mytargets.shared.targets.drawable.CombinedSpot
-import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
 
 @SuppressLint("ParcelCreator")
@@ -46,104 +36,4 @@ data class StandardRound(
 
         @Column
         var name: String = ""
-) : BaseModel(), IIdSettable, Parcelable {
-
-    @IgnoredOnParcel
-    internal var rounds: MutableList<RoundTemplate>? = null
-
-    val targetDrawable: Drawable
-        get() {
-            val targets = loadRounds().map { it.targetTemplate.drawable }
-            return CombinedSpot(targets)
-        }
-
-    fun insert(template: RoundTemplate) {
-        template.index = loadRounds().size
-        template.standardRound = id
-        loadRounds().add(template)
-    }
-
-    fun getDescription(context: Context): String {
-        var desc = ""
-        for (r in loadRounds()) {
-            if (!desc.isEmpty()) {
-                desc += "\n"
-            }
-            desc += context.getString(R.string.round_desc, r.distance, r.endCount,
-                    r.shotsPerEnd, r.targetTemplate.diameter)
-        }
-        return desc
-    }
-
-    @OneToMany(methods = [], variableName = "rounds")
-    fun loadRounds(): MutableList<RoundTemplate> {
-        if (rounds == null) {
-            rounds = SQLite.select()
-                    .from(RoundTemplate::class.java)
-                    .where(RoundTemplate_Table.standardRound.eq(id))
-                    .queryList().toMutableList()
-        }
-        return rounds!!
-    }
-
-    fun setRounds(rounds: MutableList<RoundTemplate>) {
-        this.rounds = rounds
-    }
-
-//    override fun compareTo(other: StandardRound) = compareBy(StandardRound::name, StandardRound::id).compare(this, other)
-
-    override fun save(): Boolean {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ this.save(it) })
-        return true
-    }
-
-    override fun save(databaseWrapper: DatabaseWrapper): Boolean {
-        super.save(databaseWrapper)
-        if (rounds != null) {
-            SQLite.delete(RoundTemplate::class.java)
-                    .where(RoundTemplate_Table.standardRound.eq(id))
-                    .execute(databaseWrapper)
-            // TODO Replace this super ugly workaround by stubbed Relationship in version 4 of dbFlow
-            for (s in rounds!!) {
-                s.standardRound = id
-                s.save(databaseWrapper)
-            }
-        }
-        return true
-    }
-
-    override fun delete(): Boolean {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ this.delete(it) })
-        return true
-    }
-
-    override fun delete(databaseWrapper: DatabaseWrapper): Boolean {
-        for (roundTemplate in loadRounds()) {
-            roundTemplate.delete(databaseWrapper)
-        }
-        super.delete(databaseWrapper)
-        return true
-    }
-
-    companion object {
-
-        operator fun get(id: Long): StandardRound? {
-            return SQLite.select()
-                    .from(StandardRound::class.java)
-                    .where(StandardRound_Table._id.eq(id))
-                    .querySingle()
-        }
-
-        val all: List<StandardRound>
-            get() = SQLite.select().from(StandardRound::class.java).queryList()
-
-        fun getAllSearch(query: String): List<StandardRound> {
-            val queryString = "%" + query.replace(' ', '%') + "%"
-            return SQLite.select()
-                    .from(StandardRound::class.java)
-                    .where(StandardRound_Table.name.like(queryString))
-                    .and(StandardRound_Table.club.notEq(512))
-                    .queryList()
-        }
-    }
-}
+) : IIdSettable, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/StandardRoundFactory.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/StandardRoundFactory.kt
index 8e7dbe418..b5c29ea6e 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/StandardRoundFactory.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/StandardRoundFactory.kt
@@ -20,10 +20,10 @@ import de.dreier.mytargets.shared.SharedApplicationInstance
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Dimension.Unit.*
 import de.dreier.mytargets.shared.models.Target
+import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
 import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.StandardRound
 import de.dreier.mytargets.shared.targets.models.*
-import java.util.*
 
 object StandardRoundFactory {
     const val IFAA = 8
@@ -38,8 +38,8 @@ object StandardRoundFactory {
     private var idCounter: Long = 0
     private var roundCounter: Long = 0
 
-    fun initTable(): List<StandardRound> {
-        val rounds = ArrayList<StandardRound>()
+    fun initTable(): List<AugmentedStandardRound> {
+        val rounds = mutableListOf<AugmentedStandardRound>()
 
         /*
             * 3 arrows = 2 min
@@ -705,13 +705,13 @@ object StandardRoundFactory {
      * @param roundDetails Per round distance, targetSize and number of ends are expected
      * @return The standard round with the specified properties
      */
-    private fun build(institution: Int, name: Int, distanceUnit: Dimension.Unit, targetUnit: Dimension.Unit, target: Long, scoringStyle: Int, shotsPerEnd: Int, vararg roundDetails: Int): StandardRound {
+    private fun build(institution: Int, name: Int, distanceUnit: Dimension.Unit, targetUnit: Dimension.Unit, target: Long, scoringStyle: Int, shotsPerEnd: Int, vararg roundDetails: Int): AugmentedStandardRound {
         val standardRound = StandardRound()
         idCounter++
         standardRound.id = idCounter
         standardRound.name = SharedApplicationInstance.context.getString(name)
         standardRound.club = institution
-        standardRound.setRounds(ArrayList())
+        val rounds = mutableListOf<RoundTemplate>()
         var i = 0
         while (i < roundDetails.size) {
             roundCounter++
@@ -721,16 +721,18 @@ object StandardRoundFactory {
             roundTemplate.distance = Dimension(roundDetails[i].toFloat(), distanceUnit)
             roundTemplate.targetTemplate = Target(target, scoringStyle, Dimension(roundDetails[i + 1].toFloat(), targetUnit))
             roundTemplate.endCount = roundDetails[i + 2]
-            standardRound.insert(roundTemplate)
+            roundTemplate.index = rounds.size
+            roundTemplate.standardRound = standardRound.id
+            rounds.add(roundTemplate)
             i += 3
         }
-        return standardRound
+        return AugmentedStandardRound(standardRound, rounds)
     }
 
-    private fun build(institution: Int, name: Int, distanceUnit: Dimension.Unit, targetUnit: Dimension.Unit, target: Long, scoringStyle: Int, target2: Target, shotsPerEnd: Int, vararg roundDetails: Int): StandardRound {
+    private fun build(institution: Int, name: Int, distanceUnit: Dimension.Unit, targetUnit: Dimension.Unit, target: Long, scoringStyle: Int, target2: Target, shotsPerEnd: Int, vararg roundDetails: Int): AugmentedStandardRound {
         val standardRound = build(institution, name, distanceUnit,
                 targetUnit, target, scoringStyle, shotsPerEnd, *roundDetails)
-        val round2 = standardRound.loadRounds()[1]
+        val round2 = standardRound.roundTemplates[1]
         target2.diameter = round2.targetTemplate.diameter
         round2.targetTemplate = target2
         return standardRound

From a5a1f2157b994ceac8de3a517f63eaa3134baec7 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Mon, 15 Jan 2018 11:51:47 +0100
Subject: [PATCH 030/102] Made Signature and SightMark a POJO

---
 .../fragments/EditWithImageFragmentBase.kt    |  2 +-
 .../scoreboard/SignatureDialogFragment.kt     |  5 ++-
 .../de/dreier/mytargets/shared/AppDatabase.kt |  2 +-
 .../mytargets/shared/models/{db => }/Image.kt |  2 +-
 .../shared/models/dao/SignatureDAO.kt         | 43 +++++++++++++++++++
 .../mytargets/shared/models/db/ArrowImage.kt  |  1 +
 .../mytargets/shared/models/db/BowImage.kt    |  1 +
 .../mytargets/shared/models/db/EndImage.kt    |  1 +
 .../dreier/mytargets/shared/models/db/Shot.kt |  2 +-
 .../mytargets/shared/models/db/SightMark.kt   |  3 +-
 .../mytargets/shared/models/db/Signature.kt   |  3 +-
 .../mytargets/shared/models/db/Training.kt    | 15 +++----
 .../mytargets/shared/utils/ImageList.kt       |  2 +-
 13 files changed, 61 insertions(+), 21 deletions(-)
 rename shared/src/main/java/de/dreier/mytargets/shared/models/{db => }/Image.kt (93%)
 create mode 100644 shared/src/main/java/de/dreier/mytargets/shared/models/dao/SignatureDAO.kt

diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
index c3c6903fd..e1ee18ce3 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
@@ -33,7 +33,7 @@ import com.squareup.picasso.Picasso
 import de.dreier.mytargets.R
 import de.dreier.mytargets.databinding.FragmentEditImageBinding
 import de.dreier.mytargets.shared.models.Thumbnail
-import de.dreier.mytargets.shared.models.db.Image
+import de.dreier.mytargets.shared.models.Image
 import de.dreier.mytargets.shared.utils.moveTo
 import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.Utils
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
index 80416cd29..73946f474 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
@@ -26,6 +26,7 @@ import android.view.ViewGroup
 import com.afollestad.materialdialogs.MaterialDialog
 import de.dreier.mytargets.R
 import de.dreier.mytargets.databinding.FragmentSignatureBinding
+import de.dreier.mytargets.shared.models.dao.SignatureDAO
 import de.dreier.mytargets.shared.models.db.Signature
 
 class SignatureDialogFragment : DialogFragment() {
@@ -45,7 +46,7 @@ class SignatureDialogFragment : DialogFragment() {
                     .inputType(InputType.TYPE_CLASS_TEXT)
                     .input(defaultName, signature.name) { _, input ->
                         signature.name = input.toString()
-                        signature.save()
+                        SignatureDAO.saveSignature(signature)
                         binding.signer.text = signature.name
                     }
                     .negativeText(android.R.string.cancel)
@@ -58,7 +59,7 @@ class SignatureDialogFragment : DialogFragment() {
                 bitmap = binding.signatureView.transparentSignatureBitmap
             }
             signature.bitmap = bitmap
-            signature.save()
+            SignatureDAO.saveSignature(signature)
             dismiss()
         }
         binding.clear.setOnClickListener { binding.signatureView.clear() }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
index 38db951bc..04db6afb0 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
@@ -26,7 +26,7 @@ import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.db.ArrowImage
 import de.dreier.mytargets.shared.models.db.BowImage
 import de.dreier.mytargets.shared.models.db.EndImage
-import de.dreier.mytargets.shared.models.db.Image
+import de.dreier.mytargets.shared.models.Image
 import de.dreier.mytargets.shared.utils.StandardRoundFactory
 import de.dreier.mytargets.shared.utils.moveTo
 import java.io.File
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Image.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Image.kt
similarity index 93%
rename from shared/src/main/java/de/dreier/mytargets/shared/models/db/Image.kt
rename to shared/src/main/java/de/dreier/mytargets/shared/models/Image.kt
index d37e8dbce..8ed16080e 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Image.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Image.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.models.db
+package de.dreier.mytargets.shared.models
 
 interface Image {
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/SignatureDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/SignatureDAO.kt
new file mode 100644
index 000000000..e5598775a
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/SignatureDAO.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.shared.models.dao
+
+import com.raizlabs.android.dbflow.kotlinextensions.delete
+import com.raizlabs.android.dbflow.kotlinextensions.save
+import com.raizlabs.android.dbflow.sql.language.SQLite
+import de.dreier.mytargets.shared.models.db.Signature
+import de.dreier.mytargets.shared.models.db.Signature_Table
+
+object SignatureDAO {
+
+    fun loadSignature(id: Long): Signature = SQLite.select()
+            .from(Signature::class.java)
+            .where(Signature_Table._id.eq(id))
+            .querySingle() ?: throw IllegalStateException("Signature $id does not exist")
+
+    fun loadSignatureOrNull(id: Long): Signature? = SQLite.select()
+            .from(Signature::class.java)
+            .where(Signature_Table._id.eq(id))
+            .querySingle()
+
+    fun saveSignature(signature: Signature) {
+        signature.save()
+    }
+
+    fun deleteSignature(signature: Signature) {
+        signature.delete()
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
index 881547f60..36d4c3356 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
@@ -19,6 +19,7 @@ import android.annotation.SuppressLint
 import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.*
 import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.shared.models.Image
 import kotlinx.android.parcel.Parcelize
 
 @SuppressLint("ParcelCreator")
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
index 3525134f4..011e401b4 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
@@ -19,6 +19,7 @@ import android.annotation.SuppressLint
 import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.*
 import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.shared.models.Image
 import kotlinx.android.parcel.Parcelize
 
 @SuppressLint("ParcelCreator")
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
index 6ac2d5afd..5d1483100 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
@@ -19,6 +19,7 @@ import android.os.Parcel
 import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.*
 import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.shared.models.Image
 
 @Table(database = AppDatabase::class)
 data class EndImage(
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
index 9538cba7f..a85f29b51 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
@@ -31,7 +31,7 @@ data class Shot(
         @Column
         var index: Int = 0,
 
-        @ForeignKey(tableClass = End::class, references = arrayOf(ForeignKeyReference(columnName = "end", foreignKeyColumnName = "_id")), onDelete = ForeignKeyAction.CASCADE)
+        @ForeignKey(tableClass = End::class, references = [(ForeignKeyReference(columnName = "end", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.CASCADE)
         var endId: Long? = null,
 
         @Column
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
index f5b7ed006..84cada3ed 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
@@ -17,7 +17,6 @@ package de.dreier.mytargets.shared.models.db
 import android.annotation.SuppressLint
 import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.*
-import com.raizlabs.android.dbflow.structure.BaseModel
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Dimension.Unit.METER
@@ -41,4 +40,4 @@ data class SightMark(
 
         @Column
         var value: String? = ""
-) : BaseModel(), IIdSettable, Parcelable
+) : IIdSettable, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt
index 27500c349..e90be5767 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt
@@ -22,7 +22,6 @@ import com.raizlabs.android.dbflow.annotation.Column
 import com.raizlabs.android.dbflow.annotation.PrimaryKey
 import com.raizlabs.android.dbflow.annotation.Table
 import com.raizlabs.android.dbflow.sql.language.SQLite
-import com.raizlabs.android.dbflow.structure.BaseModel
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.utils.readBitmap
 import de.dreier.mytargets.shared.utils.typeconverters.BitmapConverter
@@ -40,7 +39,7 @@ data class Signature(
         /** A bitmap of the signature or null if no signature has been set. */
         @Column(typeConverter = BitmapConverter::class)
         var bitmap: Bitmap? = null
-) : BaseModel(), Parcelable {
+) : Parcelable {
 
     val isSigned: Boolean
         get() = bitmap != null
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
index 37eaddba7..5814baea2 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
@@ -26,6 +26,7 @@ import com.raizlabs.android.dbflow.structure.BaseModel
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.*
+import de.dreier.mytargets.shared.models.dao.SignatureDAO
 import de.dreier.mytargets.shared.utils.typeconverters.EWeatherConverter
 import de.dreier.mytargets.shared.utils.typeconverters.LocalDateConverter
 import kotlinx.android.parcel.IgnoredOnParcel
@@ -120,16 +121,13 @@ data class Training(
     val orCreateArcherSignature: Signature
         get() {
             if (archerSignatureId != null) {
-                val signature = SQLite.select()
-                        .from(Signature::class.java)
-                        .where(Signature_Table._id.eq(archerSignatureId!!))
-                        .querySingle()
+                val signature = SignatureDAO.loadSignatureOrNull(archerSignatureId!!)
                 if (signature != null) {
                     return signature
                 }
             }
             val signature = Signature()
-            signature.save()
+            SignatureDAO.saveSignature(signature)
             archerSignatureId = signature.id
             save()
             return signature
@@ -138,16 +136,13 @@ data class Training(
     val orCreateWitnessSignature: Signature
         get() {
             if (witnessSignatureId != null) {
-                val signature = SQLite.select()
-                        .from(Signature::class.java)
-                        .where(Signature_Table._id.eq(witnessSignatureId!!))
-                        .querySingle()
+                val signature = SignatureDAO.loadSignatureOrNull(witnessSignatureId!!)
                 if (signature != null) {
                     return signature
                 }
             }
             val signature = Signature()
-            signature.save()
+            SignatureDAO.saveSignature(signature)
             witnessSignatureId = signature.id
             save()
             return signature
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/ImageList.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/ImageList.kt
index 29fdc2e60..aa321493f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/ImageList.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/ImageList.kt
@@ -18,7 +18,7 @@ package de.dreier.mytargets.shared.utils
 import android.annotation.SuppressLint
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.db.EndImage
-import de.dreier.mytargets.shared.models.db.Image
+import de.dreier.mytargets.shared.models.Image
 import kotlinx.android.parcel.Parcelize
 
 @SuppressLint("ParcelCreator")

From fb375f3c86bb02c13aafa5e61afb76fd8ac4f4c3 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Mon, 15 Jan 2018 12:24:09 +0100
Subject: [PATCH 031/102] WIP TrainingDAO

---
 .../de/dreier/mytargets/app/MigrationTest.kt  |  3 +-
 .../features/main/MainActivityTest.kt         |  8 +-
 .../features/statistics/ExportTest.kt         |  4 +-
 .../statistics/StatisticsActivityTest.kt      |  4 +-
 .../training/ScoreboardActivityTest.kt        |  4 +-
 .../features/training/TrainingActivityTest.kt |  4 +-
 .../test/utils/rules/DbTestRuleBase.kt        |  3 +-
 .../test/utils/rules/MiniDbTestRule.kt        |  6 +-
 .../test/utils/rules/SimpleDbTestRule.kt      | 14 +--
 .../features/rounds/EditRoundFragment.kt      |  6 +-
 .../features/scoreboard/ScoreboardFragment.kt |  3 +-
 .../features/statistics/ArrowStatistic.kt     |  4 +-
 .../features/statistics/CsvExporter.kt        |  3 +-
 .../features/statistics/StatisticsActivity.kt |  3 +-
 .../features/statistics/StatisticsFragment.kt |  6 +-
 .../training/details/TrainingFragment.kt      |  5 +-
 .../training/edit/EditTrainingFragment.kt     |  7 +-
 .../features/training/input/InputActivity.kt  |  4 +-
 .../training/overview/TrainingsFragment.kt    |  7 +-
 .../mytargets/utils/MobileWearableListener.kt | 10 +-
 .../mytargets/shared/models/dao/RoundDAO.kt   | 28 ++++--
 .../shared/models/dao/TrainingDAO.kt          | 96 +++++++++++++++++++
 .../mytargets/shared/models/db/Training.kt    | 49 ++--------
 23 files changed, 181 insertions(+), 100 deletions(-)
 create mode 100644 shared/src/main/java/de/dreier/mytargets/shared/models/dao/TrainingDAO.kt

diff --git a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
index 0a704e7b6..4ea967f52 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
@@ -35,6 +35,7 @@ import de.dreier.mytargets.shared.models.EWeather
 import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.models.dao.RoundDAO
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.test.base.InstrumentedTestBase
@@ -90,7 +91,7 @@ class MigrationTest : InstrumentedTestBase() {
     @Test
     @Throws(IOException::class)
     fun upgradeShouldKeepData() {
-        val trainings = Training.all
+        val trainings = TrainingDAO.loadTrainings()
         assertTraining1(trainings[0])
         assertTraining2(trainings[1])
 
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
index 1dc6d4659..6065f2c16 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
@@ -48,9 +48,9 @@ import de.dreier.mytargets.shared.models.EBowType
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.dao.BowDAO
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.shared.models.db.Bow
-import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.targets.models.WAFull
 import de.dreier.mytargets.shared.views.TargetViewBase.EInputMethod
 import de.dreier.mytargets.test.base.UITestBase
@@ -125,7 +125,7 @@ class MainActivityTest : UITestBase() {
         onView(withRecyclerView(R.id.recyclerView).atPosition(1))
                 .perform(click())
 
-        val firstTraining = Training.all
+        val firstTraining = TrainingDAO.loadTrainings()
                 .sortedWith(Collections.reverseOrder())
                 .firstOrNull()
 
@@ -136,7 +136,7 @@ class MainActivityTest : UITestBase() {
         clickActionBarItem(R.id.action_statistics, R.string.statistic)
         intended(hasClass(StatisticsActivity::class.java))
 
-        var expectedRoundIds = Training.all
+        var expectedRoundIds = TrainingDAO.loadTrainings()
                 .flatMap { t -> t.loadRounds() }
                 .map { it.id }
                 .toSet()
@@ -164,7 +164,7 @@ class MainActivityTest : UITestBase() {
                 .perform(click())
         clickContextualActionBarItem(R.id.action_statistics, R.string.statistic)
 
-        val trainings = Training.all
+        val trainings = TrainingDAO.loadTrainings()
                 .sortedWith(Collections.reverseOrder())
         expectedRoundIds = listOf(trainings[1], trainings[2])
                 .flatMap { t -> t.loadRounds() }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt
index 36c15bb46..8e14a250f 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt
@@ -18,7 +18,7 @@ package de.dreier.mytargets.features.statistics
 import android.support.test.InstrumentationRegistry.getInstrumentation
 import android.support.test.filters.SmallTest
 import android.support.test.runner.AndroidJUnit4
-import de.dreier.mytargets.shared.models.db.Training
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.test.base.InstrumentedTestBase
 import de.dreier.mytargets.test.utils.rules.MiniDbTestRule
 import org.junit.Assert
@@ -38,7 +38,7 @@ class ExportTest : InstrumentedTestBase() {
     @Throws(IOException::class)
     fun testDataExport() {
         val writer = StringWriter()
-        val roundIds = Training.all
+        val roundIds = TrainingDAO.loadTrainings()
                 .flatMap { it.loadRounds() }
                 .map { it.id }
                 .sorted()
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt
index 8bfe1a60b..6741a7b8c 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt
@@ -24,7 +24,7 @@ import android.support.test.espresso.matcher.ViewMatchers.withId
 import android.support.test.espresso.matcher.ViewMatchers.withParent
 import android.support.test.runner.AndroidJUnit4
 import de.dreier.mytargets.R
-import de.dreier.mytargets.shared.models.db.Training
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.test.base.UITestBase
 import de.dreier.mytargets.test.utils.rules.SimpleDbTestRule
 import org.hamcrest.Matchers.allOf
@@ -46,7 +46,7 @@ class StatisticsActivityTest : UITestBase() {
     @Test
     fun navigationTest() {
         // Add round ids
-        val roundIds = Training.all
+        val roundIds = TrainingDAO.loadTrainings()
                 .flatMap { t -> t.loadRounds() }
                 .map { it.id }
                 .toList()
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt
index df17188af..3a21b86c8 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt
@@ -32,7 +32,7 @@ import de.dreier.mytargets.R
 import de.dreier.mytargets.features.scoreboard.ScoreboardActivity
 import de.dreier.mytargets.features.settings.ESettingsScreens
 import de.dreier.mytargets.features.settings.SettingsActivity
-import de.dreier.mytargets.shared.models.db.Training
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.test.base.UITestBase
 import de.dreier.mytargets.test.utils.matchers.IntentMatcher.hasClass
 import de.dreier.mytargets.test.utils.rules.SimpleDbTestRule
@@ -54,7 +54,7 @@ class ScoreboardActivityTest : UITestBase() {
 
     @Test
     fun navigation() {
-        val trainings = Training.all
+        val trainings = TrainingDAO.loadTrainings()
         trainings.sortedWith(Collections.reverseOrder())
         val id = trainings[0].id
         val i = Intent()
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/TrainingActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/TrainingActivityTest.kt
index 0b4346efe..7a2516831 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/TrainingActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/TrainingActivityTest.kt
@@ -25,7 +25,7 @@ import android.support.test.espresso.matcher.ViewMatchers.withText
 import android.support.test.runner.AndroidJUnit4
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase
-import de.dreier.mytargets.shared.models.db.Training
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.test.base.UITestBase
 import de.dreier.mytargets.test.utils.matchers.RecyclerViewMatcher.Companion.withRecyclerView
 import de.dreier.mytargets.test.utils.rules.SimpleDbTestRule
@@ -49,7 +49,7 @@ class TrainingActivityTest : UITestBase() {
 
     @Test
     fun navigation() {
-        val trainings = Training.all
+        val trainings = TrainingDAO.loadTrainings()
         Collections.sort(trainings, Collections.reverseOrder())
         val training = trainings[0]
         val i = Intent()
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
index 596b5624d..1b55d50bf 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
@@ -28,6 +28,7 @@ import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
 import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.dao.BowDAO
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.shared.models.db.Training
@@ -124,7 +125,7 @@ abstract class DbTestRuleBase : TestRule {
         training.bowId = null
         training.arrowId = null
         training.arrowNumbering = false
-        training.save()
+        TrainingDAO.saveTraining(training)
         return training
     }
 }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
index 80a1c90b6..788324325 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
@@ -18,8 +18,10 @@ package de.dreier.mytargets.test.utils.rules
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Target
+import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
 import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
 import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.targets.models.WAFull
 import de.dreier.mytargets.shared.views.TargetViewBase
 import java.util.*
@@ -39,12 +41,12 @@ class MiniDbTestRule : DbTestRuleBase() {
 
     private fun addRandomTraining(seed: Int) {
         val generator = Random(seed.toLong())
-        val standardRound = StandardRoundDAO.loadStandardRoundOrNull(32L)
+        val standardRound = AugmentedStandardRound(StandardRoundDAO.loadStandardRound(32L))
 
         val training = saveDefaultTraining(standardRound!!.id, generator)
         val at = AugmentedTraining(training)
         at.initRoundsFromTemplate(standardRound)
-        at.toTraining().save()
+        TrainingDAO.saveTraining(at.training, at.rounds)
 
         val round1 = at.rounds[0]
         val round2 = at.rounds[1]
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
index 6f6c34613..e3bb87d15 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
@@ -22,8 +22,10 @@ import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.EWeather
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
+import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
 import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
 import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.*
 import de.dreier.mytargets.shared.targets.models.WAFull
 import de.dreier.mytargets.shared.views.TargetViewBase
@@ -99,13 +101,13 @@ class SimpleDbTestRule : DbTestRuleBase() {
 
     private fun addRandomTraining(seed: Int) {
         val generator = Random(seed.toLong())
-        val standardRound = StandardRoundDAO.loadStandardRoundOrNull(32L)
+        val standardRound = AugmentedStandardRound(StandardRoundDAO.loadStandardRound(32L))
 
-        val training = saveDefaultTraining(standardRound!!.id, generator)
+        val training = saveDefaultTraining(standardRound.id, generator)
 
         val at = AugmentedTraining(training)
         at.initRoundsFromTemplate(standardRound)
-        at.toTraining().save()
+        TrainingDAO.saveTraining(at.training, at.rounds)
 
         val round1 = at.rounds[0]
 
@@ -127,7 +129,7 @@ class SimpleDbTestRule : DbTestRuleBase() {
     }
 
     private fun addFullTraining(bow: Bow) {
-        val standardRound = StandardRoundDAO.loadStandardRoundOrNull(32L)
+        val standardRound = AugmentedStandardRound(StandardRoundDAO.loadStandardRound(32L))
 
         val training = Training()
         training.title = InstrumentationRegistry.getTargetContext().getString(R.string.training)
@@ -135,13 +137,13 @@ class SimpleDbTestRule : DbTestRuleBase() {
         training.weather = EWeather.SUNNY
         training.windSpeed = 1
         training.windDirection = 0
-        training.standardRoundId = standardRound!!.id
+        training.standardRoundId = standardRound.id
         training.bowId = bow.id
         training.arrowId = null
         training.arrowNumbering = false
         val at = AugmentedTraining(training)
         at.initRoundsFromTemplate(standardRound)
-        at.toTraining().save()
+        TrainingDAO.saveTraining(at.training, at.rounds.map { it.round })
 
         val round1 = at.rounds[0]
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
index 48bb61562..f65141b8a 100644
--- a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
@@ -27,8 +27,8 @@ import de.dreier.mytargets.databinding.FragmentEditRoundBinding
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.features.training.target.TargetListFragment
 import de.dreier.mytargets.shared.models.dao.RoundDAO
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Round
-import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.Utils
 import de.dreier.mytargets.views.selector.DistanceSelector
@@ -81,7 +81,7 @@ class EditRoundFragment : EditFragmentBase() {
             binding.distance.setItem(round.distance)
             binding.target.setItem(round.target)
             binding.notEditable.visibility = View.GONE
-            if (Training[round.trainingId!!]!!.standardRoundId != null) {
+            if (TrainingDAO.loadTrainingOrNull(round.trainingId!!)!!.standardRoundId != null) {
                 binding.distanceLayout.visibility = View.GONE
             }
         }
@@ -108,7 +108,7 @@ class EditRoundFragment : EditFragmentBase() {
     }
 
     private fun onSaveRound(): Round? {
-        val training = Training[trainingId]
+        val training = TrainingDAO.loadTrainingOrNull(trainingId)
 
         val round: Round
         if (roundId == null) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
index 788d094a5..8aa91e26e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
@@ -44,6 +44,7 @@ import de.dreier.mytargets.databinding.PartialScoreboardSignaturesBinding
 import de.dreier.mytargets.features.scoreboard.pdf.ViewPrintDocumentAdapter
 import de.dreier.mytargets.features.settings.ESettingsScreens
 import de.dreier.mytargets.features.settings.SettingsManager
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Signature
 import de.dreier.mytargets.shared.models.db.Training
@@ -96,7 +97,7 @@ class ScoreboardFragment : FragmentBase() {
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        training = Training[trainingId]
+        training = TrainingDAO.loadTrainingOrNull(trainingId)
         val archerSignature = training!!.orCreateArcherSignature
         val witnessSignature = training!!.orCreateWitnessSignature
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
index 30ea143fc..82de928d8 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
@@ -26,9 +26,9 @@ import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.models.dao.RoundDAO
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
-import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.models.sum
 import kotlinx.android.parcel.Parcelize
 import java.lang.Math.ceil
@@ -73,7 +73,7 @@ data class ArrowStatistic(
 
         fun getAll(target: Target, rounds: List<Round>): List<ArrowStatistic> {
             return rounds
-                    .groupBy { r -> Training[r.trainingId!!]!!.arrowId ?: 0 }
+                    .groupBy { r -> TrainingDAO.loadTrainingOrNull(r.trainingId!!)!!.arrowId ?: 0 }
                     .flatMap { t ->
                         val arrow = ArrowDAO.loadArrowOrNull(t.key)
                         val name = arrow?.name ?: SharedApplicationInstance.getStr(R.string.unknown)
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
index 13ba37247..cb10c2d76 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
@@ -19,6 +19,7 @@ import android.content.Context
 import de.dreier.mytargets.R
 import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.models.dao.RoundDAO
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import org.threeten.bp.format.DateTimeFormatter
@@ -56,7 +57,7 @@ class CsvExporter(private val context: Context) {
         csv.add("y")
         csv.newLine()
         csv.exitScope()
-        for (t in Training.all) {
+        for (t in TrainingDAO.loadTrainings()) {
             addTraining(csv, t, roundIds)
         }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
index 884934b01..43b23315c 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
@@ -41,6 +41,7 @@ import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.dao.RoundDAO
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.utils.toSparseArray
@@ -92,7 +93,7 @@ class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<Li
                 val rounds = RoundDAO.loadRounds(roundIds)
                 val trainingsMap = rounds.map { (_, trainingId) -> trainingId!! }
                         .distinct()
-                        .map { id -> Pair(id, Training[id]!!) }
+                        .map { id -> Pair(id, TrainingDAO.loadTrainingOrNull(id)!!) }
                         .toSparseArray()
                 return rounds.map { round -> Pair(trainingsMap.get(round.trainingId!!), round) }
             }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
index eb09ce47d..75145e532 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
@@ -44,10 +44,10 @@ import de.dreier.mytargets.shared.models.SelectableZone
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.models.dao.RoundDAO
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
-import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.utils.Color
 import de.dreier.mytargets.shared.utils.ScoreUtils
 import de.dreier.mytargets.utils.MobileWearableClient
@@ -100,7 +100,7 @@ class StatisticsFragment : FragmentBase() {
             val trainingsMap = rounds!!
                     .map { it.trainingId!! }
                     .distinct()
-                    .map { Training[it]!! }
+                    .map { TrainingDAO.loadTrainingOrNull(it)!! }
                     .map { Pair(it.id, it) }
                     .toMap()
 
@@ -200,7 +200,7 @@ class StatisticsFragment : FragmentBase() {
                 .map { it.trainingId!! }
                 .distinct()
         if (trainingsIds.size == 1) {
-            val training = Training[trainingsIds[0]]!!
+            val training = TrainingDAO.loadTraining(trainingsIds[0])
             val date = training.date.format(DateTimeFormatter.ISO_LOCAL_DATE)
             val round = if (rounds!!.size == 1) {
                 val index = rounds!![0].index + 1
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index 2d2258148..63dbab446 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -32,6 +32,7 @@ import de.dreier.mytargets.databinding.FragmentTrainingBinding
 import de.dreier.mytargets.databinding.ItemRoundBinding
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.dao.RoundDAO
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
@@ -107,7 +108,7 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        training = Training[trainingId]
+        training = TrainingDAO.loadTrainingOrNull(trainingId)
         val rounds = training!!.loadRounds() //FIXME can be null!?
         return {
             // Hide fab for standard rounds
@@ -162,7 +163,7 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
                         .inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE)
                         .input("", training!!.comment) { _, input ->
                             training!!.comment = input.toString()
-                            training!!.save()
+                            TrainingDAO.saveTraining(training!!)
                         }
                         .negativeText(android.R.string.cancel)
                         .show()
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
index 6e6717c47..6fc786359 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
@@ -39,6 +39,7 @@ import de.dreier.mytargets.shared.models.EBowType
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
 import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
@@ -67,7 +68,7 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
             val training = if (trainingId == null) {
                 Training()
             } else {
-                Training[trainingId!!]!!
+                TrainingDAO.loadTrainingOrNull(trainingId!!)!!
             }
             training.title = binding.training.text.toString()
             training.date = date
@@ -184,7 +185,7 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
                 GONE
         } else {
             ToolbarUtils.setTitle(this, R.string.edit_training)
-            val train = Training[trainingId!!]!!
+            val train = TrainingDAO.loadTrainingOrNull(trainingId!!)!!
             binding.training.setText(train.title)
             date = train.date
             binding.bow.setItemId(train.bowId)
@@ -280,7 +281,7 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
                     round.round.target = roundTarget!!
                 }
             }
-            training.toTraining().save()
+            TrainingDAO.saveTraining(training.training, training.rounds.map { it.round })
 
             val round = training.rounds[0]
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
index 2e4f647dc..732a9b59e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
@@ -49,10 +49,10 @@ import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
 import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.dao.EndDAO
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
-import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.models.sum
 import de.dreier.mytargets.shared.utils.ImageList
 import de.dreier.mytargets.shared.views.TargetViewBase
@@ -445,7 +445,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
     ) : AsyncTaskLoader<LoaderResult>(context) {
 
         override fun loadInBackground(): LoaderResult? {
-            val training = Training[trainingId]
+            val training = TrainingDAO.loadTrainingOrNull(trainingId)
             val result = LoaderResult(AugmentedTraining(training!!))
             result.setRoundId(roundId)
             result.setAdjustEndIndex(endIndex)
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
index e5a9e59a1..016bb9c88 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
@@ -33,6 +33,7 @@ import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.features.training.edit.EditTrainingFragment.Companion.CREATE_FREE_TRAINING_ACTION
 import de.dreier.mytargets.features.training.edit.EditTrainingFragment.Companion.CREATE_TRAINING_WITH_STANDARD_ROUND_ACTION
 import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.utils.DividerItemDecoration
 import de.dreier.mytargets.utils.MobileWearableClient.Companion.BROADCAST_CREATE_TRAINING_FROM_REMOTE
@@ -126,7 +127,7 @@ open class TrainingsFragment : ExpandableListFragment<Header, Training>() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.action_statistics -> {
-                navigationController.navigateToStatistics(Training.all
+                navigationController.navigateToStatistics(TrainingDAO.loadTrainings()
                                 .flatMap { training -> training.loadRounds() }
                                 .map { it.id })
                 true
@@ -142,7 +143,7 @@ open class TrainingsFragment : ExpandableListFragment<Header, Training>() {
 
     private fun onStatistics(ids: List<Long>) {
         navigationController.navigateToStatistics(ids
-                .map { Training[it]!! }
+                .map { TrainingDAO.loadTrainingOrNull(it)!! }
                 .flatMap { t -> t.loadRounds() }
                 .map { it.id })
     }
@@ -161,7 +162,7 @@ open class TrainingsFragment : ExpandableListFragment<Header, Training>() {
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        val trainings = Training.all
+        val trainings = TrainingDAO.loadTrainings()
         return {
             this@TrainingsFragment.setList(trainings, false)
             activity?.invalidateOptionsMenu()
diff --git a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
index 4243a99d0..0c90ae615 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
@@ -27,6 +27,7 @@ import de.dreier.mytargets.shared.models.augmented.AugmentedRound
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
 import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
 import de.dreier.mytargets.shared.models.dao.RoundDAO
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.utils.unmarshall
@@ -60,7 +61,7 @@ class MobileWearableListener : WearableListenerService() {
     }
 
     private fun trainingTemplate() {
-        val lastTraining = Training.all.minWith(Collections.reverseOrder())
+        val lastTraining = TrainingDAO.loadTrainings().minWith(Collections.reverseOrder())
         if (lastTraining != null && lastTraining.date.isEqual(LocalDate.now())) {
             ApplicationInstance.wearableClient.updateTraining(AugmentedTraining(lastTraining))
         } else {
@@ -90,9 +91,8 @@ class MobileWearableListener : WearableListenerService() {
 
     private fun createTraining(messageEvent: MessageEvent) {
         val augmentedTraining = messageEvent.data.unmarshall(AugmentedTraining.CREATOR)
-        val training = augmentedTraining.toTraining()
-        training.save()
-        ApplicationInstance.wearableClient.updateTraining(AugmentedTraining(training))
+        TrainingDAO.saveTraining(augmentedTraining.training, augmentedTraining.rounds.map { it.round })
+        ApplicationInstance.wearableClient.updateTraining(augmentedTraining)
         ApplicationInstance.wearableClient.sendCreateTrainingFromRemoteBroadcast()
     }
 
@@ -106,7 +106,7 @@ class MobileWearableListener : WearableListenerService() {
 
         ApplicationInstance.wearableClient.sendUpdateTrainingFromRemoteBroadcast(round.round, newEnd.end)
         ApplicationInstance.wearableClient
-                .sendUpdateTrainingFromLocalBroadcast(AugmentedTraining(Training[round.round.trainingId!!]!!))
+                .sendUpdateTrainingFromLocalBroadcast(AugmentedTraining(TrainingDAO.loadTraining(round.round.trainingId!!)))
     }
 
     private fun getLastEmptyOrCreateNewEnd(round: AugmentedRound): AugmentedEnd {
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/RoundDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/RoundDAO.kt
index 4260862c0..78d15c021 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/RoundDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/RoundDAO.kt
@@ -55,18 +55,11 @@ object RoundDAO {
 
     fun saveRound(round: Round, ends: List<End>) {
         FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            saveRound(round, db, ends)
+            saveRound(db, round, ends)
         }
     }
 
-    fun insertRound(round: Round, ends: List<End>) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            db.execSQL("UPDATE Round SET `index` = `index` + 1 WHERE `index` >= ${round.index}")
-            saveRound(round, db, ends)
-        }
-    }
-
-    private fun saveRound(round: Round, db: DatabaseWrapper, ends: List<End>) {
+    private fun saveRound(db: DatabaseWrapper, round: Round, ends: List<End>) {
         round.save(db)
         SQLite.delete(End::class.java)
                 .where(End_Table.round.eq(round.id))
@@ -91,5 +84,22 @@ object RoundDAO {
         }
     }
 
+    private fun insertRound(round: Round, ends: List<End>) {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
+            db.execSQL("UPDATE Round SET `index` = `index` + 1 WHERE `index` >= ${round.index}")
+            saveRound(db, round, ends)
+        }
+    }
+
     fun loadAugmentedRound(item: Round) = AugmentedRound(item)
+
+    fun saveRound(round: AugmentedRound) {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
+            round.round.save(db)
+            for(end in round.ends) {
+                end.end.roundId = round.round.id
+                EndDAO.saveEnd(end.end, end.images, end.shots)
+            }
+        }
+    }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/TrainingDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/TrainingDAO.kt
new file mode 100644
index 000000000..a8ab1d335
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/TrainingDAO.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.shared.models.dao
+
+import com.raizlabs.android.dbflow.config.FlowManager
+import com.raizlabs.android.dbflow.kotlinextensions.save
+import com.raizlabs.android.dbflow.sql.language.SQLite
+import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
+import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
+import de.dreier.mytargets.shared.models.db.Round
+import de.dreier.mytargets.shared.models.db.Round_Table
+import de.dreier.mytargets.shared.models.db.Training
+import de.dreier.mytargets.shared.models.db.Training_Table
+
+object TrainingDAO {
+    fun loadTrainings(): List<Training> = SQLite.select()
+            .from(Training::class.java)
+            .queryList()
+
+    fun loadTrainings(trainingIds: LongArray): List<Training> = SQLite.select()
+            .from(Training::class.java)
+            .where(Training_Table._id.`in`(trainingIds.toList()))
+            .queryList()
+
+    fun loadTraining(id: Long): Training = SQLite.select()
+            .from(Training::class.java)
+            .where(Training_Table._id.eq(id))
+            .querySingle() ?: throw IllegalStateException("Training $id does not exist")
+
+    fun loadTrainingOrNull(id: Long): Training? = SQLite.select()
+            .from(Training::class.java)
+            .where(Training_Table._id.eq(id))
+            .querySingle()
+
+    fun loadRounds(id: Long): MutableList<Round> = SQLite.select()
+            .from(Round::class.java)
+            .where(Round_Table.training.eq(id))
+            .orderBy(Round_Table.index, true)
+            .queryList().toMutableList()
+
+    fun saveTraining(training: Training) {
+        training.save()
+    }
+
+    fun saveTraining(training: Training, rounds: List<Round>) {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
+            saveTraining(training, db, rounds)
+        }
+    }
+
+    fun insertTraining(training: Training, rounds: List<Round>) {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
+            saveTraining(training, db, rounds)
+        }
+    }
+
+    private fun saveTraining(training: Training, db: DatabaseWrapper, rounds: List<Round>) {
+        training.save(db)
+//        SQLite.delete(Round::class.java)
+//                .where(Round_Table.training.eq(training.id))
+//                .execute(db)
+        for (round in rounds) {
+            round.trainingId = training.id
+            round.save(db)
+        }
+    }
+
+    fun deleteTraining(training: Training) {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
+            training.delete(db)
+        }
+    }
+
+    fun insertTraining(training: AugmentedTraining) {
+        TrainingDAO.insertTraining(training.training, training.rounds.map { it.round })
+        training.rounds.forEach {
+            RoundDAO.saveRound(it)
+        }
+    }
+
+    fun loadAugmentedTraining(item: Training) = AugmentedTraining(item)
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
index 5814baea2..2b622b020 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
@@ -20,13 +20,12 @@ import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.*
 import com.raizlabs.android.dbflow.config.FlowManager
 import com.raizlabs.android.dbflow.kotlinextensions.delete
-import com.raizlabs.android.dbflow.kotlinextensions.save
 import com.raizlabs.android.dbflow.sql.language.SQLite
 import com.raizlabs.android.dbflow.structure.BaseModel
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.*
-import de.dreier.mytargets.shared.models.dao.SignatureDAO
+import de.dreier.mytargets.shared.models.dao.*
 import de.dreier.mytargets.shared.utils.typeconverters.EWeatherConverter
 import de.dreier.mytargets.shared.utils.typeconverters.LocalDateConverter
 import kotlinx.android.parcel.IgnoredOnParcel
@@ -101,22 +100,13 @@ data class Training(
         }
 
     val standardRound: StandardRound?
-        get() = if (standardRoundId == null) null else SQLite.select()
-                .from(StandardRound::class.java)
-                .where(StandardRound_Table._id.eq(standardRoundId!!))
-                .querySingle()
+        get() = if (standardRoundId == null) null else StandardRoundDAO.loadStandardRoundOrNull(standardRoundId!!)
 
     val bow: Bow?
-        get() = if (bowId == null) null else SQLite.select()
-                .from(Bow::class.java)
-                .where(Bow_Table._id.eq(bowId!!))
-                .querySingle()
+        get() = if (bowId == null) null else BowDAO.loadBowOrNull(bowId!!)
 
     val arrow: Arrow?
-        get() = if (arrowId == null) null else SQLite.select()
-                .from(Arrow::class.java)
-                .where(Arrow_Table._id.eq(arrowId!!))
-                .querySingle()
+        get() = if (arrowId == null) null else ArrowDAO.loadArrowOrNull(arrowId!!)
 
     val orCreateArcherSignature: Signature
         get() {
@@ -129,7 +119,7 @@ data class Training(
             val signature = Signature()
             SignatureDAO.saveSignature(signature)
             archerSignatureId = signature.id
-            save()
+            TrainingDAO.saveTraining(this)
             return signature
         }
 
@@ -144,7 +134,7 @@ data class Training(
             val signature = Signature()
             SignatureDAO.saveSignature(signature)
             witnessSignatureId = signature.id
-            save()
+            TrainingDAO.saveTraining(this)
             return signature
         }
 
@@ -174,21 +164,6 @@ data class Training(
         } else date.compareTo(other.date)
     }
 
-    override fun save(): Boolean {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ this.save(it) })
-        return true
-    }
-
-    override fun save(databaseWrapper: DatabaseWrapper): Boolean {
-        super.save(databaseWrapper)
-        // TODO Replace this super ugly workaround by stubbed Relationship in version 4 of dbFlow
-        loadRounds().forEach { s ->
-            s.trainingId = id
-            s.save(databaseWrapper)
-        }
-        return true
-    }
-
     override fun delete(): Boolean {
         FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ this.delete(it) })
         return true
@@ -207,16 +182,4 @@ data class Training(
                 .orderBy(Round_Table.index, true)
                 .queryList(databaseWrapper)
     }
-
-    companion object {
-        operator fun get(id: Long): Training? {
-            return SQLite.select()
-                    .from(Training::class.java)
-                    .where(Training_Table._id.eq(id))
-                    .querySingle()
-        }
-
-        val all: List<Training>
-            get() = SQLite.select().from(Training::class.java).queryList()
-    }
 }

From c26f2e4ef9a22a0a100a7de5687451dd3942c1ce Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Mon, 15 Jan 2018 12:52:26 +0100
Subject: [PATCH 032/102] Fixed save, delete, loadRounds and Comparable

---
 .../de/dreier/mytargets/app/MigrationTest.kt  |  4 +-
 .../features/main/MainActivityTest.kt         |  4 +-
 .../features/statistics/ExportTest.kt         |  2 +-
 .../statistics/StatisticsActivityTest.kt      |  2 +-
 .../adapters/header/ExpandableListAdapter.kt  |  2 -
 .../adapters/header/HeaderListAdapterBase.kt  |  2 +-
 .../features/rounds/EditRoundFragment.kt      |  2 +-
 .../features/scoreboard/ScoreboardUtils.kt    |  3 +-
 .../features/statistics/CsvExporter.kt        |  2 +-
 .../training/details/TrainingFragment.kt      |  4 +-
 .../training/edit/EditTrainingFragment.kt     |  2 +-
 .../training/overview/TrainingsFragment.kt    | 14 +++---
 .../models/augmented/AugmentedTraining.kt     | 25 +---------
 .../shared/models/dao/TrainingDAO.kt          | 13 +++--
 .../mytargets/shared/models/db/Training.kt    | 49 +------------------
 15 files changed, 35 insertions(+), 95 deletions(-)

diff --git a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
index 4ea967f52..c3ff8498a 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
@@ -112,7 +112,7 @@ class MigrationTest : InstrumentedTestBase() {
         Truth.assertThat(training.windDirection).isEqualTo(0)
         Truth.assertThat(training.windSpeed).isEqualTo(3)
         Truth.assertThat(training.location).isEqualTo("Neufahrn bei Freising")
-        val rounds = training.loadRounds()
+        val rounds = TrainingDAO.loadRounds(training.id)
 
         assertRound11(rounds)
 
@@ -176,7 +176,7 @@ class MigrationTest : InstrumentedTestBase() {
         Truth.assertThat(training.windDirection).isEqualTo(0)
         Truth.assertThat(training.windSpeed).isEqualTo(3)
         Truth.assertThat(training.location).isEqualTo("Neufahrn bei Freising")
-        val rounds = training.loadRounds()
+        val rounds = TrainingDAO.loadRounds(training.id)
         Truth.assertThat(RoundDAO.loadEnds(rounds[0].id)).hasSize(6)
         Truth.assertThat(RoundDAO.loadEnds(rounds[1].id)).hasSize(6)
     }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
index 6065f2c16..c79396d35 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
@@ -137,7 +137,7 @@ class MainActivityTest : UITestBase() {
         intended(hasClass(StatisticsActivity::class.java))
 
         var expectedRoundIds = TrainingDAO.loadTrainings()
-                .flatMap { t -> t.loadRounds() }
+                .flatMap { t -> TrainingDAO.loadRounds(t.id) }
                 .map { it.id }
                 .toSet()
         intended(allOf(hasClass(StatisticsActivity::class.java),
@@ -167,7 +167,7 @@ class MainActivityTest : UITestBase() {
         val trainings = TrainingDAO.loadTrainings()
                 .sortedWith(Collections.reverseOrder())
         expectedRoundIds = listOf(trainings[1], trainings[2])
-                .flatMap { t -> t.loadRounds() }
+                .flatMap { t -> TrainingDAO.loadRounds(t.id) }
                 .map { it.id }
                 .toSet()
 
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt
index 8e14a250f..0e6d12e1a 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt
@@ -39,7 +39,7 @@ class ExportTest : InstrumentedTestBase() {
     fun testDataExport() {
         val writer = StringWriter()
         val roundIds = TrainingDAO.loadTrainings()
-                .flatMap { it.loadRounds() }
+                .flatMap { TrainingDAO.loadRounds(it.id) }
                 .map { it.id }
                 .sorted()
                 .toMutableList()
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt
index 6741a7b8c..87d31df57 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt
@@ -47,7 +47,7 @@ class StatisticsActivityTest : UITestBase() {
     fun navigationTest() {
         // Add round ids
         val roundIds = TrainingDAO.loadTrainings()
-                .flatMap { t -> t.loadRounds() }
+                .flatMap { t -> TrainingDAO.loadRounds(t.id) }
                 .map { it.id }
                 .toList()
         val i = Intent()
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt
index a816bfffc..8b3d28e06 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.base.adapters.header
 
-
 import android.databinding.DataBindingUtil
 import android.view.LayoutInflater
 import android.view.View
@@ -25,7 +24,6 @@ import de.dreier.mytargets.databinding.ItemHeaderExpandableBinding
 import de.dreier.mytargets.shared.models.IIdProvider
 import de.dreier.mytargets.utils.multiselector.ExpandableHeaderBindingHolder
 import de.dreier.mytargets.utils.multiselector.ItemBindingHolder
-import java.util.*
 
 typealias PartitionDelegate<PARENT, CHILD> = (CHILD) -> PARENT
 abstract class ExpandableListAdapter<P : IIdProvider, C : IIdProvider>(
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt
index 58d0fc394..337568955 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt
@@ -177,7 +177,7 @@ abstract class HeaderListAdapterBase<P : IIdProvider, C : IIdProvider, H : Heade
             get() = 1 + children.size
 
         fun add(item: CHILD) {
-            val pos = Collections.binarySearch(children, item, childComparator)
+            val pos = children.binarySearch(item, childComparator)
             if (pos < 0) {
                 children.add(-pos - 1, item)
             } else {
diff --git a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
index f65141b8a..3f9d0dd84 100644
--- a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
@@ -116,7 +116,7 @@ class EditRoundFragment : EditFragmentBase() {
             round.trainingId = trainingId
             round.shotsPerEnd = binding.arrows.progress
             round.maxEndCount = null
-            round.index = training!!.loadRounds().size
+            round.index = TrainingDAO.loadRounds(training!!.id).size
         } else {
             round = RoundDAO.loadRound(roundId!!)
         }
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
index 9d3d19559..aad4e46a1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
@@ -30,6 +30,7 @@ import de.dreier.mytargets.features.scoreboard.layout.DefaultScoreboardLayout
 import de.dreier.mytargets.features.scoreboard.pdf.ViewPrintDocumentAdapter
 import de.dreier.mytargets.features.scoreboard.pdf.ViewToPdfWriter
 import de.dreier.mytargets.shared.models.dao.RoundDAO
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.utils.writeToJPGFile
@@ -45,7 +46,7 @@ object ScoreboardUtils {
 
     fun getScoreboardView(context: Context, locale: Locale, training: Training, roundId: Long, configuration: ScoreboardConfiguration): LinearLayout {
         val rounds: List<Round>? = if (roundId == -1L) {
-            training.loadRounds()
+            TrainingDAO.loadRounds(training.id)
         } else {
             listOf(RoundDAO.loadRound(roundId))
         }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
index cb10c2d76..737bc6ce7 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
@@ -80,7 +80,7 @@ class CsvExporter(private val context: Context) {
         csv.add(if (t.bow == null) "" else t.bow!!.name)
         // Arrow
         csv.add(if (t.arrow == null) "" else t.arrow!!.name)
-        t.loadRounds()
+        TrainingDAO.loadRounds(t.id)
                 .filter { roundIds.contains(it.id) }
                 .forEach { addRound(csv, it) }
         csv.exitScope()
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index 63dbab446..5b997cfd2 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -109,7 +109,7 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
         training = TrainingDAO.loadTrainingOrNull(trainingId)
-        val rounds = training!!.loadRounds() //FIXME can be null!?
+        val rounds = TrainingDAO.loadRounds(training!!.id) //FIXME can be null!?
         return {
             // Hide fab for standard rounds
             val supportsDeletion = training!!.standardRoundId == null
@@ -154,7 +154,7 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
                 return true
             }
             R.id.action_statistics -> {
-                navigationController.navigateToStatistics(training!!.loadRounds().map { it.id })
+                navigationController.navigateToStatistics(TrainingDAO.loadRounds(training!!.id).map { it.id })
                 return true
             }
             R.id.action_comment -> {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
index 6fc786359..bb2ef0731 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
@@ -294,7 +294,7 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
             navigationController.navigateToCreateEnd(round.round)
         } else {
             // Edit training
-            training.toTraining().update()
+            TrainingDAO.saveTraining(training.training)
             activity!!.overridePendingTransition(R.anim.left_in, R.anim.right_out)
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
index 016bb9c88..512e60d6c 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
@@ -41,7 +41,6 @@ import de.dreier.mytargets.utils.MobileWearableClient.Companion.BROADCAST_UPDATE
 import de.dreier.mytargets.utils.SlideInItemAnimator
 import de.dreier.mytargets.utils.Utils
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
-import java.util.*
 
 /**
  * Shows an overview over all training days
@@ -128,8 +127,8 @@ open class TrainingsFragment : ExpandableListFragment<Header, Training>() {
         return when (item.itemId) {
             R.id.action_statistics -> {
                 navigationController.navigateToStatistics(TrainingDAO.loadTrainings()
-                                .flatMap { training -> training.loadRounds() }
-                                .map { it.id })
+                        .flatMap { training -> TrainingDAO.loadRounds(training.id) }
+                        .map { it.id })
                 true
             }
             else -> super.onOptionsItemSelected(item)
@@ -144,7 +143,7 @@ open class TrainingsFragment : ExpandableListFragment<Header, Training>() {
     private fun onStatistics(ids: List<Long>) {
         navigationController.navigateToStatistics(ids
                 .map { TrainingDAO.loadTrainingOrNull(it)!! }
-                .flatMap { t -> t.loadRounds() }
+                .flatMap { t -> TrainingDAO.loadRounds(t.id) }
                 .map { it.id })
     }
 
@@ -154,9 +153,9 @@ open class TrainingsFragment : ExpandableListFragment<Header, Training>() {
 
     override fun deleteItem(item: Training): () -> Training {
         val training = AugmentedTraining(item)
-        item.delete()
+        TrainingDAO.deleteTraining(item)
         return {
-            training.saveRecursively()
+            TrainingDAO.insertTraining(training)
             item
         }
     }
@@ -173,7 +172,8 @@ open class TrainingsFragment : ExpandableListFragment<Header, Training>() {
     private inner class TrainingAdapter internal constructor(context: Context
     ) : ExpandableListAdapter<Header, Training>({ child ->
         Utils.getMonthHeader(context, child.date)
-    }, Collections.reverseOrder(), Collections.reverseOrder()) {
+    }, compareByDescending(Header::id),
+            compareByDescending(Training::date).thenByDescending(Training::id)) {
 
         override fun getSecondLevelViewHolder(parent: ViewGroup): ViewHolder {
             val itemView = LayoutInflater.from(parent.context)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
index 9c3964e82..ecb9e3cd7 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
@@ -17,9 +17,7 @@ package de.dreier.mytargets.shared.models.augmented
 
 import android.os.Parcel
 import android.os.Parcelable
-import com.raizlabs.android.dbflow.config.FlowManager
-import com.raizlabs.android.dbflow.kotlinextensions.save
-import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 
@@ -27,15 +25,10 @@ data class AugmentedTraining(
         val training: Training,
         var rounds: MutableList<AugmentedRound>
 ) : Parcelable {
-    constructor(training: Training) : this(training, training.loadRounds()
+    constructor(training: Training) : this(training, TrainingDAO.loadRounds(training.id)
             .map { AugmentedRound(it) }
             .toMutableList())
 
-    fun toTraining(): Training {
-        training.rounds = rounds.map { it.round }.toMutableList()
-        return training
-    }
-
     fun initRoundsFromTemplate(standardRound: AugmentedStandardRound) {
         rounds = mutableListOf()
         for (template in standardRound.roundTemplates) {
@@ -66,18 +59,4 @@ data class AugmentedTraining(
             override fun newArray(size: Int): Array<AugmentedTraining?> = arrayOfNulls(size)
         }
     }
-
-    fun saveRecursively() {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction {
-            training.save(it)
-            rounds.forEach { round ->
-                round.round.trainingId = training.id
-                round.save(it)
-                for (end in round.ends) {
-                    end.end.roundId = round.round.id
-                    end.save(it)
-                }
-            }
-        }
-    }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/TrainingDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/TrainingDAO.kt
index a8ab1d335..0be20b9c4 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/TrainingDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/TrainingDAO.kt
@@ -86,9 +86,16 @@ object TrainingDAO {
     }
 
     fun insertTraining(training: AugmentedTraining) {
-        TrainingDAO.insertTraining(training.training, training.rounds.map { it.round })
-        training.rounds.forEach {
-            RoundDAO.saveRound(it)
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db->
+            training.training.save(db)
+            training.rounds.forEach { round ->
+                round.round.trainingId = training.training.id
+                round.save(db)
+                for (end in round.ends) {
+                    end.end.roundId = round.round.id
+                    end.save(db)
+                }
+            }
         }
     }
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
index 2b622b020..f802e1468 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
@@ -18,17 +18,12 @@ package de.dreier.mytargets.shared.models.db
 import android.annotation.SuppressLint
 import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.*
-import com.raizlabs.android.dbflow.config.FlowManager
-import com.raizlabs.android.dbflow.kotlinextensions.delete
-import com.raizlabs.android.dbflow.sql.language.SQLite
 import com.raizlabs.android.dbflow.structure.BaseModel
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.*
 import de.dreier.mytargets.shared.models.dao.*
 import de.dreier.mytargets.shared.utils.typeconverters.EWeatherConverter
 import de.dreier.mytargets.shared.utils.typeconverters.LocalDateConverter
-import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
 import org.threeten.bp.LocalDate
 import org.threeten.bp.format.DateTimeFormatter
@@ -84,10 +79,7 @@ data class Training(
 
         @ForeignKey(tableClass = Signature::class, references = [(ForeignKeyReference(columnName = "witnessSignature", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.SET_NULL)
         var witnessSignatureId: Long? = null
-) : BaseModel(), IIdSettable, Comparable<Training>, Parcelable {
-
-    @IgnoredOnParcel
-    var rounds: MutableList<Round>? = null
+) : BaseModel(), IIdSettable, Parcelable {
 
     var environment: Environment
         get() = Environment(indoor, weather, windSpeed, windDirection, location)
@@ -142,44 +134,7 @@ data class Training(
         get() = date.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM))
 
     val reachedScore: Score
-        get() = loadRounds()
+        get() = TrainingDAO.loadRounds(id)
                 .map { it.reachedScore }
                 .sum()
-
-    @OneToMany(methods = [], variableName = "rounds")
-    fun loadRounds(): MutableList<Round> {
-        if (rounds == null) {
-            rounds = SQLite.select()
-                    .from(Round::class.java)
-                    .where(Round_Table.training.eq(id))
-                    .orderBy(Round_Table.index, true)
-                    .queryList().toMutableList()
-        }
-        return rounds!!
-    }
-
-    override fun compareTo(other: Training): Int {
-        return if (date == other.date) {
-            (id - other.id).toInt()
-        } else date.compareTo(other.date)
-    }
-
-    override fun delete(): Boolean {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction({ this.delete(it) })
-        return true
-    }
-
-    override fun delete(databaseWrapper: DatabaseWrapper): Boolean{
-        loadRounds().forEach { round -> round.delete(databaseWrapper) }
-        super.delete(databaseWrapper)
-        return true
-    }
-
-    fun loadRounds(databaseWrapper: DatabaseWrapper): List<Round> {
-        return SQLite.select()
-                .from(Round::class.java)
-                .where(Round_Table.training.eq(id))
-                .orderBy(Round_Table.index, true)
-                .queryList(databaseWrapper)
-    }
 }

From 21f7a98b1450db62ceb77c671a280a9a2d7e08b3 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Mon, 15 Jan 2018 13:22:07 +0100
Subject: [PATCH 033/102] Inlined Training#standardRound

---
 .../features/scoreboard/layout/DefaultScoreboardLayout.kt | 5 +++--
 .../dreier/mytargets/features/statistics/CsvExporter.kt   | 3 ++-
 .../mytargets/features/training/details/HtmlUtils.kt      | 5 +++--
 .../mytargets/features/training/input/InputActivity.kt    | 6 ++++--
 .../mytargets/features/training/input/LoaderResult.kt     | 4 ----
 .../de/dreier/mytargets/utils/MobileWearableListener.kt   | 3 ++-
 .../java/de/dreier/mytargets/shared/models/db/Training.kt | 8 ++++----
 7 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
index 76b76e0f9..698312dae 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
@@ -27,6 +27,7 @@ import de.dreier.mytargets.shared.models.SelectableZone
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.models.dao.RoundDAO
+import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.models.db.Training
@@ -108,8 +109,8 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
         }
 
         if (training.standardRoundId != null) {
-            val standardRound = training.standardRound
-            info.addLine(R.string.standard_round, standardRound!!.name)
+            val standardRound = StandardRoundDAO.loadStandardRound(training.standardRoundId!!)
+            info.addLine(R.string.standard_round, standardRound.name)
         }
         if (!training.comment.isEmpty() && configuration.showComments) {
             info.addWrappedLine(R.string.comment, training.comment)
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
index 737bc6ce7..9bb70598f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
@@ -19,6 +19,7 @@ import android.content.Context
 import de.dreier.mytargets.R
 import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.models.dao.RoundDAO
+import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
@@ -73,7 +74,7 @@ class CsvExporter(private val context: Context) {
         // Date
         csv.add(t.date.format(DateTimeFormatter.ISO_LOCAL_DATE))
         // StandardRound
-        csv.add(t.standardRound?.name ?: context.getString(R.string.practice))
+        csv.add(StandardRoundDAO.loadStandardRoundOrNull(t.standardRoundId!!)?.name ?: context.getString(R.string.practice))
         // Indoor
         csv.add(if (t.indoor) context.getString(R.string.indoor) else context.getString(R.string.outdoor))
         // Bow
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
index 4bf43fa8f..c852a223c 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
@@ -19,6 +19,7 @@ import android.content.Context
 import android.text.Spanned
 import android.text.TextUtils
 import de.dreier.mytargets.R
+import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.utils.Utils
@@ -54,8 +55,8 @@ object HtmlUtils {
             info.addLine(R.string.arrow, arrow.name)
         }
 
-        val standardRound = training.standardRound
-        if (standardRound != null) {
+        if (training.standardRoundId != null) {
+            val standardRound = StandardRoundDAO.loadStandardRound(training.standardRoundId!!)
             info.addLine(R.string.standard_round, standardRound.name)
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
index 732a9b59e..2b239a9c5 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
@@ -49,6 +49,7 @@ import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
 import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.dao.EndDAO
+import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
@@ -445,8 +446,9 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
     ) : AsyncTaskLoader<LoaderResult>(context) {
 
         override fun loadInBackground(): LoaderResult? {
-            val training = TrainingDAO.loadTrainingOrNull(trainingId)
-            val result = LoaderResult(AugmentedTraining(training!!))
+            val training = TrainingDAO.loadTraining(trainingId)
+            val standardRound = if (training.standardRoundId == null) null else StandardRoundDAO.loadStandardRound(training.standardRoundId!!)
+            val result = LoaderResult(AugmentedTraining(training), standardRound)
             result.setRoundId(roundId)
             result.setAdjustEndIndex(endIndex)
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt
index 863c7afd6..a71d00f18 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt
@@ -58,10 +58,6 @@ class LoaderResult @JvmOverloads constructor(
             return ends[endIndex]
         }
 
-    init {
-        this.standardRound = training.training.standardRound
-    }
-
     fun setRoundId(roundId: Long) {
         val rounds = training.rounds
         roundIndex = 0
diff --git a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
index 0c90ae615..f6e0dcf03 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
@@ -27,6 +27,7 @@ import de.dreier.mytargets.shared.models.augmented.AugmentedRound
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
 import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
 import de.dreier.mytargets.shared.models.dao.RoundDAO
+import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
@@ -83,7 +84,7 @@ class MobileWearableListener : WearableListenerService() {
                 round.distance = SettingsManager.distance
                 aTraining.rounds = mutableListOf(AugmentedRound(round))
             } else {
-                aTraining.initRoundsFromTemplate(AugmentedStandardRound(lastTraining!!.standardRound!!))
+                aTraining.initRoundsFromTemplate(AugmentedStandardRound(StandardRoundDAO.loadStandardRound(lastTraining!!.standardRoundId!!)))
             }
             ApplicationInstance.wearableClient.sendTrainingTemplate(aTraining)
         }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
index f802e1468..377f741fa 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
@@ -21,7 +21,10 @@ import com.raizlabs.android.dbflow.annotation.*
 import com.raizlabs.android.dbflow.structure.BaseModel
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.*
-import de.dreier.mytargets.shared.models.dao.*
+import de.dreier.mytargets.shared.models.dao.ArrowDAO
+import de.dreier.mytargets.shared.models.dao.BowDAO
+import de.dreier.mytargets.shared.models.dao.SignatureDAO
+import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.utils.typeconverters.EWeatherConverter
 import de.dreier.mytargets.shared.utils.typeconverters.LocalDateConverter
 import kotlinx.android.parcel.Parcelize
@@ -91,9 +94,6 @@ data class Training(
             location = env.location
         }
 
-    val standardRound: StandardRound?
-        get() = if (standardRoundId == null) null else StandardRoundDAO.loadStandardRoundOrNull(standardRoundId!!)
-
     val bow: Bow?
         get() = if (bowId == null) null else BowDAO.loadBowOrNull(bowId!!)
 

From f9c4af3569073e50eeedebc1f3644c18054b2b29 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Mon, 15 Jan 2018 13:33:19 +0100
Subject: [PATCH 034/102] Inlined Training#bow and #arrow

---
 .../layout/DefaultScoreboardLayout.kt          | 12 +++++-------
 .../features/statistics/CsvExporter.kt         |  9 +++------
 .../features/training/details/HtmlUtils.kt     | 10 ++++++----
 .../features/training/input/InputActivity.kt   | 18 ++++++------------
 .../features/training/input/LoaderResult.kt    |  4 ----
 .../mytargets/shared/models/db/Training.kt     |  8 --------
 6 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
index 698312dae..0c88e1a4f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
@@ -25,9 +25,7 @@ import de.dreier.mytargets.features.scoreboard.builder.model.TextCell
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.SelectableZone
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.shared.models.dao.EndDAO
-import de.dreier.mytargets.shared.models.dao.RoundDAO
-import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
+import de.dreier.mytargets.shared.models.dao.*
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.models.db.Training
@@ -97,14 +95,14 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
             }
         }
 
-        val bow = training.bow
-        if (bow != null) {
+        if (training.bowId != null) {
+            val bow = BowDAO.loadBow(training.bowId!!)
             info.addLine(R.string.bow, bow.name)
             info.addLine(R.string.bow_type, bow.type!!)
         }
 
-        val arrow = training.arrow
-        if (arrow != null) {
+        if (training.arrowId != null) {
+            val arrow = ArrowDAO.loadArrow(training.arrowId!!)
             info.addLine(R.string.arrow, arrow.name)
         }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
index 9bb70598f..a080589e3 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
@@ -17,10 +17,7 @@ package de.dreier.mytargets.features.statistics
 
 import android.content.Context
 import de.dreier.mytargets.R
-import de.dreier.mytargets.shared.models.dao.EndDAO
-import de.dreier.mytargets.shared.models.dao.RoundDAO
-import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
+import de.dreier.mytargets.shared.models.dao.*
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import org.threeten.bp.format.DateTimeFormatter
@@ -78,9 +75,9 @@ class CsvExporter(private val context: Context) {
         // Indoor
         csv.add(if (t.indoor) context.getString(R.string.indoor) else context.getString(R.string.outdoor))
         // Bow
-        csv.add(if (t.bow == null) "" else t.bow!!.name)
+        csv.add(if (t.bowId == null) "" else BowDAO.loadBow(t.bowId!!).name)
         // Arrow
-        csv.add(if (t.arrow == null) "" else t.arrow!!.name)
+        csv.add(if (t.arrowId == null) "" else ArrowDAO.loadArrow(t.arrowId!!).name)
         TrainingDAO.loadRounds(t.id)
                 .filter { roundIds.contains(it.id) }
                 .forEach { addRound(csv, it) }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
index c852a223c..53f13af1b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
@@ -19,6 +19,8 @@ import android.content.Context
 import android.text.Spanned
 import android.text.TextUtils
 import de.dreier.mytargets.R
+import de.dreier.mytargets.shared.models.dao.ArrowDAO
+import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
@@ -45,13 +47,13 @@ object HtmlUtils {
             }
         }
 
-        val bow = training.bow
-        if (bow != null) {
+        if (training.bowId != null) {
+            val bow = BowDAO.loadBow(training.bowId!!)
             info.addLine(R.string.bow, bow.name)
         }
 
-        val arrow = training.arrow
-        if (arrow != null) {
+        if (training.arrowId != null) {
+            val arrow = ArrowDAO.loadArrow(training.arrowId!!)
             info.addLine(R.string.arrow, arrow.name)
         }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
index 2b239a9c5..02994f244 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
@@ -47,10 +47,7 @@ import de.dreier.mytargets.databinding.ActivityInputBinding
 import de.dreier.mytargets.features.settings.ESettingsScreens
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
-import de.dreier.mytargets.shared.models.dao.BowDAO
-import de.dreier.mytargets.shared.models.dao.EndDAO
-import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
+import de.dreier.mytargets.shared.models.dao.*
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
@@ -453,14 +450,12 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
             result.setAdjustEndIndex(endIndex)
 
             if (training.arrowId != null) {
-                val arrow = training.arrow
-                if (arrow != null) {
-                    result.setArrow(arrow)
-                }
+                val arrow = ArrowDAO.loadArrow(training.arrowId!!)
+                result.maxArrowNumber = arrow.maxArrowNumber
+                result.arrowDiameter = arrow.diameter
             }
-            val bow = training.bow
-            if (bow != null) {
-                result.sightMark = BowDAO.loadSightMarks(bow.id)
+            if (training.bowId != null) {
+                result.sightMark = BowDAO.loadSightMarks(training.bowId!!)
                         .firstOrNull { it.distance == result.distance!! }
             }
             return result
@@ -481,5 +476,4 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
             return end.id != currentEndId && end.exact
         }
     }
-
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt
index a71d00f18..31c04f9f0 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt
@@ -73,8 +73,4 @@ class LoaderResult @JvmOverloads constructor(
         this.endIndex = Math.min(endIndex, currentRound.ends.size)
     }
 
-    fun setArrow(arrow: Arrow) {
-        maxArrowNumber = arrow.maxArrowNumber
-        arrowDiameter = arrow.diameter
-    }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
index 377f741fa..93534bbd5 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
@@ -21,8 +21,6 @@ import com.raizlabs.android.dbflow.annotation.*
 import com.raizlabs.android.dbflow.structure.BaseModel
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.*
-import de.dreier.mytargets.shared.models.dao.ArrowDAO
-import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.dao.SignatureDAO
 import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.utils.typeconverters.EWeatherConverter
@@ -94,12 +92,6 @@ data class Training(
             location = env.location
         }
 
-    val bow: Bow?
-        get() = if (bowId == null) null else BowDAO.loadBowOrNull(bowId!!)
-
-    val arrow: Arrow?
-        get() = if (arrowId == null) null else ArrowDAO.loadArrowOrNull(arrowId!!)
-
     val orCreateArcherSignature: Signature
         get() {
             if (archerSignatureId != null) {

From 5125278423fc31e28d4a144eb96b072b8f9ce6b1 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Mon, 15 Jan 2018 18:32:24 +0100
Subject: [PATCH 035/102] Improved performance for Score calculation

---
 .../test/utils/rules/DbTestRuleBase.kt        |   4 +-
 .../test/utils/rules/MiniDbTestRule.kt        |  27 ++--
 .../test/utils/rules/SimpleDbTestRule.kt      | 145 +++++++++---------
 .../features/scoreboard/ScoreboardFragment.kt |   6 +-
 .../layout/DefaultScoreboardLayout.kt         |   6 +-
 .../features/statistics/StatisticsFragment.kt |  13 +-
 .../features/training/RoundFragment.kt        |   4 +-
 .../training/details/TrainingFragment.kt      |   6 +-
 .../training/edit/EditTrainingFragment.kt     |  34 ++--
 .../features/training/input/InputActivity.kt  |  35 +++--
 .../features/training/input/LoaderResult.kt   |   2 +-
 .../training/overview/TrainingsFragment.kt    |   8 +-
 .../mytargets/utils/AugmentedRoundUtils.kt    |  36 +++++
 .../mytargets/utils/MobileWearableListener.kt |  20 +--
 .../de/dreier/mytargets}/utils/ScoreUtils.kt  |   2 +-
 .../de/dreier/mytargets/shared/AppDatabase.kt |  59 ++++++-
 .../dreier/mytargets/shared/models/Score.kt   |  36 ++---
 .../mytargets/shared/models/TrainingInfo.kt   |   2 +-
 .../shared/models/augmented/AugmentedEnd.kt   |   7 -
 .../shared/models/augmented/AugmentedRound.kt |  28 ----
 .../augmented/AugmentedStandardRound.kt       |  11 ++
 .../models/augmented/AugmentedTraining.kt     |  14 +-
 .../mytargets/shared/models/dao/EndDAO.kt     |   6 +-
 .../mytargets/shared/models/dao/RoundDAO.kt   |   6 +-
 .../shared/models/dao/StandardRoundDAO.kt     |   3 +
 .../shared/models/dao/TrainingDAO.kt          |  66 +++++---
 .../dreier/mytargets/shared/models/db/End.kt  |  24 ++-
 .../mytargets/shared/models/db/Round.kt       |  25 +--
 .../mytargets/shared/models/db/Training.kt    |  58 +++----
 .../mytargets/shared/models/ScoreTest.kt      |  12 +-
 30 files changed, 394 insertions(+), 311 deletions(-)
 create mode 100644 app/src/main/java/de/dreier/mytargets/utils/AugmentedRoundUtils.kt
 rename {shared/src/main/java/de/dreier/mytargets/shared => app/src/main/java/de/dreier/mytargets}/utils/ScoreUtils.kt (98%)

diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
index 1b55d50bf..5661df6b8 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
@@ -32,6 +32,7 @@ import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.shared.models.db.Training
+import de.dreier.mytargets.utils.addEnd
 import org.junit.rules.TestRule
 import org.junit.runner.Description
 import org.junit.runners.model.Statement
@@ -74,8 +75,7 @@ abstract class DbTestRuleBase : TestRule {
             end.shots[i].x = gaussianRand(gen)
             end.shots[i].y = gaussianRand(gen)
             end.shots[i].scoringRing = round.round.target.model
-                    .getZoneFromPoint(end.shots[i].x,
-                            end.shots[i].y, 0.05f)
+                    .getZoneFromPoint(end.shots[i].x, end.shots[i].y, 0.05f)
         }
         end.end.saveTime = LocalTime.of(14, gen.nextInt(59), gen.nextInt(59), 0)
         return end
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
index 788324325..2a4933af0 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
@@ -18,8 +18,8 @@ package de.dreier.mytargets.test.utils.rules
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
-import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
+import de.dreier.mytargets.shared.models.augmented.AugmentedRound
+import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.targets.models.WAFull
@@ -41,21 +41,22 @@ class MiniDbTestRule : DbTestRuleBase() {
 
     private fun addRandomTraining(seed: Int) {
         val generator = Random(seed.toLong())
-        val standardRound = AugmentedStandardRound(StandardRoundDAO.loadStandardRound(32L))
+        val standardRound = StandardRoundDAO.loadAugmentedStandardRound(32L)
 
-        val training = saveDefaultTraining(standardRound!!.id, generator)
-        val at = AugmentedTraining(training)
-        at.initRoundsFromTemplate(standardRound)
-        TrainingDAO.saveTraining(at.training, at.rounds)
+        val training = saveDefaultTraining(standardRound.id, generator)
+        val rounds = standardRound.createRoundsFromTemplate()
+        TrainingDAO.saveTraining(training, rounds)
 
-        val round1 = at.rounds[0]
-        val round2 = at.rounds[1]
+        val round1 = AugmentedRound(rounds[0], mutableListOf())
+        val round2 = AugmentedRound(rounds[1], mutableListOf())
 
-        randomEnd(round1, 6, generator).save()
-        randomEnd(round1, 6, generator).save()
+        round1.ends.add(randomEnd(round1, 6, generator))
+        round1.ends.add(randomEnd(round1, 6, generator))
+        RoundDAO.saveRound(round1)
 
-        randomEnd(round2, 6, generator).save()
-        randomEnd(round2, 6, generator).save()
+        round2.ends.add(randomEnd(round2, 6, generator))
+        round2.ends.add(randomEnd(round2, 6, generator))
+        RoundDAO.saveRound(round2)
     }
 
 }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
index e3bb87d15..88573bdba 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
@@ -22,11 +22,13 @@ import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.EWeather
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
-import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
-import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
+import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.dao.TrainingDAO
-import de.dreier.mytargets.shared.models.db.*
+import de.dreier.mytargets.shared.models.db.Bow
+import de.dreier.mytargets.shared.models.db.Round
+import de.dreier.mytargets.shared.models.db.RoundTemplate
+import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.targets.models.WAFull
 import de.dreier.mytargets.shared.views.TargetViewBase
 import org.threeten.bp.LocalDate
@@ -64,29 +66,31 @@ class SimpleDbTestRule : DbTestRuleBase() {
 
         val (id) = saveDefaultTraining(null, generator)
 
-        val round1 = Round(rounds[0])
-        round1.trainingId = id
-        round1.save()
-        val r1 = AugmentedRound(round1)
-
-        val round2 = Round(rounds[1])
-        round2.trainingId = id
-        round2.save()
-        val r2 = AugmentedRound(round2)
-
-        randomEnd(r1, 6, generator).save()
-        randomEnd(r1, 6, generator).save()
-        randomEnd(r1, 6, generator).save()
-        randomEnd(r1, 6, generator).save()
-        randomEnd(r1, 6, generator).save()
-        randomEnd(r1, 6, generator).save()
-
-        randomEnd(r2, 6, generator).save()
-        randomEnd(r2, 6, generator).save()
-        randomEnd(r2, 6, generator).save()
-        randomEnd(r2, 6, generator).save()
-        randomEnd(r2, 6, generator).save()
-        randomEnd(r2, 6, generator).save()
+        val round1r = Round(rounds[0])
+        round1r.trainingId = id
+        RoundDAO.saveRound(round1r)
+        val round1 = AugmentedRound(round1r, mutableListOf())
+
+        val round2r = Round(rounds[1])
+        round2r.trainingId = id
+        RoundDAO.saveRound(round2r)
+        val round2 = AugmentedRound(round2r, mutableListOf())
+
+        round1.ends.add(randomEnd(round1, 6, generator))
+        round1.ends.add(randomEnd(round1, 6, generator))
+        round1.ends.add(randomEnd(round1, 6, generator))
+        round1.ends.add(randomEnd(round1, 6, generator))
+        round1.ends.add(randomEnd(round1, 6, generator))
+        round1.ends.add(randomEnd(round1, 6, generator))
+        RoundDAO.saveRound(round1)
+
+        round2.ends.add(randomEnd(round2, 6, generator))
+        round2.ends.add(randomEnd(round2, 6, generator))
+        round2.ends.add(randomEnd(round2, 6, generator))
+        round2.ends.add(randomEnd(round2, 6, generator))
+        round2.ends.add(randomEnd(round2, 6, generator))
+        round2.ends.add(randomEnd(round2, 6, generator))
+        RoundDAO.saveRound(round2)
     }
 
     private fun getRoundTemplate(index: Int, distance: Int): RoundTemplate {
@@ -101,35 +105,35 @@ class SimpleDbTestRule : DbTestRuleBase() {
 
     private fun addRandomTraining(seed: Int) {
         val generator = Random(seed.toLong())
-        val standardRound = AugmentedStandardRound(StandardRoundDAO.loadStandardRound(32L))
+        val standardRound = StandardRoundDAO.loadAugmentedStandardRound(32L)
 
         val training = saveDefaultTraining(standardRound.id, generator)
 
-        val at = AugmentedTraining(training)
-        at.initRoundsFromTemplate(standardRound)
-        TrainingDAO.saveTraining(at.training, at.rounds)
-
-        val round1 = at.rounds[0]
-
-        val round2 = at.rounds[1]
-
-        randomEnd(round1, 6, generator).save()
-        randomEnd(round1, 6, generator).save()
-        randomEnd(round1, 6, generator).save()
-        randomEnd(round1, 6, generator).save()
-        randomEnd(round1, 6, generator).save()
-        randomEnd(round1, 6, generator).save()
-
-        randomEnd(round2, 6, generator).save()
-        randomEnd(round2, 6, generator).save()
-        randomEnd(round2, 6, generator).save()
-        randomEnd(round2, 6, generator).save()
-        randomEnd(round2, 6, generator).save()
-        randomEnd(round2, 6, generator).save()
+        val rounds = standardRound.createRoundsFromTemplate()
+        TrainingDAO.saveTraining(training, rounds)
+
+        val round1 = AugmentedRound(rounds[0], mutableListOf())
+        val round2 = AugmentedRound(rounds[1], mutableListOf())
+
+        round1.ends.add(randomEnd(round1, 6, generator))
+        round1.ends.add(randomEnd(round1, 6, generator))
+        round1.ends.add(randomEnd(round1, 6, generator))
+        round1.ends.add(randomEnd(round1, 6, generator))
+        round1.ends.add(randomEnd(round1, 6, generator))
+        round1.ends.add(randomEnd(round1, 6, generator))
+        RoundDAO.saveRound(round1)
+
+        round2.ends.add(randomEnd(round2, 6, generator))
+        round2.ends.add(randomEnd(round2, 6, generator))
+        round2.ends.add(randomEnd(round2, 6, generator))
+        round2.ends.add(randomEnd(round2, 6, generator))
+        round2.ends.add(randomEnd(round2, 6, generator))
+        round2.ends.add(randomEnd(round2, 6, generator))
+        RoundDAO.saveRound(round2)
     }
 
     private fun addFullTraining(bow: Bow) {
-        val standardRound = AugmentedStandardRound(StandardRoundDAO.loadStandardRound(32L))
+        val standardRound = StandardRoundDAO.loadAugmentedStandardRound(32L)
 
         val training = Training()
         training.title = InstrumentationRegistry.getTargetContext().getString(R.string.training)
@@ -141,26 +145,27 @@ class SimpleDbTestRule : DbTestRuleBase() {
         training.bowId = bow.id
         training.arrowId = null
         training.arrowNumbering = false
-        val at = AugmentedTraining(training)
-        at.initRoundsFromTemplate(standardRound)
-        TrainingDAO.saveTraining(at.training, at.rounds.map { it.round })
-
-        val round1 = at.rounds[0]
-
-        val round2 = at.rounds[1]
-
-        buildEnd(round1, 1, 1, 2, 3, 3, 4).save()
-        buildEnd(round1, 0, 0, 1, 2, 2, 3).save()
-        buildEnd(round1, 1, 1, 1, 3, 4, 4).save()
-        buildEnd(round1, 0, 1, 1, 1, 2, 3).save()
-        buildEnd(round1, 1, 2, 3, 3, 4, 5).save()
-        buildEnd(round1, 1, 2, 2, 3, 3, 3).save()
-
-        buildEnd(round2, 1, 2, 2, 3, 4, 5).save()
-        buildEnd(round2, 0, 0, 1, 2, 2, 3).save()
-        buildEnd(round2, 0, 1, 2, 2, 2, 3).save()
-        buildEnd(round2, 1, 1, 2, 3, 4, 4).save()
-        buildEnd(round2, 1, 2, 2, 3, 3, 3).save()
-        buildEnd(round2, 1, 2, 2, 3, 3, 4).save()
+
+        val rounds = standardRound.createRoundsFromTemplate()
+        TrainingDAO.saveTraining(training, rounds)
+
+        val round1 = AugmentedRound(rounds[0], mutableListOf())
+        val round2 = AugmentedRound(rounds[1], mutableListOf())
+
+        round1.ends.add(buildEnd(round1, 1, 1, 2, 3, 3, 4))
+        round1.ends.add(buildEnd(round1, 0, 0, 1, 2, 2, 3))
+        round1.ends.add(buildEnd(round1, 1, 1, 1, 3, 4, 4))
+        round1.ends.add(buildEnd(round1, 0, 1, 1, 1, 2, 3))
+        round1.ends.add(buildEnd(round1, 1, 2, 3, 3, 4, 5))
+        round1.ends.add(buildEnd(round1, 1, 2, 2, 3, 3, 3))
+        RoundDAO.saveRound(round1)
+
+        round2.ends.add(buildEnd(round2, 1, 2, 2, 3, 4, 5))
+        round2.ends.add(buildEnd(round2, 0, 0, 1, 2, 2, 3))
+        round2.ends.add(buildEnd(round2, 0, 1, 2, 2, 2, 3))
+        round2.ends.add(buildEnd(round2, 1, 1, 2, 3, 4, 4))
+        round2.ends.add(buildEnd(round2, 1, 2, 2, 3, 3, 3))
+        round2.ends.add(buildEnd(round2, 1, 2, 2, 3, 3, 4))
+        RoundDAO.saveRound(round2)
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
index 8aa91e26e..dc2cc7303 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
@@ -97,9 +97,9 @@ class ScoreboardFragment : FragmentBase() {
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        training = TrainingDAO.loadTrainingOrNull(trainingId)
-        val archerSignature = training!!.orCreateArcherSignature
-        val witnessSignature = training!!.orCreateWitnessSignature
+        training = TrainingDAO.loadTraining(trainingId)
+        val archerSignature = TrainingDAO.getOrCreateArcherSignature(training!!)
+        val witnessSignature = TrainingDAO.getOrCreateWitnessSignature(training!!)
 
         val scoreboard = ScoreboardUtils
                 .getScoreboardView(context!!, Utils.getCurrentLocale(context!!),
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
index 0c88e1a4f..4fc0e209d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
@@ -30,7 +30,7 @@ import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.targets.scoringstyle.ScoringStyle
-import de.dreier.mytargets.shared.utils.ScoreUtils
+import de.dreier.mytargets.utils.ScoreUtils
 import java.util.*
 
 class DefaultScoreboardLayout(private val context: Context, private val locale: Locale, private val configuration: ScoreboardConfiguration) {
@@ -313,13 +313,13 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
             info.addLine(R.string.licence_number, licenceNumber)
         }
         if (rounds.size > 1) {
-            info.addLine(R.string.points, training.reachedScore
+            info.addLine(R.string.points, training.score
                     .format(locale, SettingsManager.scoreConfiguration))
         }
         info.addLine(R.string.date, training.formattedDate)
     }
 
     private fun appendSignature(training: Training) {
-        builder.signature(training.orCreateArcherSignature, training.orCreateWitnessSignature)
+        builder.signature(TrainingDAO.getOrCreateArcherSignature(training), TrainingDAO.getOrCreateWitnessSignature(training))
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
index 75145e532..bddf083b5 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
@@ -49,12 +49,8 @@ import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.utils.Color
-import de.dreier.mytargets.shared.utils.ScoreUtils
-import de.dreier.mytargets.utils.MobileWearableClient
+import de.dreier.mytargets.utils.*
 import de.dreier.mytargets.utils.MobileWearableClient.Companion.BROADCAST_UPDATE_TRAINING_FROM_REMOTE
-import de.dreier.mytargets.utils.RoundedTextDrawable
-import de.dreier.mytargets.utils.ToolbarUtils
-import de.dreier.mytargets.utils.Utils
 import org.threeten.bp.Duration
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDateTime
@@ -110,7 +106,7 @@ class StatisticsFragment : FragmentBase() {
                         RoundDAO.loadEnds(roundIdPair.second.id)
                                 .map { end -> Pair(roundIdPair.first, end) }
                     }
-                    .map { endPair -> getPairEndSummary(target!!, endPair.second, endPair.first) }
+                    .map { endPair -> getPairEndSummary(endPair.second, endPair.first) }
                     .sortedBy { pair -> pair.second }
             if (values.isEmpty()) {
                 return null
@@ -382,9 +378,8 @@ class StatisticsFragment : FragmentBase() {
         return eval
     }
 
-    private fun getPairEndSummary(target: Target, end: End, trainingDate: LocalDate): Pair<Float, LocalDateTime> {
-        val reachedScore = target.getReachedScore(EndDAO.loadShots(end.id))
-        return Pair(reachedScore.shotAverage, LocalDateTime.of(trainingDate, end.saveTime!!))
+    private fun getPairEndSummary(end: End, trainingDate: LocalDate): Pair<Float, LocalDateTime> {
+        return Pair(end.score.shotAverage, LocalDateTime.of(trainingDate, end.saveTime!!))
     }
 
     private fun convertToLineData(values: List<Pair<Float, LocalDateTime>>, evaluator: Evaluator): LineDataSet {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
index 7ddc15300..c01fc8a38 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
@@ -104,7 +104,7 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
         round = RoundDAO.loadRound(roundId)
-        val ends = RoundDAO.loadEnds(round!!.id).map { AugmentedEnd(it) }.toMutableList()
+        val ends = EndDAO.loadAugmentedEnds(round!!.id)
         val showFab = round!!.maxEndCount == null || ends.size < round!!.maxEndCount!!
 
         return {
@@ -113,7 +113,7 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
 
             ToolbarUtils.setTitle(this@RoundFragment,
                     String.format(Locale.US, "%s %d", getString(R.string.round), round!!.index + 1))
-            ToolbarUtils.setSubtitle(this@RoundFragment, round!!.reachedScore.toString())
+            ToolbarUtils.setSubtitle(this@RoundFragment, round!!.score.toString())
         }
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index 5b997cfd2..d3dde0eb0 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -108,8 +108,8 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        training = TrainingDAO.loadTrainingOrNull(trainingId)
-        val rounds = TrainingDAO.loadRounds(training!!.id) //FIXME can be null!?
+        training = TrainingDAO.loadTraining(trainingId)
+        val rounds = TrainingDAO.loadRounds(trainingId)
         return {
             // Hide fab for standard rounds
             val supportsDeletion = training!!.standardRoundId == null
@@ -216,7 +216,7 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
             } else {
                 binding.subtitle.visibility = View.VISIBLE
             }
-            binding.points.text = item.reachedScore
+            binding.points.text = item.score
                     .format(Utils.getCurrentLocale(context!!), SettingsManager.scoreConfiguration)
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
index bb2ef0731..ce1644793 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
@@ -37,8 +37,6 @@ import de.dreier.mytargets.features.training.ETrainingType.TRAINING_WITH_STANDAR
 import de.dreier.mytargets.features.training.target.TargetListFragment
 import de.dreier.mytargets.shared.models.EBowType
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.shared.models.augmented.AugmentedRound
-import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
 import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.shared.models.db.Round
@@ -53,7 +51,6 @@ import org.adw.library.widgets.discreteseekbar.DiscreteSeekBar
 import org.threeten.bp.LocalDate
 import org.threeten.bp.format.DateTimeFormatter
 import org.threeten.bp.format.FormatStyle
-import java.util.*
 
 class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListener {
 
@@ -102,7 +99,7 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
         binding = DataBindingUtil
                 .inflate(inflater, R.layout.fragment_edit_training, container, false)
 
-        trainingId = arguments.getLongOrNull(ITEM_ID)
+        trainingId = arguments.getLongOrNull(ITEM_ID)!!
         trainingType = if (activity?.intent?.action == CREATE_TRAINING_WITH_STANDARD_ROUND_ACTION) {
             TRAINING_WITH_STANDARD_ROUND
         } else {
@@ -260,14 +257,15 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
     }
 
     override fun onSave() {
-        val training = AugmentedTraining(training)
         navigationController.finish()
 
+        val training = training
+
         if (trainingId == null) {
+            val rounds: MutableList<Round>
             if (trainingType == FREE_TRAINING) {
-                training.training.standardRoundId = null
-                training.rounds = ArrayList()
-                training.rounds.add(AugmentedRound(round))
+                training.standardRoundId = null
+                rounds = mutableListOf(round)
             } else {
                 val standardRound = binding.standardRound.selectedItem!!
                 if (standardRound.standardRound.id == 0L) {
@@ -275,26 +273,26 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
                     //StandardRoundDAO.saveStandardRound(standardRound.standardRound, standardRound.roundTemplates)
                 }
                 SettingsManager.standardRound = standardRound.standardRound.id
-                training.training.standardRoundId = standardRound.standardRound.id
-                training.initRoundsFromTemplate(standardRound)
-                for (round in training.rounds) {
-                    round.round.target = roundTarget!!
+                training.standardRoundId = standardRound.standardRound.id
+                rounds = standardRound.createRoundsFromTemplate()
+                for (round in rounds) {
+                    round.target = roundTarget!!
                 }
             }
-            TrainingDAO.saveTraining(training.training, training.rounds.map { it.round })
+            TrainingDAO.saveTraining(training, rounds)
 
-            val round = training.rounds[0]
+            val round = rounds[0]
 
-            navigationController.navigateToTraining(training.training)
+            navigationController.navigateToTraining(training)
                     .noAnimation()
                     .start()
-            navigationController.navigateToRound(round.round)
+            navigationController.navigateToRound(round)
                     .noAnimation()
                     .start()
-            navigationController.navigateToCreateEnd(round.round)
+            navigationController.navigateToCreateEnd(round)
         } else {
             // Edit training
-            TrainingDAO.saveTraining(training.training)
+            TrainingDAO.saveTraining(training)
             activity!!.overridePendingTransition(R.anim.left_in, R.anim.right_out)
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
index 02994f244..f750c7eb2 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
@@ -46,7 +46,6 @@ import de.dreier.mytargets.base.gallery.GalleryActivity
 import de.dreier.mytargets.databinding.ActivityInputBinding
 import de.dreier.mytargets.features.settings.ESettingsScreens
 import de.dreier.mytargets.features.settings.SettingsManager
-import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
 import de.dreier.mytargets.shared.models.dao.*
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
@@ -61,8 +60,10 @@ import de.dreier.mytargets.utils.MobileWearableClient.Companion.BROADCAST_UPDATE
 import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.Utils
 import de.dreier.mytargets.utils.Utils.getCurrentLocale
+import de.dreier.mytargets.utils.addEnd
 import de.dreier.mytargets.utils.transitions.FabTransform
 import de.dreier.mytargets.utils.transitions.TransitionAdapter
+import org.threeten.bp.LocalTime
 import java.io.File
 
 class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener, TargetView.OnEndUpdatedListener, LoaderManager.LoaderCallbacks<LoaderResult> {
@@ -128,16 +129,26 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
         super.onActivityResult(requestCode, resultCode, data)
         if (requestCode == GALLERY_REQUEST_CODE && resultCode == Activity.RESULT_OK && data != null) {
             val imageList = GalleryActivity.getResult(data)
-            this.data!!.currentEnd.images = imageList.toEndImageList()
+            val currentEnd = this.data!!.currentEnd
+            currentEnd.images = imageList.toEndImageList()
             for (image in imageList.removedImages) {
                 File(filesDir, image).delete()
             }
-            this.data!!.currentEnd.save()
+            saveCurrentEnd()
             updateEnd()
             invalidateOptionsMenu()
         }
     }
 
+    private fun saveCurrentEnd() {
+        val currentEnd = data!!.currentEnd
+        if (currentEnd.end.saveTime == null) {
+            currentEnd.end.saveTime = LocalTime.now()
+        }
+        currentEnd.end.score = data!!.currentRound.round.target.getReachedScore(currentEnd.shots)
+        EndDAO.saveEnd(currentEnd.end, currentEnd.images, currentEnd.shots)
+    }
+
     override fun onDestroy() {
         LocalBroadcastManager.getInstance(this).unregisterReceiver(updateReceiver)
         LocalBroadcastManager.getInstance(this).unregisterReceiver(timerReceiver)
@@ -393,7 +404,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
 
     override fun onEndUpdated(shots: List<Shot>) {
         data!!.currentEnd.shots = shots.toMutableList()
-        data!!.currentEnd.save()
+        saveCurrentEnd()
 
         // Set current end score
         val reachedEndScore = data!!.currentRound.round.target
@@ -423,7 +434,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
     override fun onEndFinished(shotList: List<Shot>) {
         data!!.currentEnd.shots = shotList.toMutableList()
         data!!.currentEnd.end.exact = targetView!!.inputMode === EInputMethod.PLOTTING
-        data!!.currentEnd.save()
+        saveCurrentEnd()
 
         updateWearNotification()
         updateNavigationButtons()
@@ -443,19 +454,19 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
     ) : AsyncTaskLoader<LoaderResult>(context) {
 
         override fun loadInBackground(): LoaderResult? {
-            val training = TrainingDAO.loadTraining(trainingId)
-            val standardRound = if (training.standardRoundId == null) null else StandardRoundDAO.loadStandardRound(training.standardRoundId!!)
-            val result = LoaderResult(AugmentedTraining(training), standardRound)
+            val training = TrainingDAO.loadAugmentedTraining(trainingId)
+            val standardRound = if (training.training.standardRoundId == null) null else StandardRoundDAO.loadStandardRound(training.training.standardRoundId!!)
+            val result = LoaderResult(training, standardRound)
             result.setRoundId(roundId)
             result.setAdjustEndIndex(endIndex)
 
-            if (training.arrowId != null) {
-                val arrow = ArrowDAO.loadArrow(training.arrowId!!)
+            if (training.training.arrowId != null) {
+                val arrow = ArrowDAO.loadArrow(training.training.arrowId!!)
                 result.maxArrowNumber = arrow.maxArrowNumber
                 result.arrowDiameter = arrow.diameter
             }
-            if (training.bowId != null) {
-                result.sightMark = BowDAO.loadSightMarks(training.bowId!!)
+            if (training.training.bowId != null) {
+                result.sightMark = BowDAO.loadSightMarks(training.training.bowId!!)
                         .firstOrNull { it.distance == result.distance!! }
             }
             return result
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt
index 31c04f9f0..a9dd75274 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt
@@ -22,10 +22,10 @@ import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
 import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
-import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.shared.models.db.SightMark
 import de.dreier.mytargets.shared.models.db.StandardRound
 import de.dreier.mytargets.shared.views.TargetViewBase
+import de.dreier.mytargets.utils.addEnd
 import kotlinx.android.parcel.Parcelize
 
 @SuppressLint("ParcelCreator")
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
index 512e60d6c..2adde0518 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
@@ -32,7 +32,6 @@ import de.dreier.mytargets.databinding.ItemTrainingBinding
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.features.training.edit.EditTrainingFragment.Companion.CREATE_FREE_TRAINING_ACTION
 import de.dreier.mytargets.features.training.edit.EditTrainingFragment.Companion.CREATE_TRAINING_WITH_STANDARD_ROUND_ACTION
-import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
 import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.utils.DividerItemDecoration
@@ -152,7 +151,7 @@ open class TrainingsFragment : ExpandableListFragment<Header, Training>() {
     }
 
     override fun deleteItem(item: Training): () -> Training {
-        val training = AugmentedTraining(item)
+        val training = TrainingDAO.loadAugmentedTraining(item.id)
         TrainingDAO.deleteTraining(item)
         return {
             TrainingDAO.insertTraining(training)
@@ -188,9 +187,8 @@ open class TrainingsFragment : ExpandableListFragment<Header, Training>() {
         override fun bindItem(item: Training) {
             binding.training.text = item.title
             binding.trainingDate.text = item.formattedDate
-            binding.gesTraining.text = item.reachedScore
-                    .format(Utils.getCurrentLocale(context!!), SettingsManager
-                            .scoreConfiguration)
+            binding.gesTraining.text = item.score.format(Utils.getCurrentLocale(context!!),
+                    SettingsManager.scoreConfiguration)
         }
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/utils/AugmentedRoundUtils.kt b/app/src/main/java/de/dreier/mytargets/utils/AugmentedRoundUtils.kt
new file mode 100644
index 000000000..6c243b5d8
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/utils/AugmentedRoundUtils.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.utils
+
+import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
+import de.dreier.mytargets.shared.models.augmented.AugmentedRound
+import de.dreier.mytargets.shared.models.dao.EndDAO
+import de.dreier.mytargets.shared.models.db.End
+import de.dreier.mytargets.shared.models.db.Shot
+
+/**
+ * Adds a new end to the internal list of ends, but does not yet save it.
+ *
+ * @return Returns the newly created end
+ */
+fun AugmentedRound.addEnd(): AugmentedEnd {
+    val end = End(index = ends.size, roundId = round.id)
+    val augmentedEnd = AugmentedEnd(end, (0 until round.shotsPerEnd)
+            .map { Shot(it) }.toMutableList(), mutableListOf())
+    EndDAO.saveEnd(augmentedEnd.end, augmentedEnd.images, augmentedEnd.shots)
+    ends.add(augmentedEnd)
+    return augmentedEnd
+}
diff --git a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
index f6e0dcf03..7a8d3714b 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
@@ -24,8 +24,8 @@ import de.dreier.mytargets.shared.models.Environment
 import de.dreier.mytargets.shared.models.TimerSettings
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
-import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
 import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
+import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.dao.TrainingDAO
@@ -34,7 +34,6 @@ import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.utils.unmarshall
 import de.dreier.mytargets.shared.wearable.WearableClientBase
 import org.threeten.bp.LocalDate
-import java.util.*
 
 /**
  * Listens for incoming connections of wearable devices.
@@ -62,9 +61,10 @@ class MobileWearableListener : WearableListenerService() {
     }
 
     private fun trainingTemplate() {
-        val lastTraining = TrainingDAO.loadTrainings().minWith(Collections.reverseOrder())
+        val lastTraining = TrainingDAO.loadTrainings().minWith(compareByDescending(Training::date).thenByDescending(Training::id))
         if (lastTraining != null && lastTraining.date.isEqual(LocalDate.now())) {
-            ApplicationInstance.wearableClient.updateTraining(AugmentedTraining(lastTraining))
+            val training = TrainingDAO.loadAugmentedTraining(lastTraining.id)
+            ApplicationInstance.wearableClient.updateTraining(training)
         } else {
             val training = Training()
             training.title = getString(R.string.training)
@@ -73,7 +73,7 @@ class MobileWearableListener : WearableListenerService() {
             training.bowId = SettingsManager.bow
             training.arrowId = SettingsManager.arrow
             training.arrowNumbering = false
-            val aTraining = AugmentedTraining(training)
+            val aTraining = AugmentedTraining(training, mutableListOf())
 
             val freeTraining = lastTraining?.standardRoundId == null
             if (freeTraining) {
@@ -82,9 +82,9 @@ class MobileWearableListener : WearableListenerService() {
                 round.shotsPerEnd = SettingsManager.shotsPerEnd
                 round.maxEndCount = null
                 round.distance = SettingsManager.distance
-                aTraining.rounds = mutableListOf(AugmentedRound(round))
+                aTraining.rounds = mutableListOf(AugmentedRound(round, mutableListOf()))
             } else {
-                aTraining.initRoundsFromTemplate(AugmentedStandardRound(StandardRoundDAO.loadStandardRound(lastTraining!!.standardRoundId!!)))
+                aTraining.initRoundsFromTemplate(StandardRoundDAO.loadAugmentedStandardRound(lastTraining!!.standardRoundId!!))
             }
             ApplicationInstance.wearableClient.sendTrainingTemplate(aTraining)
         }
@@ -99,15 +99,15 @@ class MobileWearableListener : WearableListenerService() {
 
     private fun endUpdated(messageEvent: MessageEvent) {
         val (end, shots) = messageEvent.data.unmarshall(AugmentedEnd.CREATOR)
-        val round = AugmentedRound(RoundDAO.loadRound(end.roundId!!))
+        val round = RoundDAO.loadAugmentedRound(end.roundId!!)
         val newEnd = getLastEmptyOrCreateNewEnd(round)
         newEnd.end.exact = false
         newEnd.shots = shots
-        newEnd.save()
+        EndDAO.saveEnd(newEnd.end, newEnd.images, newEnd.shots)
 
         ApplicationInstance.wearableClient.sendUpdateTrainingFromRemoteBroadcast(round.round, newEnd.end)
         ApplicationInstance.wearableClient
-                .sendUpdateTrainingFromLocalBroadcast(AugmentedTraining(TrainingDAO.loadTraining(round.round.trainingId!!)))
+                .sendUpdateTrainingFromLocalBroadcast(TrainingDAO.loadAugmentedTraining(round.round.trainingId!!))
     }
 
     private fun getLastEmptyOrCreateNewEnd(round: AugmentedRound): AugmentedEnd {
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/ScoreUtils.kt b/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt
similarity index 98%
rename from shared/src/main/java/de/dreier/mytargets/shared/utils/ScoreUtils.kt
rename to app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt
index 8932d578a..85332e7d7 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/ScoreUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.utils
+package de.dreier.mytargets.utils
 
 import android.support.v4.util.Pair
 import de.dreier.mytargets.shared.models.SelectableZone
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
index 04db6afb0..ff7b84aea 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
@@ -22,11 +22,9 @@ import com.raizlabs.android.dbflow.kotlinextensions.save
 import com.raizlabs.android.dbflow.sql.language.SQLite
 import com.raizlabs.android.dbflow.sql.migration.BaseMigration
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
-import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
-import de.dreier.mytargets.shared.models.db.ArrowImage
-import de.dreier.mytargets.shared.models.db.BowImage
-import de.dreier.mytargets.shared.models.db.EndImage
 import de.dreier.mytargets.shared.models.Image
+import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
+import de.dreier.mytargets.shared.models.db.*
 import de.dreier.mytargets.shared.utils.StandardRoundFactory
 import de.dreier.mytargets.shared.utils.moveTo
 import java.io.File
@@ -38,7 +36,7 @@ object AppDatabase {
     const val NAME = "database"
     const val DATABASE_FILE_NAME = "database.db"
     const val DATABASE_IMPORT_FILE_NAME = "database"
-    const val VERSION = 25
+    const val VERSION = 26
 
     @Migration(version = 0, database = AppDatabase::class)
     class Migration0 : BaseMigration() {
@@ -48,6 +46,57 @@ object AppDatabase {
         }
     }
 
+    @Migration(version = 26, database = AppDatabase::class)
+    class Migration26 : BaseMigration() {
+
+        override fun migrate(database: DatabaseWrapper) {
+            database.execSQL("ALTER TABLE `Training` ADD COLUMN scoreReachedPoints INTEGER;")
+            database.execSQL("ALTER TABLE `Training` ADD COLUMN scoreTotalPoints INTEGER;")
+            database.execSQL("ALTER TABLE `Training` ADD COLUMN scoreShotCount INTEGER;")
+
+            database.execSQL("ALTER TABLE `Round` ADD COLUMN scoreReachedPoints INTEGER;")
+            database.execSQL("ALTER TABLE `Round` ADD COLUMN scoreTotalPoints INTEGER;")
+            database.execSQL("ALTER TABLE `Round` ADD COLUMN scoreShotCount INTEGER;")
+
+            database.execSQL("ALTER TABLE `End` ADD COLUMN scoreReachedPoints INTEGER;")
+            database.execSQL("ALTER TABLE `End` ADD COLUMN scoreTotalPoints INTEGER;")
+            database.execSQL("ALTER TABLE `End` ADD COLUMN scoreShotCount INTEGER;")
+
+            database.execSQL("CREATE TRIGGER round_sum_score " +
+                    "AFTER UPDATE ON `End` " +
+                    "BEGIN " +
+                    "UPDATE `Round` SET " +
+                    "scoreReachedPoints = (SELECT SUM(scoreReachedPoints) FROM `End` WHERE round = NEW.round), " +
+                    "scoreTotalPoints = (SELECT SUM(scoreTotalPoints) FROM `End` WHERE round = NEW.round), " +
+                    "scoreShotCount = (SELECT SUM(scoreShotCount) FROM `End` WHERE round = NEW.round) " +
+                    "WHERE _id = NEW.round;" +
+                    "END;")
+
+            database.execSQL("CREATE TRIGGER training_sum_score " +
+                    "AFTER UPDATE ON `Round` " +
+                    "BEGIN " +
+                    "UPDATE `Training` SET " +
+                    "scoreReachedPoints = (SELECT SUM(scoreReachedPoints) FROM `Round` WHERE training = NEW.training), " +
+                    "scoreTotalPoints = (SELECT SUM(scoreTotalPoints) FROM `Round` WHERE training = NEW.training), " +
+                    "scoreShotCount = (SELECT SUM(scoreShotCount) FROM `Round` WHERE training = NEW.training) " +
+                    "WHERE _id = NEW.training;" +
+                    "END;")
+
+            val rounds = SQLite.select().from(Round::class.java).queryList(database)
+            for (round in rounds) {
+                val target = round.target
+                val ends = SQLite.select().from(End::class.java).where(End_Table.round.eq(round.id))
+                        .queryList(database)
+                for (end in ends) {
+                    val shots = SQLite.select().from(Shot::class.java).where(Shot_Table.end.eq(end.id))
+                            .queryList(database)
+                    end.score = target.getReachedScore(shots)
+                    end.save(database)
+                }
+            }
+        }
+    }
+
     @Migration(version = 22, database = AppDatabase::class)
     class Migration22 : BaseMigration() {
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Score.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Score.kt
index 29119d1ee..de718430e 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Score.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Score.kt
@@ -23,65 +23,65 @@ import java.util.*
 @SuppressLint("ParcelCreator")
 @Parcelize
 data class Score(
-        var reachedScore: Int = 0,
-        var totalScore: Int = 0,
+        var reachedPoints: Int = 0,
+        var totalPoints: Int = 0,
         var shotCount: Int = 0
 ) : Parcelable {
 
     constructor() : this(
-            reachedScore = 0,
-            totalScore = 0,
+            reachedPoints = 0,
+            totalPoints = 0,
             shotCount = 0
     )
 
     constructor(reachedScore: Int, totalScore: Int) : this(
-            reachedScore = reachedScore,
-            totalScore = totalScore,
+            reachedPoints = reachedScore,
+            totalPoints = totalScore,
             shotCount = 1
     )
 
     constructor(totalScore: Int) : this(
-            reachedScore = 0,
-            totalScore = totalScore,
+            reachedPoints = 0,
+            totalPoints = totalScore,
             shotCount = 0
     )
 
     val shotAverage: Float
         get() = if (shotCount == 0) {
             -1f
-        } else reachedScore / shotCount.toFloat()
+        } else reachedPoints / shotCount.toFloat()
 
     /**
      * @return The percent of points reached relative to the total reachable score.
      */
     val percent: Float
-        get() = if (totalScore > 0) {
-            reachedScore / totalScore.toFloat()
+        get() = if (totalPoints > 0) {
+            reachedPoints / totalPoints.toFloat()
         } else 0f
 
     private val percentString: String
-        get() = if (totalScore > 0) "${reachedScore * 100 / totalScore}%" else ""
+        get() = if (totalPoints > 0) "${reachedPoints * 100 / totalPoints}%" else ""
 
     fun add(other: Score): Score {
-        reachedScore += other.reachedScore
-        totalScore += other.totalScore
+        reachedPoints += other.reachedPoints
+        totalPoints += other.totalPoints
         shotCount += other.shotCount
         return this
     }
 
     override fun toString(): String {
-        return "$reachedScore/$totalScore"
+        return "$reachedPoints/$totalPoints"
     }
 
     fun format(locale: Locale, config: Configuration): String {
         if (!config.showReachedScore) {
             return ""
         }
-        var score = reachedScore.toString()
+        var score = reachedPoints.toString()
         if (config.showTotalScore) {
-            score += "/" + totalScore
+            score += "/" + totalPoints
         }
-        if ((config.showPercentage || config.showAverage) && totalScore > 0) {
+        if ((config.showPercentage || config.showAverage) && totalPoints > 0) {
             score += " ("
             if (config.showPercentage) {
                 score += percentString
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/TrainingInfo.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/TrainingInfo.kt
index 9702dea41..9df692db8 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/TrainingInfo.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/TrainingInfo.kt
@@ -43,7 +43,7 @@ data class TrainingInfo(
             context.resources
                     .getQuantityString(R.plurals.rounds, roundCount, roundCount)
         } else {
-            round.reachedScore.toString()
+            round.round.score.toString()
         }
     }
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedEnd.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedEnd.kt
index 03ce7e484..2f57d9d76 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedEnd.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedEnd.kt
@@ -18,7 +18,6 @@ package de.dreier.mytargets.shared.models.augmented
 import android.os.Parcel
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.IIdSettable
-import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.EndImage
 import de.dreier.mytargets.shared.models.db.Shot
@@ -34,12 +33,6 @@ data class AugmentedEnd(
             end.id = value
         }
 
-    constructor(end: End) : this(end, EndDAO.loadShots(end.id).toMutableList(), EndDAO.loadEndImages(end.id).toMutableList())
-
-    fun save() {
-        EndDAO.saveEnd(end, images, shots)
-    }
-
     val isEmpty: Boolean
         get() = shots.any { it.scoringRing == Shot.NOTHING_SELECTED } && images.isEmpty()
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedRound.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedRound.kt
index 0b2c3f5a7..00cfeede4 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedRound.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedRound.kt
@@ -17,40 +17,12 @@ package de.dreier.mytargets.shared.models.augmented
 
 import android.os.Parcel
 import android.os.Parcelable
-import de.dreier.mytargets.shared.models.Score
-import de.dreier.mytargets.shared.models.dao.RoundDAO
-import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
-import de.dreier.mytargets.shared.models.db.Shot
-import de.dreier.mytargets.shared.models.sum
 
 data class AugmentedRound(
         val round: Round,
         var ends: MutableList<AugmentedEnd>
 ) : Parcelable {
-    constructor(round: Round) : this(round, RoundDAO.loadEnds(round.id)
-            .map { AugmentedEnd(it) }
-            .toMutableList())
-
-    val reachedScore: Score
-        get() {
-            val target = round.target
-            return ends.map { target.getReachedScore(it.shots) }.sum()
-        }
-
-    /**
-     * Adds a new end to the internal list of ends, but does not yet save it.
-     *
-     * @return Returns the newly created end
-     */
-    fun addEnd(): AugmentedEnd {
-        val end = End(index = ends.size, roundId = round.id)
-        val augmentedEnd = AugmentedEnd(end, (0 until round.shotsPerEnd)
-                .map { Shot(it) }.toMutableList(), mutableListOf())
-        augmentedEnd.save()
-        ends.add(augmentedEnd)
-        return augmentedEnd
-    }
 
     constructor(source: Parcel) : this(
             source.readParcelable<Round>(Round::class.java.classLoader),
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedStandardRound.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedStandardRound.kt
index 225c4980a..cb456de6a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedStandardRound.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedStandardRound.kt
@@ -22,6 +22,7 @@ import android.os.Parcelable
 import de.dreier.mytargets.shared.R
 import de.dreier.mytargets.shared.models.IIdProvider
 import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
+import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.StandardRound
 import de.dreier.mytargets.shared.targets.drawable.CombinedSpot
@@ -54,6 +55,16 @@ data class AugmentedStandardRound(
         return desc
     }
 
+    fun createRoundsFromTemplate(): MutableList<Round> {
+        val rounds = mutableListOf<Round>()
+        for (template in roundTemplates) {
+            val round = Round(template)
+            round.target = template.targetTemplate
+            rounds.add(round)
+        }
+        return rounds
+    }
+
     constructor(source: Parcel) : this(
             source.readParcelable<StandardRound>(StandardRound::class.java.classLoader),
             source.createTypedArrayList(RoundTemplate.CREATOR)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
index ecb9e3cd7..1817867c8 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
@@ -17,27 +17,15 @@ package de.dreier.mytargets.shared.models.augmented
 
 import android.os.Parcel
 import android.os.Parcelable
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
-import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 
 data class AugmentedTraining(
         val training: Training,
         var rounds: MutableList<AugmentedRound>
 ) : Parcelable {
-    constructor(training: Training) : this(training, TrainingDAO.loadRounds(training.id)
-            .map { AugmentedRound(it) }
-            .toMutableList())
 
     fun initRoundsFromTemplate(standardRound: AugmentedStandardRound) {
-        rounds = mutableListOf()
-        for (template in standardRound.roundTemplates) {
-            val round = AugmentedRound(Round(template))
-            round.round.trainingId = training.id
-            round.round.target = template.targetTemplate
-            round.round.comment = ""
-            rounds.add(round)
-        }
+        rounds = standardRound.createRoundsFromTemplate().map { AugmentedRound(it, mutableListOf()) }.toMutableList()
     }
 
     constructor(source: Parcel) : this(
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
index b8457a118..6cd6fbddd 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
@@ -23,7 +23,6 @@ import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 import de.dreier.mytargets.shared.models.db.*
-import org.threeten.bp.LocalTime
 
 object EndDAO {
     fun loadEnds(): List<End> = SQLite.select().from(End::class.java).queryList()
@@ -33,7 +32,7 @@ object EndDAO {
             .where(End_Table.round.eq(roundId))
             .orderBy(End_Table.index, true)
             .queryList()
-            .map { AugmentedEnd(it) }
+            .map { AugmentedEnd(it, loadShots(it.id).toMutableList(), loadEndImages(it.id).toMutableList()) }
             .toMutableList()
 
     fun loadEnd(id: Long): End = SQLite.select()
@@ -61,9 +60,6 @@ object EndDAO {
     }
 
     fun saveEnd(end: End, images: List<EndImage>, shots: List<Shot>) {
-        if (end.saveTime == null) {
-            end.saveTime = LocalTime.now()
-        }
         FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
             saveEnd(end, db, images, shots)
         }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/RoundDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/RoundDAO.kt
index 78d15c021..1c916f79a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/RoundDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/RoundDAO.kt
@@ -38,6 +38,10 @@ object RoundDAO {
             .where(Round_Table._id.eq(id))
             .querySingle() ?: throw IllegalStateException("Round $id does not exist")
 
+    fun loadAugmentedRound(id: Long) = AugmentedRound(loadRound(id), EndDAO.loadAugmentedEnds(id))
+
+    fun loadAugmentedRound(round: Round) = AugmentedRound(round, EndDAO.loadAugmentedEnds(round.id))
+
     fun loadRoundOrNull(id: Long): Round? = SQLite.select()
             .from(Round::class.java)
             .where(Round_Table._id.eq(id))
@@ -91,8 +95,6 @@ object RoundDAO {
         }
     }
 
-    fun loadAugmentedRound(item: Round) = AugmentedRound(item)
-
     fun saveRound(round: AugmentedRound) {
         FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
             round.round.save(db)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/StandardRoundDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/StandardRoundDAO.kt
index 010d6224e..f86f68a6a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/StandardRoundDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/StandardRoundDAO.kt
@@ -21,6 +21,7 @@ import com.raizlabs.android.dbflow.kotlinextensions.save
 import com.raizlabs.android.dbflow.sql.language.SQLite
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
 import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.RoundTemplate_Table
 import de.dreier.mytargets.shared.models.db.StandardRound
@@ -34,6 +35,8 @@ object StandardRoundDAO {
             .where(StandardRound_Table._id.eq(id))
             .querySingle() ?: throw IllegalStateException("StandardRound $id does not exist")
 
+    fun loadAugmentedStandardRound(id: Long): AugmentedStandardRound = AugmentedStandardRound(loadStandardRound(id), loadRoundTemplates(id))
+
     fun loadStandardRoundOrNull(id: Long): StandardRound? = SQLite.select()
             .from(StandardRound::class.java)
             .where(StandardRound_Table._id.eq(id))
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/TrainingDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/TrainingDAO.kt
index 0be20b9c4..7a4c9e105 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/TrainingDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/TrainingDAO.kt
@@ -16,15 +16,13 @@
 package de.dreier.mytargets.shared.models.dao
 
 import com.raizlabs.android.dbflow.config.FlowManager
+import com.raizlabs.android.dbflow.kotlinextensions.delete
 import com.raizlabs.android.dbflow.kotlinextensions.save
 import com.raizlabs.android.dbflow.sql.language.SQLite
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
-import de.dreier.mytargets.shared.models.db.Round
-import de.dreier.mytargets.shared.models.db.Round_Table
-import de.dreier.mytargets.shared.models.db.Training
-import de.dreier.mytargets.shared.models.db.Training_Table
+import de.dreier.mytargets.shared.models.db.*
 
 object TrainingDAO {
     fun loadTrainings(): List<Training> = SQLite.select()
@@ -41,6 +39,10 @@ object TrainingDAO {
             .where(Training_Table._id.eq(id))
             .querySingle() ?: throw IllegalStateException("Training $id does not exist")
 
+    fun loadAugmentedTraining(id: Long): AugmentedTraining = AugmentedTraining(loadTraining(id), loadRounds(id)
+            .map { RoundDAO.loadAugmentedRound(it) }
+            .toMutableList())
+
     fun loadTrainingOrNull(id: Long): Training? = SQLite.select()
             .from(Training::class.java)
             .where(Training_Table._id.eq(id))
@@ -58,17 +60,11 @@ object TrainingDAO {
 
     fun saveTraining(training: Training, rounds: List<Round>) {
         FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            saveTraining(training, db, rounds)
+            saveTraining(db, training, rounds)
         }
     }
 
-    fun insertTraining(training: Training, rounds: List<Round>) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            saveTraining(training, db, rounds)
-        }
-    }
-
-    private fun saveTraining(training: Training, db: DatabaseWrapper, rounds: List<Round>) {
+    private fun saveTraining(db: DatabaseWrapper, training: Training, rounds: List<Round>) {
         training.save(db)
 //        SQLite.delete(Round::class.java)
 //                .where(Round_Table.training.eq(training.id))
@@ -79,25 +75,51 @@ object TrainingDAO {
         }
     }
 
-    fun deleteTraining(training: Training) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            training.delete(db)
-        }
-    }
-
     fun insertTraining(training: AugmentedTraining) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db->
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
             training.training.save(db)
             training.rounds.forEach { round ->
                 round.round.trainingId = training.training.id
-                round.save(db)
+                round.round.save(db)
                 for (end in round.ends) {
                     end.end.roundId = round.round.id
-                    end.save(db)
+                    end.end.save(db)
                 }
             }
         }
     }
 
-    fun loadAugmentedTraining(item: Training) = AugmentedTraining(item)
+    fun deleteTraining(training: Training) {
+        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
+            training.delete(db)
+        }
+    }
+
+    fun getOrCreateArcherSignature(training: Training): Signature {
+        if (training.archerSignatureId != null) {
+            val signature = SignatureDAO.loadSignatureOrNull(training.archerSignatureId!!)
+            if (signature != null) {
+                return signature
+            }
+        }
+        val signature = Signature()
+        SignatureDAO.saveSignature(signature)
+        training.archerSignatureId = signature.id
+        TrainingDAO.saveTraining(training)
+        return signature
+    }
+
+    fun getOrCreateWitnessSignature(training: Training): Signature {
+        if (training.witnessSignatureId != null) {
+            val signature = SignatureDAO.loadSignatureOrNull(training.witnessSignatureId!!)
+            if (signature != null) {
+                return signature
+            }
+        }
+        val signature = Signature()
+        SignatureDAO.saveSignature(signature)
+        training.witnessSignatureId = signature.id
+        TrainingDAO.saveTraining(training)
+        return signature
+    }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
index 04ef6a7a9..224d05b30 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
@@ -20,6 +20,7 @@ import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.*
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.IIdSettable
+import de.dreier.mytargets.shared.models.Score
 import de.dreier.mytargets.shared.utils.typeconverters.LocalTimeConverter
 import kotlinx.android.parcel.Parcelize
 import org.threeten.bp.LocalTime
@@ -46,5 +47,24 @@ data class End(
         var saveTime: LocalTime? = null,
 
         @Column
-        var comment: String = ""
-) : IIdSettable, Parcelable
+        var comment: String = "",
+
+        @Column
+        var scoreReachedPoints: Int = 0,
+
+        @Column
+        var scoreTotalPoints: Int = 0,
+
+        @Column
+        var scoreShotCount: Int = 0
+) : IIdSettable, Parcelable {
+
+    var score: Score
+        get() = Score(scoreReachedPoints, scoreTotalPoints, scoreShotCount)
+        set(value) {
+            scoreReachedPoints = value.reachedPoints
+            scoreTotalPoints = value.totalPoints
+            scoreShotCount = value.shotCount
+        }
+
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
index 0e6ae802c..c72a71c1c 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
@@ -19,10 +19,10 @@ import android.annotation.SuppressLint
 import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.*
 import de.dreier.mytargets.shared.AppDatabase
-import de.dreier.mytargets.shared.models.*
+import de.dreier.mytargets.shared.models.Dimension
+import de.dreier.mytargets.shared.models.IIdSettable
+import de.dreier.mytargets.shared.models.Score
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.shared.models.dao.EndDAO
-import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.utils.typeconverters.DimensionConverter
 import kotlinx.android.parcel.Parcelize
 
@@ -59,7 +59,16 @@ data class Round(
         var targetScoringStyle: Int = 0,
 
         @Column(typeConverter = DimensionConverter::class)
-        var targetDiameter: Dimension = Dimension.UNKNOWN
+        var targetDiameter: Dimension = Dimension.UNKNOWN,
+
+        @Column
+        var scoreReachedPoints: Int = 0,
+
+        @Column
+        var scoreTotalPoints: Int = 0,
+
+        @Column
+        var scoreShotCount: Int = 0
 ) : IIdSettable, Parcelable {
 
     constructor(info: RoundTemplate) : this(
@@ -80,10 +89,6 @@ data class Round(
             targetDiameter = targetTemplate.diameter
         }
 
-    val reachedScore: Score
-        get() {
-            val target = target
-            return RoundDAO.loadEnds(id).map { end: End -> target.getReachedScore(EndDAO.loadShots(end.id)) }
-                    .sum()
-        }
+    val score: Score
+        get() = Score(scoreReachedPoints, scoreTotalPoints, scoreShotCount)
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
index 93534bbd5..22b03603d 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
@@ -18,11 +18,11 @@ package de.dreier.mytargets.shared.models.db
 import android.annotation.SuppressLint
 import android.os.Parcelable
 import com.raizlabs.android.dbflow.annotation.*
-import com.raizlabs.android.dbflow.structure.BaseModel
 import de.dreier.mytargets.shared.AppDatabase
-import de.dreier.mytargets.shared.models.*
-import de.dreier.mytargets.shared.models.dao.SignatureDAO
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
+import de.dreier.mytargets.shared.models.EWeather
+import de.dreier.mytargets.shared.models.Environment
+import de.dreier.mytargets.shared.models.IIdSettable
+import de.dreier.mytargets.shared.models.Score
 import de.dreier.mytargets.shared.utils.typeconverters.EWeatherConverter
 import de.dreier.mytargets.shared.utils.typeconverters.LocalDateConverter
 import kotlinx.android.parcel.Parcelize
@@ -79,8 +79,18 @@ data class Training(
         var archerSignatureId: Long? = null,
 
         @ForeignKey(tableClass = Signature::class, references = [(ForeignKeyReference(columnName = "witnessSignature", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.SET_NULL)
-        var witnessSignatureId: Long? = null
-) : BaseModel(), IIdSettable, Parcelable {
+        var witnessSignatureId: Long? = null,
+
+        @Column
+        var scoreReachedPoints: Int = 0,
+
+        @Column
+        var scoreTotalPoints: Int = 0,
+
+        @Column
+        var scoreShotCount: Int = 0
+
+) : IIdSettable, Parcelable {
 
     var environment: Environment
         get() = Environment(indoor, weather, windSpeed, windDirection, location)
@@ -92,41 +102,9 @@ data class Training(
             location = env.location
         }
 
-    val orCreateArcherSignature: Signature
-        get() {
-            if (archerSignatureId != null) {
-                val signature = SignatureDAO.loadSignatureOrNull(archerSignatureId!!)
-                if (signature != null) {
-                    return signature
-                }
-            }
-            val signature = Signature()
-            SignatureDAO.saveSignature(signature)
-            archerSignatureId = signature.id
-            TrainingDAO.saveTraining(this)
-            return signature
-        }
-
-    val orCreateWitnessSignature: Signature
-        get() {
-            if (witnessSignatureId != null) {
-                val signature = SignatureDAO.loadSignatureOrNull(witnessSignatureId!!)
-                if (signature != null) {
-                    return signature
-                }
-            }
-            val signature = Signature()
-            SignatureDAO.saveSignature(signature)
-            witnessSignatureId = signature.id
-            TrainingDAO.saveTraining(this)
-            return signature
-        }
-
     val formattedDate: String
         get() = date.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM))
 
-    val reachedScore: Score
-        get() = TrainingDAO.loadRounds(id)
-                .map { it.reachedScore }
-                .sum()
+    val score: Score
+        get() = Score(scoreReachedPoints, scoreTotalPoints, scoreShotCount)
 }
diff --git a/shared/src/test/java/de/dreier/mytargets/shared/models/ScoreTest.kt b/shared/src/test/java/de/dreier/mytargets/shared/models/ScoreTest.kt
index 9fcf51557..f2ee863db 100644
--- a/shared/src/test/java/de/dreier/mytargets/shared/models/ScoreTest.kt
+++ b/shared/src/test/java/de/dreier/mytargets/shared/models/ScoreTest.kt
@@ -25,8 +25,8 @@ class ScoreTest {
     @Throws(Exception::class)
     fun zeroShots() {
         val s = Score(10)
-        assertEquals(0, s.reachedScore)
-        assertEquals(10, s.totalScore)
+        assertEquals(0, s.reachedPoints)
+        assertEquals(10, s.totalPoints)
         assertEquals(0, s.shotCount)
     }
 
@@ -34,8 +34,8 @@ class ScoreTest {
     @Throws(Exception::class)
     fun singleShot() {
         val s = Score(9, 10)
-        assertEquals(9, s.reachedScore)
-        assertEquals(10, s.totalScore)
+        assertEquals(9, s.reachedPoints)
+        assertEquals(10, s.totalPoints)
         assertEquals(1, s.shotCount)
     }
 
@@ -44,8 +44,8 @@ class ScoreTest {
     fun add() {
         val s = Score(9, 10)
         s.add(Score(8, 10))
-        assertEquals(17, s.reachedScore)
-        assertEquals(20, s.totalScore)
+        assertEquals(17, s.reachedPoints)
+        assertEquals(20, s.totalPoints)
         assertEquals(2, s.shotCount)
     }
 

From b774815b89d79287cbfeeaf8b9acfff92225e81c Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Mon, 15 Jan 2018 19:10:05 +0100
Subject: [PATCH 036/102] Removed TargetOvalBase and dependsOnArrowIndex

---
 .../features/settings/SettingsManager.kt      |  5 ++-
 .../de/dreier/mytargets/utils/ScoreUtils.kt   | 25 +++++------
 .../de/dreier/mytargets/shared/AppDatabase.kt |  4 +-
 .../mytargets/shared/models/dao/EndDAO.kt     |  1 +
 .../shared/targets/TargetOvalBase.kt          | 41 -------------------
 .../shared/targets/models/IFAAAnimal.kt       |  5 ++-
 .../shared/targets/models/NFAAAnimal.kt       |  5 ++-
 .../shared/targets/models/NFASField.kt        |  5 ++-
 .../shared/targets/models/TargetModelBase.kt  |  4 --
 .../mytargets/shared/views/TargetViewBase.kt  |  3 +-
 10 files changed, 32 insertions(+), 66 deletions(-)
 delete mode 100644 shared/src/main/java/de/dreier/mytargets/shared/targets/TargetOvalBase.kt

diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt
index 8a9a34c58..c46ad124b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt
@@ -31,6 +31,7 @@ import de.dreier.mytargets.shared.models.Dimension.Unit.CENTIMETER
 import de.dreier.mytargets.shared.models.Score
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.TimerSettings
+import de.dreier.mytargets.shared.targets.scoringstyle.ArrowAwareScoringStyle
 import de.dreier.mytargets.shared.utils.map
 import de.dreier.mytargets.shared.utils.toSparseArray
 import de.dreier.mytargets.shared.views.TargetViewBase
@@ -359,6 +360,8 @@ object SettingsManager {
         set(value) = preferences.set(KEY_INTRO_SHOWED, value)
 
     fun shouldSortTarget(target: Target): Boolean {
-        return preferences.getBoolean(KEY_OVERVIEW_SHOT_SORTING, true) && (target.model.faceCount == 1 || preferences.getBoolean(KEY_OVERVIEW_SHOT_SORTING_SPOT, false))
+        return preferences.getBoolean(KEY_OVERVIEW_SHOT_SORTING, true)
+                && (target.model.faceCount == 1 || preferences.getBoolean(KEY_OVERVIEW_SHOT_SORTING_SPOT, false))
+                && target.getScoringStyle() !is ArrowAwareScoringStyle
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt b/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt
index 85332e7d7..e6afccba9 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt
@@ -22,6 +22,7 @@ import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
+import de.dreier.mytargets.shared.targets.scoringstyle.ArrowAwareScoringStyle
 import java.util.*
 
 object ScoreUtils {
@@ -55,18 +56,18 @@ object ScoreUtils {
         rounds.flatMap { RoundDAO.loadEnds(it.id) }
                 .forEach {
                     EndDAO.loadShots(it.id).forEach { s ->
-                                if (s.scoringRing != Shot.NOTHING_SELECTED) {
-                                    val tuple = SelectableZone(s.scoringRing,
-                                            t.model.getZone(s.scoringRing),
-                                            t.zoneToString(s.scoringRing, s.index),
-                                            t.getScoreByZone(s.scoringRing, s.index))
-                                    val integer = scoreCount[tuple]
-                                    if (integer != null) {
-                                        val count = integer + 1
-                                        scoreCount[tuple] = count
-                                    }
-                                }
+                        if (s.scoringRing != Shot.NOTHING_SELECTED) {
+                            val tuple = SelectableZone(s.scoringRing,
+                                    t.model.getZone(s.scoringRing),
+                                    t.zoneToString(s.scoringRing, s.index),
+                                    t.getScoreByZone(s.scoringRing, s.index))
+                            val integer = scoreCount[tuple]
+                            if (integer != null) {
+                                val count = integer + 1
+                                scoreCount[tuple] = count
                             }
+                        }
+                    }
                 }
         return scoreCount
     }
@@ -78,7 +79,7 @@ object ScoreUtils {
             for (selectableZone in zoneList) {
                 scoreCount[selectableZone] = 0
             }
-            if (!t.model.dependsOnArrowIndex()) {
+            if (t.getScoringStyle() !is ArrowAwareScoringStyle) {
                 break
             }
         }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
index ff7b84aea..5d3b38271 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
@@ -88,7 +88,9 @@ object AppDatabase {
                 val ends = SQLite.select().from(End::class.java).where(End_Table.round.eq(round.id))
                         .queryList(database)
                 for (end in ends) {
-                    val shots = SQLite.select().from(Shot::class.java).where(Shot_Table.end.eq(end.id))
+                    val shots = SQLite.select().from(Shot::class.java)
+                            .where(Shot_Table.end.eq(end.id))
+                            .orderBy(Shot_Table.index, true)
                             .queryList(database)
                     end.score = target.getReachedScore(shots)
                     end.save(database)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
index 6cd6fbddd..71fca84f6 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
@@ -53,6 +53,7 @@ object EndDAO {
     fun loadShots(id: Long): MutableList<Shot> = SQLite.select()
             .from(Shot::class.java)
             .where(Shot_Table.end.eq(id))
+            .orderBy(Shot_Table.index, true)
             .queryList().toMutableList()
 
     fun saveEnd(end: End) {
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/TargetOvalBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/TargetOvalBase.kt
deleted file mode 100644
index 6bed412b0..000000000
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/TargetOvalBase.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2018 Florian Dreier
- *
- * This file is part of MyTargets.
- *
- * MyTargets is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * MyTargets is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-package de.dreier.mytargets.shared.targets
-
-import android.support.annotation.StringRes
-import de.dreier.mytargets.shared.models.Diameter
-import de.dreier.mytargets.shared.models.ETargetType
-import de.dreier.mytargets.shared.targets.models.TargetModelBase
-import de.dreier.mytargets.shared.targets.scoringstyle.ScoringStyle
-import de.dreier.mytargets.shared.targets.zone.ZoneBase
-
-open class TargetOvalBase protected constructor(
-        id: Long,
-        @StringRes nameRes: Int,
-        type: ETargetType,
-        zones: Array<ZoneBase>,
-        scoringStyles: Array<ScoringStyle>
-) : TargetModelBase(
-        id = id,
-        nameRes = nameRes,
-        diameters = arrayOf(Diameter.SMALL, Diameter.MEDIUM, Diameter.LARGE, Diameter.XLARGE),
-        type = type,
-        zones = zones,
-        scoringStyles = scoringStyles
-) {
-    override fun dependsOnArrowIndex(): Boolean {
-        return true
-    }
-}
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IFAAAnimal.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IFAAAnimal.kt
index 10485057f..12d5f9917 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IFAAAnimal.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IFAAAnimal.kt
@@ -15,8 +15,8 @@
 package de.dreier.mytargets.shared.targets.models
 
 import de.dreier.mytargets.shared.R
+import de.dreier.mytargets.shared.models.Diameter
 import de.dreier.mytargets.shared.models.ETargetType
-import de.dreier.mytargets.shared.targets.TargetOvalBase
 import de.dreier.mytargets.shared.targets.scoringstyle.ArrowAwareScoringStyle
 import de.dreier.mytargets.shared.targets.zone.CircularZone
 import de.dreier.mytargets.shared.targets.zone.EllipseZone
@@ -25,9 +25,10 @@ import de.dreier.mytargets.shared.utils.Color.GRAY
 import de.dreier.mytargets.shared.utils.Color.LIGHTER_GRAY
 import de.dreier.mytargets.shared.utils.Color.ORANGE
 
-class IFAAAnimal : TargetOvalBase(
+class IFAAAnimal : TargetModelBase(
         id = ID,
         nameRes = R.string.ifaa_animal,
+        diameters = arrayOf(Diameter.SMALL, Diameter.MEDIUM, Diameter.LARGE, Diameter.XLARGE),
         zones = arrayOf(
                 EllipseZone(1.0f, 0.0f, 0.0f, ORANGE, BLACK, 4),
                 CircularZone(1.0f, LIGHTER_GRAY, GRAY, 3)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAAnimal.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAAnimal.kt
index 8a18cc920..55901f132 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAAnimal.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAAnimal.kt
@@ -15,8 +15,8 @@
 package de.dreier.mytargets.shared.targets.models
 
 import de.dreier.mytargets.shared.R
+import de.dreier.mytargets.shared.models.Diameter
 import de.dreier.mytargets.shared.models.ETargetType
-import de.dreier.mytargets.shared.targets.TargetOvalBase
 import de.dreier.mytargets.shared.targets.scoringstyle.ArrowAwareScoringStyle
 import de.dreier.mytargets.shared.targets.scoringstyle.ScoringStyle
 import de.dreier.mytargets.shared.targets.zone.CircularZone
@@ -27,9 +27,10 @@ import de.dreier.mytargets.shared.utils.Color.LIGHTER_GRAY
 import de.dreier.mytargets.shared.utils.Color.ORANGE
 import de.dreier.mytargets.shared.utils.Color.TURBO_YELLOW
 
-class NFAAAnimal : TargetOvalBase(
+class NFAAAnimal : TargetModelBase(
         id = ID,
         nameRes = R.string.nfaa_animal,
+        diameters = arrayOf(Diameter.SMALL, Diameter.MEDIUM, Diameter.LARGE, Diameter.XLARGE),
         zones = arrayOf(
                 CircularZone(0.162f, TURBO_YELLOW, BLACK, 5),
                 EllipseZone(1.0f, 0.0f, 0.0f, ORANGE, BLACK, 4),
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFASField.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFASField.kt
index 2f069dd30..183752e8a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFASField.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFASField.kt
@@ -15,8 +15,8 @@
 package de.dreier.mytargets.shared.targets.models
 
 import de.dreier.mytargets.shared.R
+import de.dreier.mytargets.shared.models.Diameter
 import de.dreier.mytargets.shared.models.ETargetType
-import de.dreier.mytargets.shared.targets.TargetOvalBase
 import de.dreier.mytargets.shared.targets.scoringstyle.ArrowAwareScoringStyle
 import de.dreier.mytargets.shared.targets.zone.CircularZone
 import de.dreier.mytargets.shared.targets.zone.EllipseZone
@@ -26,9 +26,10 @@ import de.dreier.mytargets.shared.utils.Color.LIGHTER_GRAY
 import de.dreier.mytargets.shared.utils.Color.ORANGE
 import de.dreier.mytargets.shared.utils.Color.TURBO_YELLOW
 
-class NFASField : TargetOvalBase(
+class NFASField : TargetModelBase(
         id = ID,
         nameRes = R.string.nfas_field,
+        diameters = arrayOf(Diameter.SMALL, Diameter.MEDIUM, Diameter.LARGE, Diameter.XLARGE),
         zones = arrayOf(
                 CircularZone(0.162f, TURBO_YELLOW, BLACK, 5),
                 EllipseZone(1f, 0f, 0f, ORANGE, BLACK, 4),
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/TargetModelBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/TargetModelBase.kt
index c60c97510..87fef0005 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/TargetModelBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/TargetModelBase.kt
@@ -83,10 +83,6 @@ open class TargetModelBase protected constructor(
         return scoringStyles[scoringStyle]
     }
 
-    open fun dependsOnArrowIndex(): Boolean {
-        return false
-    }
-
     open fun shouldDrawZone(zone: Int, scoringStyle: Int): Boolean {
         return true
     }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt
index 69f00aaca..cdc64f13f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt
@@ -45,6 +45,7 @@ import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.targets.drawable.TargetImpactAggregationDrawable
 import de.dreier.mytargets.shared.targets.models.WAFull
+import de.dreier.mytargets.shared.targets.scoringstyle.ArrowAwareScoringStyle
 import de.dreier.mytargets.shared.utils.EndRenderer
 import de.dreier.mytargets.shared.utils.RectUtils
 import java.util.*
@@ -60,7 +61,7 @@ abstract class TargetViewBase : View, View.OnTouchListener {
     protected var currentShotIndex: Int = 0
         set(currentArrow) {
             field = currentArrow
-            if (target.model.dependsOnArrowIndex()) {
+            if (target.getScoringStyle() is ArrowAwareScoringStyle) {
                 updateSelectableZones()
             }
         }

From 8a9106dc5b358ccf2c13e169703cb3a1fac40c66 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Mon, 15 Jan 2018 19:25:54 +0100
Subject: [PATCH 037/102] Converted shared instumented unit tests to Kotlin

---
 .idea/dictionaries/florian.xml                |   1 +
 .../mytargets/shared/models/db/ShotTest.java  |  52 ---------
 .../mytargets/shared/models/db/ShotTest.kt    |  42 ++++++++
 .../models/{DAIR3DTest.java => DAIR3DTest.kt} |  35 +++---
 .../targets/models/TargetModelBaseTest.java   |  85 ---------------
 .../targets/models/TargetModelBaseTest.kt     | 102 ++++++++++++++++++
 .../models/{WAFullTest.java => WAFullTest.kt} |  39 +++----
 .../targets/models/WAVertical3SpotTest.java   |  49 ---------
 .../targets/models/WAVertical3SpotTest.kt     |  53 +++++++++
 .../shared/SharedApplicationInstance.kt       |   2 +-
 .../targets/scoringstyle/ScoringStyle.kt      |  11 +-
 11 files changed, 246 insertions(+), 225 deletions(-)
 delete mode 100644 shared/src/androidTest/java/de/dreier/mytargets/shared/models/db/ShotTest.java
 create mode 100644 shared/src/androidTest/java/de/dreier/mytargets/shared/models/db/ShotTest.kt
 rename shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/{DAIR3DTest.java => DAIR3DTest.kt} (52%)
 delete mode 100644 shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.java
 create mode 100644 shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.kt
 rename shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/{WAFullTest.java => WAFullTest.kt} (50%)
 delete mode 100644 shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAVertical3SpotTest.java
 create mode 100644 shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAVertical3SpotTest.kt

diff --git a/.idea/dictionaries/florian.xml b/.idea/dictionaries/florian.xml
index 7265654c4..a0f99c8c6 100644
--- a/.idea/dictionaries/florian.xml
+++ b/.idea/dictionaries/florian.xml
@@ -33,6 +33,7 @@
       <w>speeddial</w>
       <w>sqlite</w>
       <w>unmarshall</w>
+      <w>unmarshalled</w>
       <w>yumi</w>
     </words>
   </dictionary>
diff --git a/shared/src/androidTest/java/de/dreier/mytargets/shared/models/db/ShotTest.java b/shared/src/androidTest/java/de/dreier/mytargets/shared/models/db/ShotTest.java
deleted file mode 100644
index d43c9b384..000000000
--- a/shared/src/androidTest/java/de/dreier/mytargets/shared/models/db/ShotTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2018 Florian Dreier
- *
- * This file is part of MyTargets.
- *
- * MyTargets is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * MyTargets is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-package de.dreier.mytargets.shared.models.db;
-
-import android.support.annotation.NonNull;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import de.dreier.mytargets.shared.streamwrapper.Stream;
-
-public class ShotTest {
-
-    @Test
-    public void testCompareTo() throws Exception {
-        Assert.assertEquals("0,1,-1,-2",
-                toSortedShotList(Shot.Companion.getNOTHING_SELECTED(), Shot.Companion.getMISS(), 0, 1));
-        Assert.assertEquals("0,2,-1,-2",
-                toSortedShotList(0, 2, Shot.Companion.getMISS(), Shot.Companion
-                        .getNOTHING_SELECTED()));
-    }
-
-    private String toSortedShotList(@NonNull int... zones) {
-        List<Shot> shots = new ArrayList<>(zones.length);
-        for (int i = 0; i < zones.length; i++) {
-            shots.add(new Shot(i));
-            shots.get(i).setScoringRing(zones[i]);
-        }
-        Collections.sort(shots);
-        return Stream.of(shots)
-                .map(s -> String.valueOf(s.getScoringRing()))
-                .joinToString(",");
-    }
-}
diff --git a/shared/src/androidTest/java/de/dreier/mytargets/shared/models/db/ShotTest.kt b/shared/src/androidTest/java/de/dreier/mytargets/shared/models/db/ShotTest.kt
new file mode 100644
index 000000000..7ed24c186
--- /dev/null
+++ b/shared/src/androidTest/java/de/dreier/mytargets/shared/models/db/ShotTest.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.shared.models.db
+
+import junit.framework.Assert
+import org.junit.Test
+import java.util.*
+
+class ShotTest {
+
+    @Test
+    @Throws(Exception::class)
+    fun testCompareTo() {
+        Assert.assertEquals("0,1,-1,-2",
+                toSortedShotList(Shot.NOTHING_SELECTED, Shot.MISS, 0, 1))
+        Assert.assertEquals("0,2,-1,-2",
+                toSortedShotList(0, 2, Shot.MISS, Shot.NOTHING_SELECTED))
+    }
+
+    private fun toSortedShotList(vararg zones: Int): String {
+        val shots = ArrayList<Shot>(zones.size)
+        for (i in zones.indices) {
+            shots.add(Shot(i))
+            shots[i].scoringRing = zones[i]
+        }
+        shots.sort()
+        return shots.joinToString(",") { it.scoringRing.toString() }
+    }
+}
diff --git a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/DAIR3DTest.java b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/DAIR3DTest.kt
similarity index 52%
rename from shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/DAIR3DTest.java
rename to shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/DAIR3DTest.kt
index 05b7524ce..ec84ce659 100644
--- a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/DAIR3DTest.java
+++ b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/DAIR3DTest.kt
@@ -13,31 +13,34 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.targets.models;
+package de.dreier.mytargets.shared.targets.models
 
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import android.support.test.InstrumentationRegistry
+import android.support.test.filters.SmallTest
+import android.support.test.runner.AndroidJUnit4
+import de.dreier.mytargets.shared.SharedApplicationInstance
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
 
 @SmallTest
-@RunWith(AndroidJUnit4.class)
-public class DAIR3DTest {
+@RunWith(AndroidJUnit4::class)
+class DAIR3DTest {
 
-    private DAIR3D target;
+    private var target = DAIR3D()
 
     @Before
-    public void setUp() throws Exception {
-        target = new DAIR3D();
+    @Throws(Exception::class)
+    fun setUp() {
+        SharedApplicationInstance.context = InstrumentationRegistry.getContext()
     }
 
     @Test
-    public void testScoringStyle() {
-        Assert.assertEquals(8, target.getScoringStyle(0).getPointsByScoringRing(0, 0));
-        Assert.assertEquals(12, target.getScoringStyle(0).getPointsByScoringRing(2, 0));
-        Assert.assertEquals(14, target.getScoringStyle(1).getPointsByScoringRing(1, 0));
+    fun testScoringStyle() {
+        Assert.assertEquals(8, target.getScoringStyle(0).getPointsByScoringRing(0, 0).toLong())
+        Assert.assertEquals(12, target.getScoringStyle(0).getPointsByScoringRing(2, 0).toLong())
+        Assert.assertEquals(14, target.getScoringStyle(1).getPointsByScoringRing(1, 0).toLong())
     }
 }
diff --git a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.java b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.java
deleted file mode 100644
index 3345cde2f..000000000
--- a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2018 Florian Dreier
- *
- * This file is part of MyTargets.
- *
- * MyTargets is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * MyTargets is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-package de.dreier.mytargets.shared.targets.models;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import de.dreier.mytargets.shared.models.Dimension;
-import de.dreier.mytargets.shared.targets.TargetFactory;
-
-public class TargetModelBaseTest {
-    @Test
-    public void trivialTargetRealSize() throws Exception {
-        for (int id = NFAAField.Companion.getID(); id <= WAField3Spot.Companion.getID(); id++) {
-            TargetModelBase target = TargetFactory.INSTANCE.getTarget(id);
-            final Dimension diameter = new Dimension(40, Dimension.Unit.CENTIMETER);
-            Dimension realSize = target.getRealSize(diameter);
-            Assert.assertEquals("Real size " + realSize.toString() + " for target id " +
-                            id + " does not match with expected value 40cm",
-                    realSize, new Dimension(40, Dimension.Unit.CENTIMETER));
-        }
-    }
-
-    @Test
-    public void waFieldRealSize() throws Exception {
-        TargetModelBase target = TargetFactory.INSTANCE.getTarget(WAField.Companion.getID());
-        final Dimension diameter = new Dimension(40, Dimension.Unit.CENTIMETER);
-        Dimension realSize = target.getRealSize(diameter);
-        Assert.assertEquals(realSize, new Dimension(40, Dimension.Unit.CENTIMETER));
-    }
-
-    @Test
-    public void waVertical3SpotRealSize() throws Exception {
-        TargetModelBase target = TargetFactory.INSTANCE.getTarget(WAVertical3Spot.Companion.getID());
-        final Dimension diameter = new Dimension(40, Dimension.Unit.CENTIMETER);
-        Dimension realSize = target.getRealSize(diameter);
-        Assert.assertEquals(realSize, new Dimension(20, Dimension.Unit.CENTIMETER));
-    }
-
-    @Test
-    public void waFullRealSize() throws Exception {
-        TargetModelBase target = TargetFactory.INSTANCE.getTarget(WAFull.Companion.getID());
-        final Dimension diameter = new Dimension(40, Dimension.Unit.CENTIMETER);
-        Dimension realSize = target.getRealSize(diameter);
-        Assert.assertEquals(realSize, new Dimension(40, Dimension.Unit.CENTIMETER));
-    }
-
-    @Test
-    public void wa6RingRealSize() throws Exception {
-        TargetModelBase target = TargetFactory.INSTANCE.getTarget(WA6Ring.Companion.getID());
-        final Dimension diameter = new Dimension(40, Dimension.Unit.CENTIMETER);
-        Dimension realSize = target.getRealSize(diameter);
-        Assert.assertEquals(realSize, new Dimension(24, Dimension.Unit.CENTIMETER));
-    }
-
-    @Test
-    public void wa5RingRealSize() throws Exception {
-        TargetModelBase target = TargetFactory.INSTANCE.getTarget(WA5Ring.Companion.getID());
-        final Dimension diameter = new Dimension(40, Dimension.Unit.CENTIMETER);
-        Dimension realSize = target.getRealSize(diameter);
-        Assert.assertEquals(realSize, new Dimension(20, Dimension.Unit.CENTIMETER));
-    }
-
-    @Test
-    public void wa3RingRealSize() throws Exception {
-        TargetModelBase target = TargetFactory.INSTANCE.getTarget(WA3Ring.Companion.getID());
-        final Dimension diameter = new Dimension(40, Dimension.Unit.CENTIMETER);
-        Dimension realSize = target.getRealSize(diameter);
-        Assert.assertEquals(realSize, new Dimension(12, Dimension.Unit.CENTIMETER));
-    }
-
-}
diff --git a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.kt b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.kt
new file mode 100644
index 000000000..b0333831e
--- /dev/null
+++ b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.kt
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2017 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.shared.targets.models
+
+import android.support.test.InstrumentationRegistry
+import android.support.test.runner.AndroidJUnit4
+import de.dreier.mytargets.shared.SharedApplicationInstance
+import de.dreier.mytargets.shared.models.Dimension
+import de.dreier.mytargets.shared.targets.TargetFactory
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class TargetModelBaseTest {
+
+    @Before
+    fun setUp() {
+        SharedApplicationInstance.context = InstrumentationRegistry.getContext()
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun trivialTargetRealSize() {
+        for (id in NFAAField.ID..WAField3Spot.ID) {
+            val target = TargetFactory.getTarget(id.toInt())
+            val diameter = Dimension(40f, Dimension.Unit.CENTIMETER)
+            val realSize = target.getRealSize(diameter)
+            Assert.assertEquals("Real size $realSize for target id $id does not match with expected value 40cm",
+                    realSize, Dimension(40f, Dimension.Unit.CENTIMETER))
+        }
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun waFieldRealSize() {
+        val target = TargetFactory.getTarget(WAField.ID.toInt())
+        val diameter = Dimension(40f, Dimension.Unit.CENTIMETER)
+        val realSize = target.getRealSize(diameter)
+        Assert.assertEquals(realSize, Dimension(40f, Dimension.Unit.CENTIMETER))
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun waVertical3SpotRealSize() {
+        val target = TargetFactory.getTarget(WAVertical3Spot.ID.toInt())
+        val diameter = Dimension(40f, Dimension.Unit.CENTIMETER)
+        val realSize = target.getRealSize(diameter)
+        Assert.assertEquals(realSize, Dimension(20f, Dimension.Unit.CENTIMETER))
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun waFullRealSize() {
+        val target = TargetFactory.getTarget(WAFull.ID.toInt())
+        val diameter = Dimension(40f, Dimension.Unit.CENTIMETER)
+        val realSize = target.getRealSize(diameter)
+        Assert.assertEquals(realSize, Dimension(40f, Dimension.Unit.CENTIMETER))
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun wa6RingRealSize() {
+        val target = TargetFactory.getTarget(WA6Ring.ID.toInt())
+        val diameter = Dimension(40f, Dimension.Unit.CENTIMETER)
+        val realSize = target.getRealSize(diameter)
+        Assert.assertEquals(realSize, Dimension(24f, Dimension.Unit.CENTIMETER))
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun wa5RingRealSize() {
+        val target = TargetFactory.getTarget(WA5Ring.ID.toInt())
+        val diameter = Dimension(40f, Dimension.Unit.CENTIMETER)
+        val realSize = target.getRealSize(diameter)
+        Assert.assertEquals(realSize, Dimension(20f, Dimension.Unit.CENTIMETER))
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun wa3RingRealSize() {
+        val target = TargetFactory.getTarget(WA3Ring.ID.toInt())
+        val diameter = Dimension(40f, Dimension.Unit.CENTIMETER)
+        val realSize = target.getRealSize(diameter)
+        Assert.assertEquals(realSize, Dimension(12f, Dimension.Unit.CENTIMETER))
+    }
+
+}
diff --git a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAFullTest.java b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAFullTest.kt
similarity index 50%
rename from shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAFullTest.java
rename to shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAFullTest.kt
index fcb6e2f57..105e57c75 100644
--- a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAFullTest.java
+++ b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAFullTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Florian Dreier
+ * Copyright (C) 2017 Florian Dreier
  *
  * This file is part of MyTargets.
  *
@@ -13,32 +13,35 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.targets.models;
+package de.dreier.mytargets.shared.targets.models
 
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import android.support.test.InstrumentationRegistry
+import android.support.test.filters.SmallTest
+import android.support.test.runner.AndroidJUnit4
+import de.dreier.mytargets.shared.SharedApplicationInstance
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
 
 @SmallTest
-@RunWith(AndroidJUnit4.class)
-public class WAFullTest {
+@RunWith(AndroidJUnit4::class)
+class WAFullTest {
 
-    private WAFull target;
+    private var target = WAFull()
 
     @Before
-    public void setUp() throws Exception {
-        target = new WAFull();
+    @Throws(Exception::class)
+    fun setUp() {
+        SharedApplicationInstance.context = InstrumentationRegistry.getContext()
     }
 
     @Test
-    public void testScoringStyle() {
-        Assert.assertEquals(10, target.getScoringStyle(0).getPointsByScoringRing(0, 0));
-        Assert.assertEquals(10, target.getScoringStyle(0).getPointsByScoringRing(1, 0));
-        Assert.assertEquals(10, target.getScoringStyle(1).getPointsByScoringRing(1, 0));
-        Assert.assertEquals(9, target.getScoringStyle(2).getPointsByScoringRing(1, 0));
+    fun testScoringStyle() {
+        Assert.assertEquals(10, target.getScoringStyle(0).getPointsByScoringRing(0, 0).toLong())
+        Assert.assertEquals(10, target.getScoringStyle(0).getPointsByScoringRing(1, 0).toLong())
+        Assert.assertEquals(10, target.getScoringStyle(1).getPointsByScoringRing(1, 0).toLong())
+        Assert.assertEquals(9, target.getScoringStyle(2).getPointsByScoringRing(1, 0).toLong())
     }
 }
diff --git a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAVertical3SpotTest.java b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAVertical3SpotTest.java
deleted file mode 100644
index c1fec34ba..000000000
--- a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAVertical3SpotTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2018 Florian Dreier
- *
- * This file is part of MyTargets.
- *
- * MyTargets is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * MyTargets is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-package de.dreier.mytargets.shared.targets.models;
-
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@SmallTest
-@RunWith(AndroidJUnit4.class)
-public class WAVertical3SpotTest {
-
-    private WAVertical3Spot target;
-
-    @Before
-    public void setUp() throws Exception {
-        target = new WAVertical3Spot();
-    }
-
-    @Test
-    public void testShouldDrawZone() throws Exception {
-        Assert.assertEquals(true, target.shouldDrawZone(0, 0));
-        Assert.assertEquals(true, target.shouldDrawZone(1, 0));
-        Assert.assertEquals(true, target.shouldDrawZone(2, 0));
-        Assert.assertEquals(false, target.shouldDrawZone(0, 1));
-        Assert.assertEquals(true, target.shouldDrawZone(1, 1));
-        Assert.assertEquals(true, target.shouldDrawZone(2, 1));
-        Assert.assertEquals(true, target.shouldDrawZone(0, 2));
-        Assert.assertEquals(false, target.shouldDrawZone(1, 2));
-        Assert.assertEquals(true, target.shouldDrawZone(2, 2));
-    }
-}
diff --git a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAVertical3SpotTest.kt b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAVertical3SpotTest.kt
new file mode 100644
index 000000000..a07cd53ca
--- /dev/null
+++ b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/WAVertical3SpotTest.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2017 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.shared.targets.models
+
+import android.support.test.InstrumentationRegistry
+import android.support.test.filters.SmallTest
+import android.support.test.runner.AndroidJUnit4
+import de.dreier.mytargets.shared.SharedApplicationInstance
+
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@SmallTest
+@RunWith(AndroidJUnit4::class)
+class WAVertical3SpotTest {
+
+    private var target = WAVertical3Spot()
+
+    @Before
+    @Throws(Exception::class)
+    fun setUp() {
+        SharedApplicationInstance.context = InstrumentationRegistry.getContext()
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun testShouldDrawZone() {
+        Assert.assertEquals(true, target.shouldDrawZone(0, 0))
+        Assert.assertEquals(true, target.shouldDrawZone(1, 0))
+        Assert.assertEquals(true, target.shouldDrawZone(2, 0))
+        Assert.assertEquals(false, target.shouldDrawZone(0, 1))
+        Assert.assertEquals(true, target.shouldDrawZone(1, 1))
+        Assert.assertEquals(true, target.shouldDrawZone(2, 1))
+        Assert.assertEquals(true, target.shouldDrawZone(0, 2))
+        Assert.assertEquals(false, target.shouldDrawZone(1, 2))
+        Assert.assertEquals(true, target.shouldDrawZone(2, 2))
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt b/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt
index a43f8e9da..8827b1fd2 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt
@@ -47,7 +47,7 @@ open class SharedApplicationInstance : Application() {
     companion object {
 
         lateinit var context: Context
-            protected set
+            internal set
 
         fun getStr(@StringRes string: Int): String {
             return context.getString(string)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt
index 52bb0cac6..1b0109e09 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt
@@ -21,8 +21,11 @@ import de.dreier.mytargets.shared.models.Score
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.models.sum
 
-open class ScoringStyle private constructor(title: String?, private val showAsX: Boolean, protected val points: Array<IntArray>) {
-    private val title: String = title ?: descriptionString
+open class ScoringStyle private constructor(
+        val title: String?,
+        private val showAsX: Boolean,
+        protected val points: Array<IntArray>
+) {
     private val maxScorePerShot: List<Int> by lazy { points.map { it.max() ?: 0 } }
 
     internal constructor(showAsX: Boolean, points: Array<IntArray>) : this(null, showAsX, points)
@@ -48,8 +51,8 @@ open class ScoringStyle private constructor(title: String?, private val showAsX:
         }
 
     constructor(showAsX: Boolean, vararg points: Int) : this(showAsX, arrayOf<IntArray>(points))
-
-    override fun toString() = title
+    
+    override fun toString() = title ?: descriptionString
 
     fun zoneToString(zone: Int, arrow: Int): String {
         return if (isOutOfRange(zone)) {

From d66c8928e55ef5f172e53e194e9b8fdf5f4431ee Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Tue, 16 Jan 2018 10:56:21 +0100
Subject: [PATCH 038/102] Fixed some UI tests and ExportTest

---
 .../features/main/MainActivityTest.kt         |  6 +-
 .../training/ScoreboardActivityTest.kt        |  4 +-
 .../test/utils/rules/DbTestRuleBase.kt        |  3 +
 .../test/utils/rules/MiniDbTestRule.kt        |  8 +--
 .../test/utils/rules/SimpleDbTestRule.kt      | 72 +++++++++----------
 .../base/navigation/NavigationController.kt   |  7 +-
 .../training/edit/EditTrainingFragment.kt     |  4 +-
 .../de/dreier/mytargets/shared/AppDatabase.kt | 43 ++++++-----
 .../augmented/AugmentedStandardRound.kt       |  8 +--
 .../shared/models/dao/StandardRoundDAO.kt     |  2 +-
 10 files changed, 81 insertions(+), 76 deletions(-)

diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
index c79396d35..3e1a0755a 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
@@ -51,6 +51,7 @@ import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.shared.models.db.Bow
+import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.targets.models.WAFull
 import de.dreier.mytargets.shared.views.TargetViewBase.EInputMethod
 import de.dreier.mytargets.test.base.UITestBase
@@ -67,7 +68,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
-import java.util.*
 
 @RunWith(AndroidJUnit4::class)
 class MainActivityTest : UITestBase() {
@@ -126,7 +126,7 @@ class MainActivityTest : UITestBase() {
                 .perform(click())
 
         val firstTraining = TrainingDAO.loadTrainings()
-                .sortedWith(Collections.reverseOrder())
+                .sortedWith(compareByDescending(Training::date).thenByDescending(Training::id))
                 .firstOrNull()
 
         intended(allOf(hasClass(TrainingActivity::class.java),
@@ -165,7 +165,7 @@ class MainActivityTest : UITestBase() {
         clickContextualActionBarItem(R.id.action_statistics, R.string.statistic)
 
         val trainings = TrainingDAO.loadTrainings()
-                .sortedWith(Collections.reverseOrder())
+                .sortedWith(compareByDescending(Training::date).thenByDescending(Training::id))
         expectedRoundIds = listOf(trainings[1], trainings[2])
                 .flatMap { t -> TrainingDAO.loadRounds(t.id) }
                 .map { it.id }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt
index 3a21b86c8..c190a04a1 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt
@@ -33,6 +33,7 @@ import de.dreier.mytargets.features.scoreboard.ScoreboardActivity
 import de.dreier.mytargets.features.settings.ESettingsScreens
 import de.dreier.mytargets.features.settings.SettingsActivity
 import de.dreier.mytargets.shared.models.dao.TrainingDAO
+import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.test.base.UITestBase
 import de.dreier.mytargets.test.utils.matchers.IntentMatcher.hasClass
 import de.dreier.mytargets.test.utils.rules.SimpleDbTestRule
@@ -41,7 +42,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
-import java.util.*
 
 @RunWith(AndroidJUnit4::class)
 class ScoreboardActivityTest : UITestBase() {
@@ -55,7 +55,7 @@ class ScoreboardActivityTest : UITestBase() {
     @Test
     fun navigation() {
         val trainings = TrainingDAO.loadTrainings()
-        trainings.sortedWith(Collections.reverseOrder())
+        trainings.sortedWith(compareByDescending(Training::date).thenByDescending(Training::id))
         val id = trainings[0].id
         val i = Intent()
         i.putExtra(ScoreboardActivity.TRAINING_ID, id)
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
index 5661df6b8..1281cdf6f 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
@@ -60,10 +60,12 @@ abstract class DbTestRuleBase : TestRule {
     protected fun buildEnd(round: AugmentedRound, vararg shots: Int): AugmentedEnd {
         val end = round.addEnd()
         end.end.roundId = round.round.id
+        end.end.saveTime = LocalTime.now()
         for (i in shots.indices) {
             end.shots[i].index = i
             end.shots[i].scoringRing = shots[i]
         }
+        end.end.score = round.round.target.getReachedScore(end.shots)
         return end
     }
 
@@ -77,6 +79,7 @@ abstract class DbTestRuleBase : TestRule {
             end.shots[i].scoringRing = round.round.target.model
                     .getZoneFromPoint(end.shots[i].x, end.shots[i].y, 0.05f)
         }
+        end.end.score = round.round.target.getReachedScore(end.shots)
         end.end.saveTime = LocalTime.of(14, gen.nextInt(59), gen.nextInt(59), 0)
         return end
     }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
index 2a4933af0..1c2a88e0a 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
@@ -50,12 +50,12 @@ class MiniDbTestRule : DbTestRuleBase() {
         val round1 = AugmentedRound(rounds[0], mutableListOf())
         val round2 = AugmentedRound(rounds[1], mutableListOf())
 
-        round1.ends.add(randomEnd(round1, 6, generator))
-        round1.ends.add(randomEnd(round1, 6, generator))
+        randomEnd(round1, 6, generator)
+        randomEnd(round1, 6, generator)
         RoundDAO.saveRound(round1)
 
-        round2.ends.add(randomEnd(round2, 6, generator))
-        round2.ends.add(randomEnd(round2, 6, generator))
+        randomEnd(round2, 6, generator)
+        randomEnd(round2, 6, generator)
         RoundDAO.saveRound(round2)
     }
 
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
index 88573bdba..98ee937d4 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
@@ -76,20 +76,20 @@ class SimpleDbTestRule : DbTestRuleBase() {
         RoundDAO.saveRound(round2r)
         val round2 = AugmentedRound(round2r, mutableListOf())
 
-        round1.ends.add(randomEnd(round1, 6, generator))
-        round1.ends.add(randomEnd(round1, 6, generator))
-        round1.ends.add(randomEnd(round1, 6, generator))
-        round1.ends.add(randomEnd(round1, 6, generator))
-        round1.ends.add(randomEnd(round1, 6, generator))
-        round1.ends.add(randomEnd(round1, 6, generator))
+        randomEnd(round1, 6, generator)
+        randomEnd(round1, 6, generator)
+        randomEnd(round1, 6, generator)
+        randomEnd(round1, 6, generator)
+        randomEnd(round1, 6, generator)
+        randomEnd(round1, 6, generator)
         RoundDAO.saveRound(round1)
 
-        round2.ends.add(randomEnd(round2, 6, generator))
-        round2.ends.add(randomEnd(round2, 6, generator))
-        round2.ends.add(randomEnd(round2, 6, generator))
-        round2.ends.add(randomEnd(round2, 6, generator))
-        round2.ends.add(randomEnd(round2, 6, generator))
-        round2.ends.add(randomEnd(round2, 6, generator))
+        randomEnd(round2, 6, generator)
+        randomEnd(round2, 6, generator)
+        randomEnd(round2, 6, generator)
+        randomEnd(round2, 6, generator)
+        randomEnd(round2, 6, generator)
+        randomEnd(round2, 6, generator)
         RoundDAO.saveRound(round2)
     }
 
@@ -115,20 +115,20 @@ class SimpleDbTestRule : DbTestRuleBase() {
         val round1 = AugmentedRound(rounds[0], mutableListOf())
         val round2 = AugmentedRound(rounds[1], mutableListOf())
 
-        round1.ends.add(randomEnd(round1, 6, generator))
-        round1.ends.add(randomEnd(round1, 6, generator))
-        round1.ends.add(randomEnd(round1, 6, generator))
-        round1.ends.add(randomEnd(round1, 6, generator))
-        round1.ends.add(randomEnd(round1, 6, generator))
-        round1.ends.add(randomEnd(round1, 6, generator))
+        randomEnd(round1, 6, generator)
+        randomEnd(round1, 6, generator)
+        randomEnd(round1, 6, generator)
+        randomEnd(round1, 6, generator)
+        randomEnd(round1, 6, generator)
+        randomEnd(round1, 6, generator)
         RoundDAO.saveRound(round1)
 
-        round2.ends.add(randomEnd(round2, 6, generator))
-        round2.ends.add(randomEnd(round2, 6, generator))
-        round2.ends.add(randomEnd(round2, 6, generator))
-        round2.ends.add(randomEnd(round2, 6, generator))
-        round2.ends.add(randomEnd(round2, 6, generator))
-        round2.ends.add(randomEnd(round2, 6, generator))
+        randomEnd(round2, 6, generator)
+        randomEnd(round2, 6, generator)
+        randomEnd(round2, 6, generator)
+        randomEnd(round2, 6, generator)
+        randomEnd(round2, 6, generator)
+        randomEnd(round2, 6, generator)
         RoundDAO.saveRound(round2)
     }
 
@@ -152,20 +152,20 @@ class SimpleDbTestRule : DbTestRuleBase() {
         val round1 = AugmentedRound(rounds[0], mutableListOf())
         val round2 = AugmentedRound(rounds[1], mutableListOf())
 
-        round1.ends.add(buildEnd(round1, 1, 1, 2, 3, 3, 4))
-        round1.ends.add(buildEnd(round1, 0, 0, 1, 2, 2, 3))
-        round1.ends.add(buildEnd(round1, 1, 1, 1, 3, 4, 4))
-        round1.ends.add(buildEnd(round1, 0, 1, 1, 1, 2, 3))
-        round1.ends.add(buildEnd(round1, 1, 2, 3, 3, 4, 5))
-        round1.ends.add(buildEnd(round1, 1, 2, 2, 3, 3, 3))
+        buildEnd(round1, 1, 1, 2, 3, 3, 4)
+        buildEnd(round1, 0, 0, 1, 2, 2, 3)
+        buildEnd(round1, 1, 1, 1, 3, 4, 4)
+        buildEnd(round1, 0, 1, 1, 1, 2, 3)
+        buildEnd(round1, 1, 2, 3, 3, 4, 5)
+        buildEnd(round1, 1, 2, 2, 3, 3, 3)
         RoundDAO.saveRound(round1)
 
-        round2.ends.add(buildEnd(round2, 1, 2, 2, 3, 4, 5))
-        round2.ends.add(buildEnd(round2, 0, 0, 1, 2, 2, 3))
-        round2.ends.add(buildEnd(round2, 0, 1, 2, 2, 2, 3))
-        round2.ends.add(buildEnd(round2, 1, 1, 2, 3, 4, 4))
-        round2.ends.add(buildEnd(round2, 1, 2, 2, 3, 3, 3))
-        round2.ends.add(buildEnd(round2, 1, 2, 2, 3, 3, 4))
+        buildEnd(round2, 1, 2, 2, 3, 4, 5)
+        buildEnd(round2, 0, 0, 1, 2, 2, 3)
+        buildEnd(round2, 0, 1, 2, 2, 2, 3)
+        buildEnd(round2, 1, 1, 2, 3, 4, 4)
+        buildEnd(round2, 1, 2, 2, 3, 3, 3)
+        buildEnd(round2, 1, 2, 2, 3, 3, 4)
         RoundDAO.saveRound(round2)
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt b/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
index 895a72826..b66949d3c 100644
--- a/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
@@ -60,7 +60,10 @@ import de.dreier.mytargets.shared.base.fragment.TimerFragmentBase
 import de.dreier.mytargets.shared.models.*
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
-import de.dreier.mytargets.shared.models.db.*
+import de.dreier.mytargets.shared.models.db.Arrow
+import de.dreier.mytargets.shared.models.db.Bow
+import de.dreier.mytargets.shared.models.db.Round
+import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.utils.ImageList
 import de.dreier.mytargets.utils.IntentWrapper
 import de.dreier.mytargets.utils.Utils
@@ -221,7 +224,7 @@ class NavigationController(
                 .start()
     }
 
-    fun navigateToStandardRoundList(currentSelection: StandardRound, requestCode: Int = StandardRoundSelector.STANDARD_ROUND_REQUEST_CODE) {
+    fun navigateToStandardRoundList(currentSelection: AugmentedStandardRound, requestCode: Int = StandardRoundSelector.STANDARD_ROUND_REQUEST_CODE) {
         IntentWrapper(activity, fragment, StandardRoundActivity::class.java)
                 .with(ITEM, currentSelection)
                 .forResult(requestCode)
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
index ce1644793..663724de1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
@@ -99,7 +99,7 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
         binding = DataBindingUtil
                 .inflate(inflater, R.layout.fragment_edit_training, container, false)
 
-        trainingId = arguments.getLongOrNull(ITEM_ID)!!
+        trainingId = arguments.getLongOrNull(ITEM_ID)
         trainingType = if (activity?.intent?.action == CREATE_TRAINING_WITH_STANDARD_ROUND_ACTION) {
             TRAINING_WITH_STANDARD_ROUND
         } else {
@@ -128,7 +128,7 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
             navigationController.navigateToDistance(selectedItem!!, index)
         }
         binding.standardRound.setOnClickListener { selectedItem, _ ->
-            navigationController.navigateToStandardRoundList(selectedItem!!.standardRound)
+            navigationController.navigateToStandardRoundList(selectedItem!!)
         }
         binding.standardRound.setOnUpdateListener { item ->
             roundTarget = item!!.roundTemplates[0].targetTemplate
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
index 5d3b38271..6e0cc9a29 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
@@ -43,6 +43,7 @@ object AppDatabase {
 
         override fun migrate(database: DatabaseWrapper) {
             fillStandardRound(database)
+            createScoreTriggers(database)
         }
     }
 
@@ -62,25 +63,7 @@ object AppDatabase {
             database.execSQL("ALTER TABLE `End` ADD COLUMN scoreTotalPoints INTEGER;")
             database.execSQL("ALTER TABLE `End` ADD COLUMN scoreShotCount INTEGER;")
 
-            database.execSQL("CREATE TRIGGER round_sum_score " +
-                    "AFTER UPDATE ON `End` " +
-                    "BEGIN " +
-                    "UPDATE `Round` SET " +
-                    "scoreReachedPoints = (SELECT SUM(scoreReachedPoints) FROM `End` WHERE round = NEW.round), " +
-                    "scoreTotalPoints = (SELECT SUM(scoreTotalPoints) FROM `End` WHERE round = NEW.round), " +
-                    "scoreShotCount = (SELECT SUM(scoreShotCount) FROM `End` WHERE round = NEW.round) " +
-                    "WHERE _id = NEW.round;" +
-                    "END;")
-
-            database.execSQL("CREATE TRIGGER training_sum_score " +
-                    "AFTER UPDATE ON `Round` " +
-                    "BEGIN " +
-                    "UPDATE `Training` SET " +
-                    "scoreReachedPoints = (SELECT SUM(scoreReachedPoints) FROM `Round` WHERE training = NEW.training), " +
-                    "scoreTotalPoints = (SELECT SUM(scoreTotalPoints) FROM `Round` WHERE training = NEW.training), " +
-                    "scoreShotCount = (SELECT SUM(scoreShotCount) FROM `Round` WHERE training = NEW.training) " +
-                    "WHERE _id = NEW.training;" +
-                    "END;")
+            createScoreTriggers(database)
 
             val rounds = SQLite.select().from(Round::class.java).queryList(database)
             for (round in rounds) {
@@ -99,6 +82,28 @@ object AppDatabase {
         }
     }
 
+    private fun createScoreTriggers(database: DatabaseWrapper) {
+        database.execSQL("CREATE TRIGGER round_sum_score " +
+                "AFTER UPDATE ON `End` " +
+                "BEGIN " +
+                "UPDATE `Round` SET " +
+                "scoreReachedPoints = (SELECT SUM(scoreReachedPoints) FROM `End` WHERE round = NEW.round), " +
+                "scoreTotalPoints = (SELECT SUM(scoreTotalPoints) FROM `End` WHERE round = NEW.round), " +
+                "scoreShotCount = (SELECT SUM(scoreShotCount) FROM `End` WHERE round = NEW.round) " +
+                "WHERE _id = NEW.round;" +
+                "END;")
+
+        database.execSQL("CREATE TRIGGER training_sum_score " +
+                "AFTER UPDATE ON `Round` " +
+                "BEGIN " +
+                "UPDATE `Training` SET " +
+                "scoreReachedPoints = (SELECT SUM(scoreReachedPoints) FROM `Round` WHERE training = NEW.training), " +
+                "scoreTotalPoints = (SELECT SUM(scoreTotalPoints) FROM `Round` WHERE training = NEW.training), " +
+                "scoreShotCount = (SELECT SUM(scoreShotCount) FROM `Round` WHERE training = NEW.training) " +
+                "WHERE _id = NEW.training;" +
+                "END;")
+    }
+
     @Migration(version = 22, database = AppDatabase::class)
     class Migration22 : BaseMigration() {
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedStandardRound.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedStandardRound.kt
index cb456de6a..a6ea86bcb 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedStandardRound.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedStandardRound.kt
@@ -56,13 +56,7 @@ data class AugmentedStandardRound(
     }
 
     fun createRoundsFromTemplate(): MutableList<Round> {
-        val rounds = mutableListOf<Round>()
-        for (template in roundTemplates) {
-            val round = Round(template)
-            round.target = template.targetTemplate
-            rounds.add(round)
-        }
-        return rounds
+        return roundTemplates.map { Round(it) }.toMutableList()
     }
 
     constructor(source: Parcel) : this(
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/StandardRoundDAO.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/StandardRoundDAO.kt
index f86f68a6a..862115834 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/StandardRoundDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/dao/StandardRoundDAO.kt
@@ -54,8 +54,8 @@ object StandardRoundDAO {
     fun loadRoundTemplates(id: Long): ArrayList<RoundTemplate> = ArrayList(SQLite.select()
             .from(RoundTemplate::class.java)
             .where(RoundTemplate_Table.standardRound.eq(id))
+            .orderBy(RoundTemplate_Table.index, true)
             .queryList()
-            .sortedBy { roundTemplate -> roundTemplate.distance }
             .toMutableList())
 
     fun saveStandardRound(standardRound: StandardRound, roundTemplates: List<RoundTemplate>) {

From 595ff0835e4489a703b7574634fef65916362b54 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Tue, 16 Jan 2018 12:43:20 +0100
Subject: [PATCH 039/102] Fixed UI tests

---
 .idea/misc.xml                                             | 3 ++-
 .../de/dreier/mytargets/features/arrow/EditArrowTest.kt    | 7 +++++++
 .../de/dreier/mytargets/features/bow/EditSightMarksTest.kt | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6423996f9..701d67a30 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,11 +4,12 @@
     <option name="CORE_LIBRARY" value="true" />
   </component>
   <component name="EntryPointsManager">
-    <list size="4">
+    <list size="5">
       <item index="0" class="java.lang.String" itemvalue="android.databinding.BindingAdapter" />
       <item index="1" class="java.lang.String" itemvalue="android.databinding.InverseBindingAdapter" />
       <item index="2" class="java.lang.String" itemvalue="butterknife.OnClick" />
       <item index="3" class="java.lang.String" itemvalue="butterknife.OnTextChanged" />
+      <item index="4" class="java.lang.String" itemvalue="org.junit.Rule" />
     </list>
   </component>
   <component name="NullableNotNullManager">
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/arrow/EditArrowTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/arrow/EditArrowTest.kt
index 0a161e69d..d0cec621b 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/arrow/EditArrowTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/arrow/EditArrowTest.kt
@@ -64,6 +64,7 @@ class EditArrowTest : UITestBase() {
 
         // Attempt to save and check if error is shown
         save()
+        Thread.sleep(500)
         onView(withId(R.id.diameterTextInputLayout))
                 .check(matches(hasDescendant(withText(getString(R.string.not_within_expected_range_mm)))))
 
@@ -72,6 +73,8 @@ class EditArrowTest : UITestBase() {
                 .perform(nestedScrollTo(), replaceText("6.8"), closeSoftKeyboard())
         save()
 
+        Thread.sleep(500)
+
         // Check if arrow has been saved
         onView(withRecyclerView(R.id.recyclerView).atPosition(0))
                 .check(matches(hasDescendant(withText("Arrow"))))
@@ -94,6 +97,8 @@ class EditArrowTest : UITestBase() {
         onData(allOf(`is`(instanceOf<Any>(String::class.java)), `is`("inch"))).perform(click())
         save()
 
+        Thread.sleep(500)
+
         // Correct value and save
         onView(withId(R.id.diameterTextInputLayout))
                 .check(matches(hasDescendant(withText(R.string.not_within_expected_range_inch))))
@@ -114,6 +119,8 @@ class EditArrowTest : UITestBase() {
 
         save()
 
+        Thread.sleep(500)
+
         onView(withRecyclerView(R.id.recyclerView).atPosition(0))
                 .perform(click())
 
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/bow/EditSightMarksTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/bow/EditSightMarksTest.kt
index 010ba7b01..bf47f35dc 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/bow/EditSightMarksTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/bow/EditSightMarksTest.kt
@@ -70,6 +70,8 @@ class EditSightMarksTest : UITestBase() {
 
         save()
 
+        Thread.sleep(500)
+
         // Make sure changes have been saved and are sorted correctly
         onView(withRecyclerView(R.id.recyclerView).atPositionOnView(0, R.id.details))
                 .check(matches(allOf(containsStringRes(R.string.recurve_bow),
@@ -98,6 +100,8 @@ class EditSightMarksTest : UITestBase() {
 
         save()
 
+        Thread.sleep(500)
+
         // Make sure changes have been saved and are sorted correctly
         onView(withRecyclerView(R.id.recyclerView).atPositionOnView(0, R.id.details))
                 .check(matches(allOf(containsStringRes(R.string.recurve_bow),

From 72c4c85d13fc40eb91286152daf07fc3b63aa19b Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Tue, 16 Jan 2018 14:13:27 +0100
Subject: [PATCH 040/102] Moved DAO objects from shared to app module

---
 app/build.gradle                              |   1 +
 .../de/dreier/mytargets/app/MigrationTest.kt  |   8 +-
 .../features/main/MainActivityTest.kt         |   6 +-
 .../test/utils/rules/DbTestRuleBase.kt        |   6 +-
 .../dreier/mytargets/base/db}/dao/ArrowDAO.kt |   2 +-
 .../dreier/mytargets/base/db}/dao/BowDAO.kt   |   2 +-
 .../mytargets/base/db/dao/DimensionDAO.kt     |  68 ++++++
 .../dreier/mytargets/base/db}/dao/EndDAO.kt   |   8 +-
 .../dreier/mytargets/base/db}/dao/RoundDAO.kt |   4 +-
 .../mytargets/base/db}/dao/SignatureDAO.kt    |   2 +-
 .../base/db}/dao/StandardRoundDAO.kt          |   2 +-
 .../mytargets/base/db}/dao/TrainingDAO.kt     |   8 +-
 .../base/db/migrations/Migration0.kt          |  63 +++++
 .../base/db/migrations/Migration22.kt         |  29 +++
 .../base/db/migrations/Migration23.kt         |  84 +++++++
 .../base/db/migrations/Migration26.kt         |  60 +++++
 .../base/db/migrations/Migration3.kt          |  41 ++++
 .../base/db/migrations/Migration4.kt          |  41 ++++
 .../base/db/migrations/Migration6.kt          |  66 +++++
 .../base/db/migrations}/Migration9.kt         |   4 +-
 .../fragments/EditableListFragmentBase.kt     |   3 -
 .../features/arrows/ArrowListFragment.kt      |   2 +-
 .../features/arrows/EditArrowListFragment.kt  |   2 +-
 .../features/arrows/EditArrowViewModel.kt     |   2 +-
 .../mytargets/features/bows/BowAdapter.kt     |   2 +-
 .../features/bows/BowListFragment.kt          |   2 +-
 .../features/bows/EditBowFragment.kt          |   2 +-
 .../features/bows/EditBowListFragment.kt      |   2 +-
 .../features/distance/DistanceGridFragment.kt |   3 +-
 .../features/rounds/EditRoundFragment.kt      |   4 +-
 .../features/scoreboard/ScoreboardFragment.kt |   2 +-
 .../features/scoreboard/ScoreboardUtils.kt    |   4 +-
 .../scoreboard/SignatureDialogFragment.kt     |   2 +-
 .../layout/DefaultScoreboardLayout.kt         |   2 +-
 .../features/statistics/ArrowStatistic.kt     |   8 +-
 .../features/statistics/CsvExporter.kt        |   2 +-
 .../features/statistics/StatisticsActivity.kt |   8 +-
 .../features/statistics/StatisticsFragment.kt |   6 +-
 .../features/training/RoundFragment.kt        |   4 +-
 .../features/training/details/HtmlUtils.kt    |   6 +-
 .../training/details/TrainingFragment.kt      |   4 +-
 .../training/edit/EditTrainingFragment.kt     |   2 +-
 .../features/training/input/InputActivity.kt  |   6 +-
 .../training/overview/TrainingsFragment.kt    |   4 +-
 .../EditStandardRoundFragment.kt              |   2 +-
 .../StandardRoundListFragment.kt              |   6 +-
 .../mytargets/utils/AugmentedRoundUtils.kt    |   2 +-
 .../mytargets/utils/MobileWearableListener.kt |   9 +-
 .../de/dreier/mytargets/utils/ScoreUtils.kt   |   4 +-
 .../mytargets/views/selector/ArrowSelector.kt |   2 +-
 .../mytargets/views/selector/BowSelector.kt   |   2 +-
 .../views/selector/StandardRoundSelector.kt   |   4 +-
 app/src/main/res/raw-af-rZA/help.html         |   2 +-
 app/src/main/res/raw-ar-rSA/help.html         |   2 +-
 app/src/main/res/raw-ca-rES/help.html         |   2 +-
 app/src/main/res/raw-cs-rCZ/help.html         |   2 +-
 app/src/main/res/raw-da-rDK/help.html         |   2 +-
 app/src/main/res/raw-de-rDE/help.html         |   2 +-
 app/src/main/res/raw-el-rGR/help.html         |   2 +-
 app/src/main/res/raw-es-rES/help.html         |   2 +-
 app/src/main/res/raw-et-rEE/help.html         |   2 +-
 app/src/main/res/raw-fi-rFI/help.html         |   2 +-
 app/src/main/res/raw-fr-rFR/help.html         |   2 +-
 app/src/main/res/raw-hu-rHU/help.html         |   2 +-
 app/src/main/res/raw-in-rID/help.html         |   2 +-
 app/src/main/res/raw-it-rIT/help.html         |   2 +-
 app/src/main/res/raw-iw-rIL/help.html         |   2 +-
 app/src/main/res/raw-ja-rJP/help.html         |   2 +-
 app/src/main/res/raw-ko-rKR/help.html         |   2 +-
 app/src/main/res/raw-nl-rNL/help.html         |   2 +-
 app/src/main/res/raw-no-rNO/help.html         |   2 +-
 app/src/main/res/raw-pl-rPL/help.html         |   2 +-
 app/src/main/res/raw-pt-rBR/help.html         |   2 +-
 app/src/main/res/raw-pt-rPT/help.html         |   2 +-
 app/src/main/res/raw-ro-rRO/help.html         |   2 +-
 app/src/main/res/raw-ru-rRU/help.html         |   2 +-
 app/src/main/res/raw-sk-rSK/help.html         |   2 +-
 app/src/main/res/raw-sl-rSI/help.html         |   2 +-
 app/src/main/res/raw-sr-rSP/help.html         |   2 +-
 app/src/main/res/raw-sv-rSE/help.html         |   2 +-
 app/src/main/res/raw-tr-rTR/help.html         |   2 +-
 app/src/main/res/raw-uk-rUA/help.html         |   2 +-
 app/src/main/res/raw-vi-rVN/help.html         |   2 +-
 app/src/main/res/raw-zh-rCN/help.html         |   2 +-
 app/src/main/res/raw-zh-rTW/help.html         |   2 +-
 app/src/main/res/values-af/strings.xml        |   4 +-
 app/src/main/res/values-ar/strings.xml        |   4 +-
 app/src/main/res/values-ca/strings.xml        |   4 +-
 app/src/main/res/values-cs/strings.xml        |   4 +-
 app/src/main/res/values-da/strings.xml        |   4 +-
 app/src/main/res/values-de/strings.xml        |   4 +-
 app/src/main/res/values-el/strings.xml        |   4 +-
 app/src/main/res/values-es/strings.xml        |  56 ++---
 app/src/main/res/values-et/strings.xml        |   4 +-
 app/src/main/res/values-fi/strings.xml        |   4 +-
 app/src/main/res/values-fr/strings.xml        |   4 +-
 app/src/main/res/values-hu/strings.xml        |   4 +-
 app/src/main/res/values-in/strings.xml        |   4 +-
 app/src/main/res/values-it/strings.xml        |   4 +-
 app/src/main/res/values-iw/strings.xml        |   4 +-
 app/src/main/res/values-ja/strings.xml        |   4 +-
 app/src/main/res/values-ko/strings.xml        |   4 +-
 app/src/main/res/values-nl/strings.xml        |   4 +-
 app/src/main/res/values-no/strings.xml        |   4 +-
 app/src/main/res/values-pl/strings.xml        |   4 +-
 app/src/main/res/values-pt-rBR/strings.xml    |   4 +-
 app/src/main/res/values-pt-rPT/strings.xml    |   4 +-
 app/src/main/res/values-ro/strings.xml        |   4 +-
 app/src/main/res/values-ru/strings.xml        |   4 +-
 app/src/main/res/values-sk/strings.xml        |   4 +-
 app/src/main/res/values-sl/strings.xml        |   4 +-
 app/src/main/res/values-sr/strings.xml        |   4 +-
 app/src/main/res/values-sv/strings.xml        |   4 +-
 app/src/main/res/values-tr/strings.xml        |   4 +-
 app/src/main/res/values-uk/strings.xml        |   4 +-
 app/src/main/res/values-vi/strings.xml        |   4 +-
 app/src/main/res/values-zh-rCN/strings.xml    |   4 +-
 app/src/main/res/values-zh-rTW/strings.xml    |   4 +-
 shared/build.gradle                           |   1 -
 .../de/dreier/mytargets/shared/AppDatabase.kt | 231 +-----------------
 .../mytargets/shared/models/Dimension.kt      |  48 ----
 .../augmented/AugmentedStandardRound.kt       |   3 -
 shared/src/main/res/values-af/rounds.xml      |   4 +-
 shared/src/main/res/values-af/strings.xml     |   4 +-
 .../src/main/res/values-af/target_faces.xml   |   4 +-
 shared/src/main/res/values-ar/rounds.xml      |   4 +-
 shared/src/main/res/values-ar/strings.xml     |   4 +-
 .../src/main/res/values-ar/target_faces.xml   |   4 +-
 shared/src/main/res/values-ca/rounds.xml      |   4 +-
 shared/src/main/res/values-ca/strings.xml     |   4 +-
 .../src/main/res/values-ca/target_faces.xml   |   4 +-
 shared/src/main/res/values-cs/rounds.xml      |   4 +-
 shared/src/main/res/values-cs/strings.xml     |   4 +-
 .../src/main/res/values-cs/target_faces.xml   |   4 +-
 shared/src/main/res/values-da/rounds.xml      |   4 +-
 shared/src/main/res/values-da/strings.xml     |   4 +-
 .../src/main/res/values-da/target_faces.xml   |   4 +-
 shared/src/main/res/values-de/rounds.xml      |   4 +-
 shared/src/main/res/values-de/strings.xml     |   4 +-
 .../src/main/res/values-de/target_faces.xml   |   4 +-
 shared/src/main/res/values-el/rounds.xml      |   4 +-
 shared/src/main/res/values-el/strings.xml     |   4 +-
 .../src/main/res/values-el/target_faces.xml   |   4 +-
 shared/src/main/res/values-es/rounds.xml      |   4 +-
 shared/src/main/res/values-es/strings.xml     |   8 +-
 .../src/main/res/values-es/target_faces.xml   |   4 +-
 shared/src/main/res/values-et/rounds.xml      |   4 +-
 shared/src/main/res/values-et/strings.xml     |   4 +-
 .../src/main/res/values-et/target_faces.xml   |   4 +-
 shared/src/main/res/values-fi/rounds.xml      |   4 +-
 shared/src/main/res/values-fi/strings.xml     |   4 +-
 .../src/main/res/values-fi/target_faces.xml   |   4 +-
 shared/src/main/res/values-fr/rounds.xml      |   4 +-
 shared/src/main/res/values-fr/strings.xml     |   4 +-
 .../src/main/res/values-fr/target_faces.xml   |   4 +-
 shared/src/main/res/values-hu/rounds.xml      |   4 +-
 shared/src/main/res/values-hu/strings.xml     |   4 +-
 .../src/main/res/values-hu/target_faces.xml   |   4 +-
 shared/src/main/res/values-in/rounds.xml      |   4 +-
 shared/src/main/res/values-in/strings.xml     |   4 +-
 .../src/main/res/values-in/target_faces.xml   |   4 +-
 shared/src/main/res/values-it/rounds.xml      |   4 +-
 shared/src/main/res/values-it/strings.xml     |   4 +-
 .../src/main/res/values-it/target_faces.xml   |   4 +-
 shared/src/main/res/values-iw/rounds.xml      |   4 +-
 shared/src/main/res/values-iw/strings.xml     |   4 +-
 .../src/main/res/values-iw/target_faces.xml   |   4 +-
 shared/src/main/res/values-ja/rounds.xml      |   4 +-
 shared/src/main/res/values-ja/strings.xml     |   4 +-
 .../src/main/res/values-ja/target_faces.xml   |   4 +-
 shared/src/main/res/values-ko/rounds.xml      |   4 +-
 shared/src/main/res/values-ko/strings.xml     |   4 +-
 .../src/main/res/values-ko/target_faces.xml   |   4 +-
 shared/src/main/res/values-nl/rounds.xml      |   4 +-
 shared/src/main/res/values-nl/strings.xml     |   4 +-
 .../src/main/res/values-nl/target_faces.xml   |   4 +-
 shared/src/main/res/values-no/rounds.xml      |   4 +-
 shared/src/main/res/values-no/strings.xml     |   4 +-
 .../src/main/res/values-no/target_faces.xml   |   4 +-
 shared/src/main/res/values-pl/rounds.xml      |   4 +-
 shared/src/main/res/values-pl/strings.xml     |   4 +-
 .../src/main/res/values-pl/target_faces.xml   |   4 +-
 shared/src/main/res/values-pt-rBR/rounds.xml  |   4 +-
 shared/src/main/res/values-pt-rBR/strings.xml |   4 +-
 .../main/res/values-pt-rBR/target_faces.xml   |   4 +-
 shared/src/main/res/values-pt-rPT/rounds.xml  |   4 +-
 shared/src/main/res/values-pt-rPT/strings.xml |   4 +-
 .../main/res/values-pt-rPT/target_faces.xml   |   4 +-
 shared/src/main/res/values-ro/rounds.xml      |   4 +-
 shared/src/main/res/values-ro/strings.xml     |   4 +-
 .../src/main/res/values-ro/target_faces.xml   |   4 +-
 shared/src/main/res/values-ru/rounds.xml      |   4 +-
 shared/src/main/res/values-ru/strings.xml     |   4 +-
 .../src/main/res/values-ru/target_faces.xml   |   4 +-
 shared/src/main/res/values-sk/rounds.xml      |   4 +-
 shared/src/main/res/values-sk/strings.xml     |   4 +-
 .../src/main/res/values-sk/target_faces.xml   |   4 +-
 shared/src/main/res/values-sl/rounds.xml      |   4 +-
 shared/src/main/res/values-sl/strings.xml     |   4 +-
 .../src/main/res/values-sl/target_faces.xml   |   4 +-
 shared/src/main/res/values-sr/rounds.xml      |   4 +-
 shared/src/main/res/values-sr/strings.xml     |   4 +-
 .../src/main/res/values-sr/target_faces.xml   |   4 +-
 shared/src/main/res/values-sv/rounds.xml      |   4 +-
 shared/src/main/res/values-sv/strings.xml     |   4 +-
 .../src/main/res/values-sv/target_faces.xml   |   4 +-
 shared/src/main/res/values-tr/rounds.xml      |   4 +-
 shared/src/main/res/values-tr/strings.xml     |   4 +-
 .../src/main/res/values-tr/target_faces.xml   |   4 +-
 shared/src/main/res/values-uk/rounds.xml      |   4 +-
 shared/src/main/res/values-uk/strings.xml     |   4 +-
 .../src/main/res/values-uk/target_faces.xml   |   4 +-
 shared/src/main/res/values-vi/rounds.xml      |   4 +-
 shared/src/main/res/values-vi/strings.xml     |   4 +-
 .../src/main/res/values-vi/target_faces.xml   |   4 +-
 shared/src/main/res/values-zh-rCN/rounds.xml  |   4 +-
 shared/src/main/res/values-zh-rCN/strings.xml |   4 +-
 .../main/res/values-zh-rCN/target_faces.xml   |   4 +-
 shared/src/main/res/values-zh-rTW/rounds.xml  |   4 +-
 shared/src/main/res/values-zh-rTW/strings.xml |   4 +-
 .../main/res/values-zh-rTW/target_faces.xml   |   4 +-
 wearable/build.gradle                         |   4 -
 wearable/src/main/res/values-af/strings.xml   |   4 +-
 wearable/src/main/res/values-ar/strings.xml   |   4 +-
 wearable/src/main/res/values-ca/strings.xml   |   4 +-
 wearable/src/main/res/values-cs/strings.xml   |   4 +-
 wearable/src/main/res/values-da/strings.xml   |   4 +-
 wearable/src/main/res/values-de/strings.xml   |   4 +-
 wearable/src/main/res/values-el/strings.xml   |   4 +-
 wearable/src/main/res/values-es/strings.xml   |   4 +-
 wearable/src/main/res/values-et/strings.xml   |   4 +-
 wearable/src/main/res/values-fi/strings.xml   |   4 +-
 wearable/src/main/res/values-fr/strings.xml   |   4 +-
 wearable/src/main/res/values-hu/strings.xml   |   4 +-
 wearable/src/main/res/values-in/strings.xml   |   4 +-
 wearable/src/main/res/values-it/strings.xml   |   4 +-
 wearable/src/main/res/values-iw/strings.xml   |   4 +-
 wearable/src/main/res/values-ja/strings.xml   |   4 +-
 wearable/src/main/res/values-ko/strings.xml   |   4 +-
 wearable/src/main/res/values-nl/strings.xml   |   4 +-
 wearable/src/main/res/values-no/strings.xml   |   4 +-
 wearable/src/main/res/values-pl/strings.xml   |   4 +-
 .../src/main/res/values-pt-rBR/strings.xml    |   4 +-
 .../src/main/res/values-pt-rPT/strings.xml    |   4 +-
 wearable/src/main/res/values-ro/strings.xml   |   4 +-
 wearable/src/main/res/values-ru/strings.xml   |   4 +-
 wearable/src/main/res/values-sk/strings.xml   |   4 +-
 wearable/src/main/res/values-sl/strings.xml   |   4 +-
 wearable/src/main/res/values-sr/strings.xml   |   4 +-
 wearable/src/main/res/values-sv/strings.xml   |   4 +-
 wearable/src/main/res/values-tr/strings.xml   |   4 +-
 wearable/src/main/res/values-uk/strings.xml   |   4 +-
 wearable/src/main/res/values-vi/strings.xml   |   4 +-
 .../src/main/res/values-zh-rCN/strings.xml    |   4 +-
 .../src/main/res/values-zh-rTW/strings.xml    |   4 +-
 255 files changed, 765 insertions(+), 924 deletions(-)
 rename {shared/src/main/java/de/dreier/mytargets/shared/models => app/src/main/java/de/dreier/mytargets/base/db}/dao/ArrowDAO.kt (98%)
 rename {shared/src/main/java/de/dreier/mytargets/shared/models => app/src/main/java/de/dreier/mytargets/base/db}/dao/BowDAO.kt (98%)
 create mode 100644 app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
 rename {shared/src/main/java/de/dreier/mytargets/shared/models => app/src/main/java/de/dreier/mytargets/base/db}/dao/EndDAO.kt (93%)
 rename {shared/src/main/java/de/dreier/mytargets/shared/models => app/src/main/java/de/dreier/mytargets/base/db}/dao/RoundDAO.kt (97%)
 rename {shared/src/main/java/de/dreier/mytargets/shared/models => app/src/main/java/de/dreier/mytargets/base/db}/dao/SignatureDAO.kt (96%)
 rename {shared/src/main/java/de/dreier/mytargets/shared/models => app/src/main/java/de/dreier/mytargets/base/db}/dao/StandardRoundDAO.kt (98%)
 rename {shared/src/main/java/de/dreier/mytargets/shared/models => app/src/main/java/de/dreier/mytargets/base/db}/dao/TrainingDAO.kt (96%)
 create mode 100644 app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration0.kt
 create mode 100644 app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
 create mode 100644 app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
 create mode 100644 app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
 create mode 100644 app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt
 create mode 100644 app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt
 create mode 100644 app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt
 rename {shared/src/main/java/de/dreier/mytargets/shared/migration => app/src/main/java/de/dreier/mytargets/base/db/migrations}/Migration9.kt (99%)

diff --git a/app/build.gradle b/app/build.gradle
index 7350aeaa5..bc7cc1f72 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -179,6 +179,7 @@ dependencies {
     kapt dependencies.dbFlowProcessor
     implementation dependencies.dbFlowCore
     implementation dependencies.dbFlow
+    implementation dependencies.dbFlowKotlinExtensions
 
     implementation dependencies.photoView
 
diff --git a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
index c3ff8498a..4b893f343 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
@@ -32,10 +32,10 @@ import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Dimension.Unit.CENTIMETER
 import de.dreier.mytargets.shared.models.Dimension.Unit.METER
 import de.dreier.mytargets.shared.models.EWeather
-import de.dreier.mytargets.shared.models.dao.BowDAO
-import de.dreier.mytargets.shared.models.dao.EndDAO
-import de.dreier.mytargets.shared.models.dao.RoundDAO
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
+import de.dreier.mytargets.base.db.dao.dao.BowDAO
+import de.dreier.mytargets.base.db.dao.dao.EndDAO
+import de.dreier.mytargets.base.db.dao.dao.RoundDAO
+import de.dreier.mytargets.base.db.dao.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.test.base.InstrumentedTestBase
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
index 3e1a0755a..841df7655 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
@@ -46,9 +46,9 @@ import de.dreier.mytargets.features.training.edit.EditTrainingFragment
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.EBowType
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.shared.models.dao.ArrowDAO
-import de.dreier.mytargets.shared.models.dao.BowDAO
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
+import de.dreier.mytargets.base.db.dao.ArrowDAO
+import de.dreier.mytargets.base.db.dao.dao.BowDAO
+import de.dreier.mytargets.base.db.dao.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.shared.models.db.Training
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
index 1281cdf6f..585d38962 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
@@ -26,9 +26,9 @@ import de.dreier.mytargets.shared.models.EWeather
 import de.dreier.mytargets.shared.models.Thumbnail
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
-import de.dreier.mytargets.shared.models.dao.ArrowDAO
-import de.dreier.mytargets.shared.models.dao.BowDAO
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
+import de.dreier.mytargets.base.db.dao.ArrowDAO
+import de.dreier.mytargets.base.db.dao.dao.BowDAO
+import de.dreier.mytargets.base.db.dao.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.shared.models.db.Training
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/ArrowDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
similarity index 98%
rename from shared/src/main/java/de/dreier/mytargets/shared/models/dao/ArrowDAO.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
index 4086155e9..5731267e4 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/ArrowDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.models.dao
+package de.dreier.mytargets.base.db.dao
 
 import com.raizlabs.android.dbflow.config.FlowManager
 import com.raizlabs.android.dbflow.kotlinextensions.delete
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/BowDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
similarity index 98%
rename from shared/src/main/java/de/dreier/mytargets/shared/models/dao/BowDAO.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
index 658baba5d..a7d50d0bb 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/BowDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.models.dao
+package de.dreier.mytargets.base.db.dao
 
 import com.raizlabs.android.dbflow.config.FlowManager
 import com.raizlabs.android.dbflow.kotlinextensions.delete
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
new file mode 100644
index 000000000..40cb2431f
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.dao
+
+import com.raizlabs.android.dbflow.sql.language.SQLite
+import de.dreier.mytargets.shared.models.Dimension
+import de.dreier.mytargets.shared.models.db.*
+import java.util.*
+
+object DimensionDAO {
+    /**
+     * Returns a list of all distances that are either default values or used somewhere in the app
+     *
+     * @param distance Distance to add to the list (current selected value)
+     * @param unit     Distances are only returned which match the specified unit
+     * @return List of distances
+     */
+    fun getAll(distance: Dimension, unit: Dimension.Unit): List<Dimension> {
+        val distances = HashSet<Dimension>()
+
+        distances.add(Dimension.UNKNOWN)
+
+        // Add currently selected distance to list
+        if (distance.unit == unit) {
+            distances.add(distance)
+        }
+
+        // Get all distances used in Round or SightMark table
+        distances.addAll(SQLite
+                .select(SightMark_Table.distance)
+                .from(SightMark::class.java)
+                .queryList()
+                .map { it.distance }
+                .filter { it.unit == unit }
+                .toSet())
+
+        distances.addAll(SQLite
+                .select(RoundTemplate_Table.distance)
+                .from(RoundTemplate::class.java)
+                .queryList()
+                .map { it.distance }
+                .filter { it.unit == unit }
+                .toSet())
+
+        distances.addAll(SQLite
+                .select(Round_Table.distance)
+                .from(Round::class.java)
+                .queryList()
+                .map { it.distance }
+                .filter { it.unit == unit }
+                .toSet())
+
+        return ArrayList(distances)
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
similarity index 93%
rename from shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
index 71fca84f6..6e2337225 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/EndDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.models.dao
+package de.dreier.mytargets.base.db.dao
 
 import com.raizlabs.android.dbflow.config.FlowManager
 import com.raizlabs.android.dbflow.kotlinextensions.delete
@@ -62,18 +62,18 @@ object EndDAO {
 
     fun saveEnd(end: End, images: List<EndImage>, shots: List<Shot>) {
         FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            saveEnd(end, db, images, shots)
+            saveEnd(db, end, images, shots)
         }
     }
 
     fun insertEnd(end: End, images: List<EndImage>, shots: List<Shot>) {
         FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
             db.execSQL("UPDATE End SET `index` = `index` + 1 WHERE `index` >= ${end.index}")
-            saveEnd(end, db, images, shots)
+            saveEnd(db, end, images, shots)
         }
     }
 
-    private fun saveEnd(end: End, db: DatabaseWrapper, images: List<EndImage>, shots: List<Shot>) {
+    internal fun saveEnd(db: DatabaseWrapper, end: End, images: List<EndImage>, shots: List<Shot>) {
         end.save(db)
         SQLite.delete(EndImage::class.java)
                 .where(EndImage_Table.end.eq(end.id))
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/RoundDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
similarity index 97%
rename from shared/src/main/java/de/dreier/mytargets/shared/models/dao/RoundDAO.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
index 1c916f79a..25a3cd8c8 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/RoundDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.models.dao
+package de.dreier.mytargets.base.db.dao
 
 import com.raizlabs.android.dbflow.config.FlowManager
 import com.raizlabs.android.dbflow.kotlinextensions.delete
@@ -82,7 +82,7 @@ object RoundDAO {
     }
 
     fun insertRound(round: AugmentedRound) {
-        RoundDAO.insertRound(round.round, round.ends.map { it.end })
+        insertRound(round.round, round.ends.map { it.end })
         round.ends.forEach {
             EndDAO.saveEnd(it.end, it.images, it.shots)
         }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/SignatureDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
similarity index 96%
rename from shared/src/main/java/de/dreier/mytargets/shared/models/dao/SignatureDAO.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
index e5598775a..d8875d839 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/SignatureDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.models.dao
+package de.dreier.mytargets.base.db.dao
 
 import com.raizlabs.android.dbflow.kotlinextensions.delete
 import com.raizlabs.android.dbflow.kotlinextensions.save
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/StandardRoundDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
similarity index 98%
rename from shared/src/main/java/de/dreier/mytargets/shared/models/dao/StandardRoundDAO.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
index 862115834..286446f12 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/StandardRoundDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.models.dao
+package de.dreier.mytargets.base.db.dao
 
 import com.raizlabs.android.dbflow.config.FlowManager
 import com.raizlabs.android.dbflow.kotlinextensions.delete
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/TrainingDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
similarity index 96%
rename from shared/src/main/java/de/dreier/mytargets/shared/models/dao/TrainingDAO.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
index 7a4c9e105..32647fc57 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/dao/TrainingDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.models.dao
+package de.dreier.mytargets.base.db.dao
 
 import com.raizlabs.android.dbflow.config.FlowManager
 import com.raizlabs.android.dbflow.kotlinextensions.delete
@@ -83,7 +83,7 @@ object TrainingDAO {
                 round.round.save(db)
                 for (end in round.ends) {
                     end.end.roundId = round.round.id
-                    end.end.save(db)
+                    EndDAO.saveEnd(db, end.end, end.images, end.shots)
                 }
             }
         }
@@ -105,7 +105,7 @@ object TrainingDAO {
         val signature = Signature()
         SignatureDAO.saveSignature(signature)
         training.archerSignatureId = signature.id
-        TrainingDAO.saveTraining(training)
+        saveTraining(training)
         return signature
     }
 
@@ -119,7 +119,7 @@ object TrainingDAO {
         val signature = Signature()
         SignatureDAO.saveSignature(signature)
         training.witnessSignatureId = signature.id
-        TrainingDAO.saveTraining(training)
+        saveTraining(training)
         return signature
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration0.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration0.kt
new file mode 100644
index 000000000..d03b5ee8c
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration0.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import com.raizlabs.android.dbflow.annotation.Migration
+import com.raizlabs.android.dbflow.sql.migration.BaseMigration
+import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
+import de.dreier.mytargets.base.db.dao.StandardRoundDAO
+import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.shared.utils.StandardRoundFactory
+
+@Migration(version = 0, database = AppDatabase::class)
+class Migration0 : BaseMigration() {
+
+    override fun migrate(database: DatabaseWrapper) {
+        fillStandardRound(database)
+        createScoreTriggers(database)
+    }
+
+    companion object {
+        fun fillStandardRound(db: DatabaseWrapper) {
+            val standardRounds = StandardRoundFactory.initTable()
+            for (standardRound in standardRounds) {
+                StandardRoundDAO.saveStandardRound(db, standardRound.standardRound, standardRound.roundTemplates)
+            }
+        }
+
+        fun createScoreTriggers(database: DatabaseWrapper) {
+            database.execSQL("CREATE TRIGGER round_sum_score " +
+                    "AFTER UPDATE ON `End` " +
+                    "BEGIN " +
+                    "UPDATE `Round` SET " +
+                    "scoreReachedPoints = (SELECT SUM(scoreReachedPoints) FROM `End` WHERE round = NEW.round), " +
+                    "scoreTotalPoints = (SELECT SUM(scoreTotalPoints) FROM `End` WHERE round = NEW.round), " +
+                    "scoreShotCount = (SELECT SUM(scoreShotCount) FROM `End` WHERE round = NEW.round) " +
+                    "WHERE _id = NEW.round;" +
+                    "END;")
+
+            database.execSQL("CREATE TRIGGER training_sum_score " +
+                    "AFTER UPDATE ON `Round` " +
+                    "BEGIN " +
+                    "UPDATE `Training` SET " +
+                    "scoreReachedPoints = (SELECT SUM(scoreReachedPoints) FROM `Round` WHERE training = NEW.training), " +
+                    "scoreTotalPoints = (SELECT SUM(scoreTotalPoints) FROM `Round` WHERE training = NEW.training), " +
+                    "scoreShotCount = (SELECT SUM(scoreShotCount) FROM `Round` WHERE training = NEW.training) " +
+                    "WHERE _id = NEW.training;" +
+                    "END;")
+        }
+    }
+}
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
new file mode 100644
index 000000000..a3c72d4ca
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import com.raizlabs.android.dbflow.annotation.Migration
+import com.raizlabs.android.dbflow.sql.migration.BaseMigration
+import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
+import de.dreier.mytargets.shared.AppDatabase
+
+@Migration(version = 22, database = AppDatabase::class)
+class Migration22 : BaseMigration() {
+
+    override fun migrate(database: DatabaseWrapper) {
+        Migration0.fillStandardRound(database)
+    }
+}
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
new file mode 100644
index 000000000..bcb707c96
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import com.raizlabs.android.dbflow.annotation.Migration
+import com.raizlabs.android.dbflow.kotlinextensions.delete
+import com.raizlabs.android.dbflow.kotlinextensions.save
+import com.raizlabs.android.dbflow.sql.language.SQLite
+import com.raizlabs.android.dbflow.sql.migration.BaseMigration
+import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
+import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.shared.SharedApplicationInstance
+import de.dreier.mytargets.shared.models.Image
+import de.dreier.mytargets.shared.models.db.ArrowImage
+import de.dreier.mytargets.shared.models.db.BowImage
+import de.dreier.mytargets.shared.models.db.EndImage
+import de.dreier.mytargets.shared.utils.moveTo
+import java.io.File
+import java.io.IOException
+
+@Migration(version = 23, database = AppDatabase::class)
+class Migration23 : BaseMigration() {
+
+    override fun migrate(database: DatabaseWrapper) {
+        removeFilePath(database, EndImage::class.java,
+                { endImage, db -> endImage.save(db) },
+                { endImage, db -> endImage.delete(db) })
+        removeFilePath(database, BowImage::class.java,
+                { bowImage, db -> bowImage.save(db) },
+                { bowImage, db -> bowImage.delete(db) })
+        removeFilePath(database, ArrowImage::class.java,
+                { arrowImage, db -> arrowImage.save(db) },
+                { arrowImage, db -> arrowImage.delete(db) })
+    }
+
+    private fun <T> removeFilePath(database: DatabaseWrapper, clazz: Class<out T>,
+                                   save: (T, DatabaseWrapper) -> Boolean,
+                                   delete: (T, DatabaseWrapper) -> Boolean) where T : Image {
+        val images = SQLite.select().from(clazz).queryList(database)
+        for (image in images) {
+            val filesDir = SharedApplicationInstance.context.filesDir
+            var imageFile = File(filesDir, image.fileName)
+
+            val imageFromSomewhere = File(image.fileName)
+            val imageFileFromSomewhere = File(filesDir, imageFromSomewhere.name)
+
+            // If imagePath is just the name and is placed inside files directory or
+            // In case the image was already copied to the files, but does still contain the wrong path
+            if (imageFile.exists() || imageFileFromSomewhere.exists()) {
+                image.fileName = imageFile.name
+                save(image, database)
+                continue
+            }
+
+            // In case the image is placed somewhere else, but still exists
+            if (imageFromSomewhere.exists()) {
+                try {
+                    imageFile = File.createTempFile("img", imageFromSomewhere.name, filesDir)
+                    imageFromSomewhere.moveTo(imageFile)
+                    image.fileName = imageFile.name
+                    save(image, database)
+                } catch (e: IOException) {
+                    e.printStackTrace()
+                }
+
+            } else {
+                delete(image, database)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
new file mode 100644
index 000000000..358e5b659
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import com.raizlabs.android.dbflow.annotation.Migration
+import com.raizlabs.android.dbflow.kotlinextensions.save
+import com.raizlabs.android.dbflow.sql.language.SQLite
+import com.raizlabs.android.dbflow.sql.migration.BaseMigration
+import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
+import de.dreier.mytargets.base.db.migrations.Migration0.Companion.createScoreTriggers
+import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.shared.models.db.*
+
+@Migration(version = 26, database = AppDatabase::class)
+class Migration26 : BaseMigration() {
+
+    override fun migrate(database: DatabaseWrapper) {
+        database.execSQL("ALTER TABLE `Training` ADD COLUMN scoreReachedPoints INTEGER;")
+        database.execSQL("ALTER TABLE `Training` ADD COLUMN scoreTotalPoints INTEGER;")
+        database.execSQL("ALTER TABLE `Training` ADD COLUMN scoreShotCount INTEGER;")
+
+        database.execSQL("ALTER TABLE `Round` ADD COLUMN scoreReachedPoints INTEGER;")
+        database.execSQL("ALTER TABLE `Round` ADD COLUMN scoreTotalPoints INTEGER;")
+        database.execSQL("ALTER TABLE `Round` ADD COLUMN scoreShotCount INTEGER;")
+
+        database.execSQL("ALTER TABLE `End` ADD COLUMN scoreReachedPoints INTEGER;")
+        database.execSQL("ALTER TABLE `End` ADD COLUMN scoreTotalPoints INTEGER;")
+        database.execSQL("ALTER TABLE `End` ADD COLUMN scoreShotCount INTEGER;")
+
+        Migration0.createScoreTriggers(database)
+
+        val rounds = SQLite.select().from(Round::class.java).queryList(database)
+        for (round in rounds) {
+            val target = round.target
+            val ends = SQLite.select().from(End::class.java).where(End_Table.round.eq(round.id))
+                    .queryList(database)
+            for (end in ends) {
+                val shots = SQLite.select().from(Shot::class.java)
+                        .where(Shot_Table.end.eq(end.id))
+                        .orderBy(Shot_Table.index, true)
+                        .queryList(database)
+                end.score = target.getReachedScore(shots)
+                end.save(database)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt
new file mode 100644
index 000000000..56646df43
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import com.raizlabs.android.dbflow.annotation.Migration
+import com.raizlabs.android.dbflow.sql.migration.BaseMigration
+import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
+import de.dreier.mytargets.shared.AppDatabase
+
+@Migration(version = 3, database = AppDatabase::class)
+class Migration3 : BaseMigration() {
+
+    override fun migrate(database: DatabaseWrapper) {
+        database.execSQL("ALTER TABLE SHOOT ADD COLUMN x REAL")
+        database.execSQL("ALTER TABLE SHOOT ADD COLUMN y REAL")
+        val cur = database.rawQuery("SELECT s._id, s.points, r.target " +
+                "FROM SHOOT s, PASSE p, ROUND r " +
+                "WHERE s.passe=p._id " +
+                "AND p.round=r._id", null)
+        if (cur.moveToFirst()) {
+            do {
+                val shoot = cur.getInt(0)
+                database.execSQL("UPDATE SHOOT SET x=0, y=0 WHERE _id=" + shoot)
+            } while (cur.moveToNext())
+        }
+        cur.close()
+    }
+}
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt
new file mode 100644
index 000000000..bcc76f98b
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import com.raizlabs.android.dbflow.annotation.Migration
+import com.raizlabs.android.dbflow.sql.migration.BaseMigration
+import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
+import de.dreier.mytargets.shared.AppDatabase
+
+@Migration(version = 4, database = AppDatabase::class)
+class Migration4 : BaseMigration() {
+
+    override fun migrate(database: DatabaseWrapper) {
+        database.execSQL(
+                "CREATE TABLE IF NOT EXISTS VISIER ( _id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                        "bow REFERENCES BOW ON DELETE CASCADE," +
+                        "distance INTEGER," +
+                        "setting TEXT);")
+        val valuesMetric = intArrayOf(10, 15, 18, 20, 25, 30, 40, 50, 60, 70, 90)
+        for (table in arrayOf("ROUND", "VISIER")) {
+            for (i in 10 downTo 0) {
+                database.execSQL("UPDATE " + table + " SET distance=" +
+                        valuesMetric[i] + " WHERE distance=" + i)
+            }
+        }
+        database.execSQL("ALTER TABLE BOW ADD COLUMN height TEXT DEFAULT '';")
+    }
+}
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt
new file mode 100644
index 000000000..1039de631
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import com.raizlabs.android.dbflow.annotation.Migration
+import com.raizlabs.android.dbflow.sql.migration.BaseMigration
+import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
+import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.shared.SharedApplicationInstance
+import java.io.File
+import java.io.IOException
+
+@Migration(version = 6, database = AppDatabase::class)
+class Migration6 : BaseMigration() {
+
+    override fun migrate(database: DatabaseWrapper) {
+        val filesDir = SharedApplicationInstance.context.filesDir
+
+        // Migrate all bow images
+        var cur = database.rawQuery("SELECT image FROM BOW WHERE image IS NOT NULL", null)
+        if (cur.moveToFirst()) {
+            val fileName = cur.getString(0)
+            try {
+                val file = File.createTempFile("img_", ".png", filesDir)
+                File(fileName).copyTo(file)
+                database.execSQL(
+                        "UPDATE BOW SET image=\"" + file.name + "\" WHERE image=\"" +
+                                fileName + "\"")
+            } catch (e: IOException) {
+                e.printStackTrace()
+            }
+
+        }
+        cur.close()
+
+        // Migrate all arrows images
+        cur = database.rawQuery("SELECT image FROM ARROW WHERE image IS NOT NULL", null)
+        if (cur.moveToFirst()) {
+            val fileName = cur.getString(0)
+            try {
+                val file = File.createTempFile("img_", ".png", filesDir)
+                File(fileName).copyTo(file)
+                database.execSQL(
+                        "UPDATE ARROW SET image=\"" + file.name + "\" WHERE image=\"" +
+                                fileName + "\"")
+            } catch (e: IOException) {
+                e.printStackTrace()
+            }
+
+        }
+        cur.close()
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/migration/Migration9.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
similarity index 99%
rename from shared/src/main/java/de/dreier/mytargets/shared/migration/Migration9.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
index 404df6e28..0ea826ebf 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/migration/Migration9.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.migration
+package de.dreier.mytargets.base.db.migrations
 
 import android.content.ContentValues
 import android.database.Cursor
@@ -22,11 +22,11 @@ import android.database.sqlite.SQLiteDatabase.CONFLICT_IGNORE
 import com.raizlabs.android.dbflow.annotation.Migration
 import com.raizlabs.android.dbflow.sql.migration.BaseMigration
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
+import de.dreier.mytargets.base.db.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
-import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.StandardRound
 import de.dreier.mytargets.shared.utils.StandardRoundFactory
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
index d0438202b..2df7e5c1a 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
@@ -27,9 +27,6 @@ import de.dreier.mytargets.utils.multiselector.OnItemClickListener
 import de.dreier.mytargets.utils.multiselector.OnItemLongClickListener
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 
-/**
- * @param <T> Model of the item which is managed within the fragment.
-</T> */
 abstract class EditableListFragmentBase<T, U : ListAdapterBase<*, T>> : FragmentBase(), OnItemClickListener<T>, OnItemLongClickListener<T> where T : IIdSettable {
 
     /**
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
index 41d7670e1..8e571c2e4 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
@@ -16,10 +16,10 @@
 package de.dreier.mytargets.features.arrows
 
 import android.os.Bundle
+import de.dreier.mytargets.base.db.dao.ArrowDAO
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.base.fragments.SelectPureListItemFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
-import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 
 class ArrowListFragment : SelectPureListItemFragmentBase<Arrow>(compareBy(Arrow::name, Arrow::id)) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
index 3fa39ac31..755128112 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
@@ -23,12 +23,12 @@ import android.view.View
 import android.view.ViewGroup
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
+import de.dreier.mytargets.base.db.dao.ArrowDAO
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase
 import de.dreier.mytargets.base.fragments.ItemActionModeCallback
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.databinding.FragmentArrowsBinding
 import de.dreier.mytargets.databinding.ItemImageDetailsBinding
-import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.utils.DividerItemDecoration
 import de.dreier.mytargets.utils.SlideInItemAnimator
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
index 7d0a6704e..6294b5466 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
@@ -26,10 +26,10 @@ import android.databinding.ObservableInt
 import android.text.TextUtils
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
+import de.dreier.mytargets.base.db.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Dimension.Unit.MILLIMETER
 import de.dreier.mytargets.shared.models.Thumbnail
-import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.shared.models.db.ArrowImage
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
index 673049e35..acce40cca 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
@@ -21,9 +21,9 @@ import android.view.View
 import android.view.ViewGroup
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
+import de.dreier.mytargets.base.db.dao.BowDAO
 import de.dreier.mytargets.databinding.ItemImageDetailsBinding
 import de.dreier.mytargets.features.training.details.HtmlInfoBuilder
-import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.utils.Utils
 import de.dreier.mytargets.utils.multiselector.MultiSelector
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
index 150f0fd0e..5d9c4d0a7 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
@@ -16,10 +16,10 @@
 package de.dreier.mytargets.features.bows
 
 import android.os.Bundle
+import de.dreier.mytargets.base.db.dao.BowDAO
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.base.fragments.SelectPureListItemFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
-import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.db.Bow
 
 class BowListFragment : SelectPureListItemFragmentBase<Bow>(compareBy(Bow::name, Bow::id)) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
index d7633f42a..a40b5f315 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
@@ -29,6 +29,7 @@ import com.evernote.android.state.State
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.adapters.dynamicitem.DynamicItemAdapter
 import de.dreier.mytargets.base.adapters.dynamicitem.DynamicItemHolder
+import de.dreier.mytargets.base.db.dao.BowDAO
 import de.dreier.mytargets.base.fragments.EditWithImageFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.INTENT
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
@@ -36,7 +37,6 @@ import de.dreier.mytargets.databinding.FragmentEditBowBinding
 import de.dreier.mytargets.databinding.ItemSightMarkBinding
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.EBowType
-import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.shared.models.db.BowImage
 import de.dreier.mytargets.shared.models.db.SightMark
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
index fc902d39f..e00ffc5dd 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
@@ -24,13 +24,13 @@ import android.view.View
 import android.view.ViewGroup
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
+import de.dreier.mytargets.base.db.dao.BowDAO
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase
 import de.dreier.mytargets.base.fragments.ItemActionModeCallback
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.databinding.FragmentBowsBinding
 import de.dreier.mytargets.shared.models.EBowType
 import de.dreier.mytargets.shared.models.EBowType.*
-import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.utils.DividerItemDecoration
 import de.dreier.mytargets.utils.SlideInItemAnimator
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
index 374f8cea2..2a0122638 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
@@ -23,6 +23,7 @@ import android.view.View
 import android.view.ViewGroup
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
+import de.dreier.mytargets.base.db.dao.DimensionDAO
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.base.fragments.SelectItemFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
@@ -71,7 +72,7 @@ class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapter
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        val distances = Dimension.getAll(distance!!, unit!!)
+        val distances = DimensionDAO.getAll(distance!!, unit!!)
         return {
             adapter!!.setList(distances.toMutableList())
             selectItem(binding.recyclerView, distance!!)
diff --git a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
index 3f9d0dd84..4338e62d6 100644
--- a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
@@ -21,13 +21,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import de.dreier.mytargets.R
+import de.dreier.mytargets.base.db.dao.TrainingDAO
+import de.dreier.mytargets.base.db.dao.RoundDAO
 import de.dreier.mytargets.base.fragments.EditFragmentBase
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase.Companion.ITEM_ID
 import de.dreier.mytargets.databinding.FragmentEditRoundBinding
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.features.training.target.TargetListFragment
-import de.dreier.mytargets.shared.models.dao.RoundDAO
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.Utils
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
index dc2cc7303..a21cdeebb 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
@@ -37,6 +37,7 @@ import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.LinearLayout
 import de.dreier.mytargets.R
+import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.base.fragments.FragmentBase
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.databinding.FragmentScoreboardBinding
@@ -44,7 +45,6 @@ import de.dreier.mytargets.databinding.PartialScoreboardSignaturesBinding
 import de.dreier.mytargets.features.scoreboard.pdf.ViewPrintDocumentAdapter
 import de.dreier.mytargets.features.settings.ESettingsScreens
 import de.dreier.mytargets.features.settings.SettingsManager
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Signature
 import de.dreier.mytargets.shared.models.db.Training
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
index aad4e46a1..f37f5985c 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
@@ -25,12 +25,12 @@ import android.print.PageRange
 import android.support.annotation.RequiresApi
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.LinearLayout
+import de.dreier.mytargets.base.db.dao.TrainingDAO
+import de.dreier.mytargets.base.db.dao.RoundDAO
 import de.dreier.mytargets.features.scoreboard.builder.ViewBuilder
 import de.dreier.mytargets.features.scoreboard.layout.DefaultScoreboardLayout
 import de.dreier.mytargets.features.scoreboard.pdf.ViewPrintDocumentAdapter
 import de.dreier.mytargets.features.scoreboard.pdf.ViewToPdfWriter
-import de.dreier.mytargets.shared.models.dao.RoundDAO
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.utils.writeToJPGFile
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
index 73946f474..d14fe2ea0 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
@@ -25,8 +25,8 @@ import android.view.View
 import android.view.ViewGroup
 import com.afollestad.materialdialogs.MaterialDialog
 import de.dreier.mytargets.R
+import de.dreier.mytargets.base.db.dao.SignatureDAO
 import de.dreier.mytargets.databinding.FragmentSignatureBinding
-import de.dreier.mytargets.shared.models.dao.SignatureDAO
 import de.dreier.mytargets.shared.models.db.Signature
 
 class SignatureDialogFragment : DialogFragment() {
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
index 4fc0e209d..cc309a3a3 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
@@ -18,6 +18,7 @@ package de.dreier.mytargets.features.scoreboard.layout
 import android.content.Context
 import android.text.TextUtils
 import de.dreier.mytargets.R
+import de.dreier.mytargets.base.db.dao.*
 import de.dreier.mytargets.features.scoreboard.ScoreboardBuilder
 import de.dreier.mytargets.features.scoreboard.ScoreboardConfiguration
 import de.dreier.mytargets.features.scoreboard.builder.model.Table
@@ -25,7 +26,6 @@ import de.dreier.mytargets.features.scoreboard.builder.model.TextCell
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.SelectableZone
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.shared.models.dao.*
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.models.db.Training
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
index 82de928d8..f208aac09 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
@@ -18,15 +18,15 @@ package de.dreier.mytargets.features.statistics
 import android.annotation.SuppressLint
 import android.os.Parcelable
 import de.dreier.mytargets.R
+import de.dreier.mytargets.base.db.dao.ArrowDAO
+import de.dreier.mytargets.base.db.dao.TrainingDAO
+import de.dreier.mytargets.base.db.dao.EndDAO
+import de.dreier.mytargets.base.db.dao.RoundDAO
 import de.dreier.mytargets.shared.SharedApplicationInstance
 import de.dreier.mytargets.shared.analysis.aggregation.average.Average
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Score
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.shared.models.dao.ArrowDAO
-import de.dreier.mytargets.shared.models.dao.EndDAO
-import de.dreier.mytargets.shared.models.dao.RoundDAO
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.models.sum
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
index a080589e3..301b821d9 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
@@ -17,7 +17,7 @@ package de.dreier.mytargets.features.statistics
 
 import android.content.Context
 import de.dreier.mytargets.R
-import de.dreier.mytargets.shared.models.dao.*
+import de.dreier.mytargets.base.db.dao.*
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import org.threeten.bp.format.DateTimeFormatter
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
index 43b23315c..02daf9296 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
@@ -36,12 +36,12 @@ import com.evernote.android.state.State
 import com.evernote.android.state.StateSaver
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.activities.ChildActivityBase
+import de.dreier.mytargets.base.db.dao.ArrowDAO
+import de.dreier.mytargets.base.db.dao.TrainingDAO
+import de.dreier.mytargets.base.db.dao.BowDAO
+import de.dreier.mytargets.base.db.dao.RoundDAO
 import de.dreier.mytargets.databinding.ActivityStatisticsBinding
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.shared.models.dao.ArrowDAO
-import de.dreier.mytargets.shared.models.dao.BowDAO
-import de.dreier.mytargets.shared.models.dao.RoundDAO
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.utils.toSparseArray
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
index bddf083b5..38382fa10 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
@@ -34,6 +34,9 @@ import com.github.mikephil.charting.listener.OnChartValueSelectedListener
 import com.github.mikephil.charting.renderer.LineChartRenderer
 import com.github.mikephil.charting.utils.ColorTemplate
 import de.dreier.mytargets.R
+import de.dreier.mytargets.base.db.dao.TrainingDAO
+import de.dreier.mytargets.base.db.dao.EndDAO
+import de.dreier.mytargets.base.db.dao.RoundDAO
 import de.dreier.mytargets.base.fragments.FragmentBase
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.databinding.FragmentStatisticsBinding
@@ -42,9 +45,6 @@ import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.SelectableZone
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.shared.models.dao.EndDAO
-import de.dreier.mytargets.shared.models.dao.RoundDAO
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
index c01fc8a38..0b1094fbd 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
@@ -24,6 +24,8 @@ import android.view.*
 import com.afollestad.materialdialogs.MaterialDialog
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
+import de.dreier.mytargets.base.db.dao.EndDAO
+import de.dreier.mytargets.base.db.dao.RoundDAO
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase
 import de.dreier.mytargets.base.fragments.ItemActionModeCallback
 import de.dreier.mytargets.base.fragments.LoaderUICallback
@@ -31,8 +33,6 @@ import de.dreier.mytargets.databinding.FragmentListBinding
 import de.dreier.mytargets.databinding.ItemEndBinding
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
-import de.dreier.mytargets.shared.models.dao.EndDAO
-import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.utils.*
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
index 53f13af1b..85865f4e1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
@@ -19,9 +19,9 @@ import android.content.Context
 import android.text.Spanned
 import android.text.TextUtils
 import de.dreier.mytargets.R
-import de.dreier.mytargets.shared.models.dao.ArrowDAO
-import de.dreier.mytargets.shared.models.dao.BowDAO
-import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
+import de.dreier.mytargets.base.db.dao.ArrowDAO
+import de.dreier.mytargets.base.db.dao.BowDAO
+import de.dreier.mytargets.base.db.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.utils.Utils
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index d3dde0eb0..9cc61d982 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -25,14 +25,14 @@ import android.view.*
 import com.afollestad.materialdialogs.MaterialDialog
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
+import de.dreier.mytargets.base.db.dao.TrainingDAO
+import de.dreier.mytargets.base.db.dao.RoundDAO
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase
 import de.dreier.mytargets.base.fragments.ItemActionModeCallback
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.databinding.FragmentTrainingBinding
 import de.dreier.mytargets.databinding.ItemRoundBinding
 import de.dreier.mytargets.features.settings.SettingsManager
-import de.dreier.mytargets.shared.models.dao.RoundDAO
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
index 663724de1..5fd599ccc 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
@@ -26,6 +26,7 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.widget.DatePicker
 import de.dreier.mytargets.R
+import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.base.fragments.EditFragmentBase
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase.Companion.ITEM_ID
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
@@ -37,7 +38,6 @@ import de.dreier.mytargets.features.training.ETrainingType.TRAINING_WITH_STANDAR
 import de.dreier.mytargets.features.training.target.TargetListFragment
 import de.dreier.mytargets.shared.models.EBowType
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
index f750c7eb2..7067519be 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
@@ -42,11 +42,15 @@ import com.evernote.android.state.StateSaver
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.activities.ChildActivityBase
+import de.dreier.mytargets.base.db.dao.ArrowDAO
+import de.dreier.mytargets.base.db.dao.TrainingDAO
+import de.dreier.mytargets.base.db.dao.BowDAO
+import de.dreier.mytargets.base.db.dao.EndDAO
 import de.dreier.mytargets.base.gallery.GalleryActivity
 import de.dreier.mytargets.databinding.ActivityInputBinding
 import de.dreier.mytargets.features.settings.ESettingsScreens
 import de.dreier.mytargets.features.settings.SettingsManager
-import de.dreier.mytargets.shared.models.dao.*
+import de.dreier.mytargets.base.db.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
index 2adde0518..6aa4d7efc 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
@@ -25,6 +25,7 @@ import android.support.v4.content.LocalBroadcastManager
 import android.view.*
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.adapters.header.ExpandableListAdapter
+import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.base.fragments.ItemActionModeCallback
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.databinding.FragmentTrainingsBinding
@@ -32,7 +33,6 @@ import de.dreier.mytargets.databinding.ItemTrainingBinding
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.features.training.edit.EditTrainingFragment.Companion.CREATE_FREE_TRAINING_ACTION
 import de.dreier.mytargets.features.training.edit.EditTrainingFragment.Companion.CREATE_TRAINING_WITH_STANDARD_ROUND_ACTION
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.utils.DividerItemDecoration
 import de.dreier.mytargets.utils.MobileWearableClient.Companion.BROADCAST_CREATE_TRAINING_FROM_REMOTE
@@ -141,7 +141,7 @@ open class TrainingsFragment : ExpandableListFragment<Header, Training>() {
 
     private fun onStatistics(ids: List<Long>) {
         navigationController.navigateToStatistics(ids
-                .map { TrainingDAO.loadTrainingOrNull(it)!! }
+                .map { TrainingDAO.loadTraining(it) }
                 .flatMap { t -> TrainingDAO.loadRounds(t.id) }
                 .map { it.id })
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
index 432610fb5..72c7188b9 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
@@ -26,6 +26,7 @@ import com.evernote.android.state.State
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.adapters.dynamicitem.DynamicItemAdapter
 import de.dreier.mytargets.base.adapters.dynamicitem.DynamicItemHolder
+import de.dreier.mytargets.base.db.dao.StandardRoundDAO
 import de.dreier.mytargets.base.fragments.EditFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.INTENT
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
@@ -33,7 +34,6 @@ import de.dreier.mytargets.databinding.FragmentEditStandardRoundBinding
 import de.dreier.mytargets.databinding.ItemRoundTemplateBinding
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
-import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.StandardRound
 import de.dreier.mytargets.shared.utils.StandardRoundFactory
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
index be37e9ba2..2796e190a 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
@@ -29,6 +29,7 @@ import com.afollestad.materialdialogs.MaterialDialog
 import com.evernote.android.state.State
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.adapters.header.HeaderListAdapter
+import de.dreier.mytargets.base.db.dao.StandardRoundDAO
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.base.fragments.SelectItemFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
@@ -36,7 +37,6 @@ import de.dreier.mytargets.databinding.FragmentListBinding
 import de.dreier.mytargets.databinding.ItemStandardRoundBinding
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
-import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.utils.StandardRoundFactory
 import de.dreier.mytargets.shared.utils.contains
 import de.dreier.mytargets.utils.SlideInItemAnimator
@@ -86,7 +86,7 @@ class StandardRoundListFragment : SelectItemFragmentBase<AugmentedStandardRound,
             StandardRoundDAO.getAllSearch(query!!)
         } else {
             StandardRoundDAO.loadStandardRounds()
-        }.map { AugmentedStandardRound(it) }.toMutableList()
+        }.map { AugmentedStandardRound(it, StandardRoundDAO.loadRoundTemplates(it.id)) }.toMutableList()
         return {
             adapter!!.setList(data)
             selectItem(binding.recyclerView, currentSelection!!)
@@ -169,7 +169,7 @@ class StandardRoundListFragment : SelectItemFragmentBase<AugmentedStandardRound,
                 currentSelection = data.getParcelableExtra(ITEM)
                 reloadData()
             } else if (resultCode == EditStandardRoundFragment.RESULT_STANDARD_ROUND_DELETED) {
-                currentSelection = AugmentedStandardRound(StandardRoundDAO.loadStandardRound(32L))
+                currentSelection = StandardRoundDAO.loadAugmentedStandardRound(32L)
                 saveItem()
                 reloadData()
             }
diff --git a/app/src/main/java/de/dreier/mytargets/utils/AugmentedRoundUtils.kt b/app/src/main/java/de/dreier/mytargets/utils/AugmentedRoundUtils.kt
index 6c243b5d8..a91f52559 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/AugmentedRoundUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/AugmentedRoundUtils.kt
@@ -15,9 +15,9 @@
 
 package de.dreier.mytargets.utils
 
+import de.dreier.mytargets.base.db.dao.EndDAO
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
-import de.dreier.mytargets.shared.models.dao.EndDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Shot
 
diff --git a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
index 7a8d3714b..20aed688e 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
@@ -19,16 +19,17 @@ import com.google.android.gms.wearable.MessageEvent
 import com.google.android.gms.wearable.WearableListenerService
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
+import de.dreier.mytargets.base.db.dao.EndDAO
+import de.dreier.mytargets.base.db.dao.RoundDAO
+import de.dreier.mytargets.base.db.dao.StandardRoundDAO
+import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.Environment
+import de.dreier.mytargets.utils.addEnd
 import de.dreier.mytargets.shared.models.TimerSettings
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
 import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
-import de.dreier.mytargets.shared.models.dao.EndDAO
-import de.dreier.mytargets.shared.models.dao.RoundDAO
-import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.utils.unmarshall
diff --git a/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt b/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt
index e6afccba9..9fc85d136 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt
@@ -16,10 +16,10 @@
 package de.dreier.mytargets.utils
 
 import android.support.v4.util.Pair
+import de.dreier.mytargets.base.db.dao.EndDAO
+import de.dreier.mytargets.base.db.dao.RoundDAO
 import de.dreier.mytargets.shared.models.SelectableZone
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.shared.models.dao.EndDAO
-import de.dreier.mytargets.shared.models.dao.RoundDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.targets.scoringstyle.ArrowAwareScoringStyle
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
index 8ccb1ed86..af350402f 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
@@ -21,8 +21,8 @@ import android.content.Intent
 import android.databinding.DataBindingUtil
 import android.util.AttributeSet
 import de.dreier.mytargets.R
+import de.dreier.mytargets.base.db.dao.ArrowDAO
 import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
-import de.dreier.mytargets.shared.models.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 
 class ArrowSelector @JvmOverloads constructor(
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
index ee4b9c33c..d9674986b 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
@@ -21,8 +21,8 @@ import android.content.Intent
 import android.databinding.DataBindingUtil
 import android.util.AttributeSet
 import de.dreier.mytargets.R
+import de.dreier.mytargets.base.db.dao.BowDAO
 import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
-import de.dreier.mytargets.shared.models.dao.BowDAO
 import de.dreier.mytargets.shared.models.db.Bow
 
 class BowSelector @JvmOverloads constructor(
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
index 1cb002c00..4c24c73be 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
@@ -20,9 +20,9 @@ import android.databinding.DataBindingUtil
 import android.util.AttributeSet
 import android.view.View
 import de.dreier.mytargets.R
+import de.dreier.mytargets.base.db.dao.StandardRoundDAO
 import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
-import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 
 class StandardRoundSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null)
     : SelectorBase<AugmentedStandardRound>(context, attrs, R.layout.selector_item_image_details, STANDARD_ROUND_REQUEST_CODE) {
@@ -43,7 +43,7 @@ class StandardRoundSelector @JvmOverloads constructor(context: Context, attrs: A
         if (standardRound == null || StandardRoundDAO.loadRoundTemplates(standardRound.id).isEmpty()) {
             standardRound = StandardRoundDAO.loadStandardRoundOrNull(32L)
         }
-        setItem(AugmentedStandardRound(standardRound!!))
+        setItem(AugmentedStandardRound(standardRound!!, StandardRoundDAO.loadRoundTemplates(standardRound.id)))
     }
 
     companion object {
diff --git a/app/src/main/res/raw-af-rZA/help.html b/app/src/main/res/raw-af-rZA/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-af-rZA/help.html
+++ b/app/src/main/res/raw-af-rZA/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-ar-rSA/help.html b/app/src/main/res/raw-ar-rSA/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-ar-rSA/help.html
+++ b/app/src/main/res/raw-ar-rSA/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-ca-rES/help.html b/app/src/main/res/raw-ca-rES/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-ca-rES/help.html
+++ b/app/src/main/res/raw-ca-rES/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-cs-rCZ/help.html b/app/src/main/res/raw-cs-rCZ/help.html
index 17712ad4f..4e7545ef3 100644
--- a/app/src/main/res/raw-cs-rCZ/help.html
+++ b/app/src/main/res/raw-cs-rCZ/help.html
@@ -100,7 +100,7 @@ <h2>Statistiky</h2>
                         <li><strong>Linkový graf</strong>: Zobrazuje průměrné skóre šípů na sadu. Oranžové regresní čáry ukazují celkový trend. Graf lze zvětšit vodorovně dvěma prsty.</li>
                         <li><strong>Distribuční graf</strong>: Ukazuje rozložení šípů mezi dostupné kruhy. Není-li vybrán žádný segment, zobrazí se celkový počet zásahů a chyb. Klepnutím na segment se zobrazí přesný počet zásahů v této skupině.</li>
                         <li><strong>Rozptylový vzor</strong>: Zobrazuje všechny zásahy na jednom terči, dané spůsobem bodování (lze změnit v nastavení aplikace). Pokud klepnete na rozptylový vzor, získáte zvětšení rozptylového vzoru. Z obrazovky podrobnosti můžete také sdílet obrázek rozptylového vzoru, nebo ho vytisknout.</li>
-                        <li><strong>Hodnocení šípu</strong>: Pokud jste použili funkci číslování šípů v jednom z vybraných tréninků, je tato tabulka zobrazena níže. Šípy s nejlepším seskupením jsou umístěny v horní části seznamu. Klepnutím na číslo šípu se dostanete k rozptylovému vzoru, který zobrazuje pouze zásahy vybraného šípu.</li>
+                        <li><strong>Hodnocení šípu</strong>: Pokud jste použili funkci číslování šípů v jednom z vybraných tréninků, je tato tabulka zobrazena níže. The arrows with the best average score are placed at the top of the list. Klepnutím na číslo šípu se dostanete k rozptylovému vzoru, který zobrazuje pouze zásahy vybraného šípu.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-da-rDK/help.html b/app/src/main/res/raw-da-rDK/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-da-rDK/help.html
+++ b/app/src/main/res/raw-da-rDK/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-de-rDE/help.html b/app/src/main/res/raw-de-rDE/help.html
index c8d13876e..687385cd0 100644
--- a/app/src/main/res/raw-de-rDE/help.html
+++ b/app/src/main/res/raw-de-rDE/help.html
@@ -100,7 +100,7 @@ <h2>Statistiken</h2>
                         <li><strong>Liniendiagramm</strong>: Zeigt die durchschnittliche Punktzahl pro Pfeil pro Passe. Die orange Regressionslinie zeigt den allgemeinen Trend. Das Diagramm kann durch eine Pinch-Geste (horizontales Spreizen zweier Finger) gezoomt werden.</li>
                         <li><strong>Verteilungs Diagramm</strong>: Zeigt die Verteilung der Pfeile über die möglichen Ringe. Wenn kein Segment ausgewählt ist, wird die Gesamtanzahl an Treffern und Fehlschüssen angezeigt. Durch Tippen auf ein Segment wird die genaue Anzahl an Schüssen in dieser Kategorie angezeigt.</li>
                         <li><strong>Trefferbild</strong>: Zeigt alle Schüsse auf einer Auflage einschließlich der ausgewählten Gruppierungs-Methode (kann in den App Einstellungen angepasst werden). Wenn du auf das Trefferbild tippst bekommst du eine größere Version des Trefferbildes. In der Detailansicht kannst du das Trefferbild auch teilen oder ausdrucken.</li>
-                        <li><strong>Arrow ranking</strong>: Wenn du das Pfeile Nummerieren in einem der ausgewählten Trainings benutzt hast werden zusätzlich die Pfeil-Rankings unten aufgeführt. Die Pfeile mit der besten Gruppierung landen oben in der Liste. Durch Tippen auf eine Pfeil-Nummer gelangst du zu einem Trefferbild, das nur die Schüsse des ausgewählten Pfeils zeigt.</li>
+                        <li><strong>Arrow ranking</strong>: Wenn du das Pfeile Nummerieren in einem der ausgewählten Trainings benutzt hast werden zusätzlich die Pfeil-Rankings unten aufgeführt. Die Pfeile mit der besten durchschnittlichen Punktzahl landen oben in der Liste. Durch Tippen auf eine Pfeil-Nummer gelangst du zu einem Trefferbild, das nur die Schüsse des ausgewählten Pfeils zeigt.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-el-rGR/help.html b/app/src/main/res/raw-el-rGR/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-el-rGR/help.html
+++ b/app/src/main/res/raw-el-rGR/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-es-rES/help.html b/app/src/main/res/raw-es-rES/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-es-rES/help.html
+++ b/app/src/main/res/raw-es-rES/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-et-rEE/help.html b/app/src/main/res/raw-et-rEE/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-et-rEE/help.html
+++ b/app/src/main/res/raw-et-rEE/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-fi-rFI/help.html b/app/src/main/res/raw-fi-rFI/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-fi-rFI/help.html
+++ b/app/src/main/res/raw-fi-rFI/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-fr-rFR/help.html b/app/src/main/res/raw-fr-rFR/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-fr-rFR/help.html
+++ b/app/src/main/res/raw-fr-rFR/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-hu-rHU/help.html b/app/src/main/res/raw-hu-rHU/help.html
index caaa020a4..4c647eed5 100644
--- a/app/src/main/res/raw-hu-rHU/help.html
+++ b/app/src/main/res/raw-hu-rHU/help.html
@@ -100,7 +100,7 @@ <h2>Statisztika</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-in-rID/help.html b/app/src/main/res/raw-in-rID/help.html
index 903d9c1ab..ea6ce792f 100644
--- a/app/src/main/res/raw-in-rID/help.html
+++ b/app/src/main/res/raw-in-rID/help.html
@@ -100,7 +100,7 @@ <h2>Statistik</h2>
                         <li><strong> Diagram garis </ 0> : Menunjukkan nilai rata-rata per panah per akhir. Garis regresi linier oranye menunjukkan keseluruhan tren. Bagan dapat diperbesar dengan mencubit dua jari secara horizontal.</li>
                         <li><strong> Bagan distribusi </ 0> : Menampilkan distribusi panah di antara dering yang tersedia. Jika tidak ada segmen yang dipilih, jumlah keseluruhan hit dan rindu ditampilkan. Dengan mengetuk segmen, jumlah tembakan yang tepat dalam kategori ini akan ditampilkan.</li>
                         <li><strong> Pola dispersi </ 0> : Menampilkan semua gambar pada satu wajah target termasuk metode pengelompokan yang dipilih (dapat diubah di setelan aplikasi). Jika Anda menyentuh pola dispersi, Anda mendapatkan versi pola dispersi yang lebih besar. Dari layar detail Anda juga bisa berbagi gambar pola dispersi atau mencetaknya.</li>
-                        <li><strong> Peringkat panah </ 0> : Jika Anda telah menggunakan fitur penomoran panah di salah satu pelatihan yang dipilih, peringkat panah ditunjukkan di bawah ini. Panah dengan pengelompokan terbaik ditempatkan di bagian atas daftar. Mengetuk nomor panah akan membawa Anda ke pola dispersi, yang hanya menampilkan gambar panah yang dipilih.</li>
+                        <li><strong> Peringkat panah </ 0> : Jika Anda telah menggunakan fitur penomoran panah di salah satu pelatihan yang dipilih, peringkat panah ditunjukkan di bawah ini. The arrows with the best average score are placed at the top of the list. Mengetuk nomor panah akan membawa Anda ke pola dispersi, yang hanya menampilkan gambar panah yang dipilih.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-it-rIT/help.html b/app/src/main/res/raw-it-rIT/help.html
index 7c5ffeb8e..faa01c884 100644
--- a/app/src/main/res/raw-it-rIT/help.html
+++ b/app/src/main/res/raw-it-rIT/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-iw-rIL/help.html b/app/src/main/res/raw-iw-rIL/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-iw-rIL/help.html
+++ b/app/src/main/res/raw-iw-rIL/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-ja-rJP/help.html b/app/src/main/res/raw-ja-rJP/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-ja-rJP/help.html
+++ b/app/src/main/res/raw-ja-rJP/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-ko-rKR/help.html b/app/src/main/res/raw-ko-rKR/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-ko-rKR/help.html
+++ b/app/src/main/res/raw-ko-rKR/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-nl-rNL/help.html b/app/src/main/res/raw-nl-rNL/help.html
index 1cf8b7b8a..d07288d2d 100644
--- a/app/src/main/res/raw-nl-rNL/help.html
+++ b/app/src/main/res/raw-nl-rNL/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-no-rNO/help.html b/app/src/main/res/raw-no-rNO/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-no-rNO/help.html
+++ b/app/src/main/res/raw-no-rNO/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-pl-rPL/help.html b/app/src/main/res/raw-pl-rPL/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-pl-rPL/help.html
+++ b/app/src/main/res/raw-pl-rPL/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-pt-rBR/help.html b/app/src/main/res/raw-pt-rBR/help.html
index c2e1eb4dd..eae813d5d 100644
--- a/app/src/main/res/raw-pt-rBR/help.html
+++ b/app/src/main/res/raw-pt-rBR/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-pt-rPT/help.html b/app/src/main/res/raw-pt-rPT/help.html
index c2e1eb4dd..eae813d5d 100644
--- a/app/src/main/res/raw-pt-rPT/help.html
+++ b/app/src/main/res/raw-pt-rPT/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-ro-rRO/help.html b/app/src/main/res/raw-ro-rRO/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-ro-rRO/help.html
+++ b/app/src/main/res/raw-ro-rRO/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-ru-rRU/help.html b/app/src/main/res/raw-ru-rRU/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-ru-rRU/help.html
+++ b/app/src/main/res/raw-ru-rRU/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-sk-rSK/help.html b/app/src/main/res/raw-sk-rSK/help.html
index 218f9887e..ee829dc29 100644
--- a/app/src/main/res/raw-sk-rSK/help.html
+++ b/app/src/main/res/raw-sk-rSK/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-sl-rSI/help.html b/app/src/main/res/raw-sl-rSI/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-sl-rSI/help.html
+++ b/app/src/main/res/raw-sl-rSI/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-sr-rSP/help.html b/app/src/main/res/raw-sr-rSP/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-sr-rSP/help.html
+++ b/app/src/main/res/raw-sr-rSP/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-sv-rSE/help.html b/app/src/main/res/raw-sv-rSE/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-sv-rSE/help.html
+++ b/app/src/main/res/raw-sv-rSE/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-tr-rTR/help.html b/app/src/main/res/raw-tr-rTR/help.html
index 27c3192cd..bf27ffa49 100644
--- a/app/src/main/res/raw-tr-rTR/help.html
+++ b/app/src/main/res/raw-tr-rTR/help.html
@@ -100,7 +100,7 @@ <h2>Istatistik</h2>
                         <li><strong> Çizgi grafik </ 0>: Her bir ok başına ortalama puanı gösterir. Turuncu doğrusal regresyon çizgisi genel eğilimi göstermektedir. Grafiği, iki parmağınızı yatay olarak sıkıştırarak büyütülebilir.</li>
                         <li><strong> Dağıtım grafiği </ 0>: Mevcut halkalar arasında okların dağılımını gösterir. Hiçbir segment seçilmezse, toplam isabet ve kaçırma sayısı gösterilir. Bir segmente dokunarak bu kategorideki kesin çekim sayısı gösterilir.</li>
                         <li><strong> Dağılım deseni </ 0>: Seçilen gruplama yöntemi de dahil olmak üzere tek bir hedef yüzdeki tüm çekimleri gösterir (uygulamanın ayarlarında değiştirilebilir). Dağılım modeline dokunduğunuzda dağılım modelinin daha büyük bir versiyonunu elde edersiniz. Ayrıntılar ekranından, dağılım deseni görüntüsünü paylaşabilir veya yazdırabilirsiniz.</li>
-                        <li><strong> Ok Sıralama </ 0>: Seçilen eğitimlerden birinde ok numaralandırma özelliğini kullandıysanız, ok sıralaması aşağıda gösterilmiştir. En iyi gruplandırılmış oklar listenin başına yerleştirilir. Bir ok numarasına dokunmak, sizi yalnızca seçilen okun çekimlerini gösteren bir dağılım modeline götürür.</li>
+                        <li><strong> Ok Sıralama </ 0>: Seçilen eğitimlerden birinde ok numaralandırma özelliğini kullandıysanız, ok sıralaması aşağıda gösterilmiştir. The arrows with the best average score are placed at the top of the list. Bir ok numarasına dokunmak, sizi yalnızca seçilen okun çekimlerini gösteren bir dağılım modeline götürür.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-uk-rUA/help.html b/app/src/main/res/raw-uk-rUA/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-uk-rUA/help.html
+++ b/app/src/main/res/raw-uk-rUA/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-vi-rVN/help.html b/app/src/main/res/raw-vi-rVN/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-vi-rVN/help.html
+++ b/app/src/main/res/raw-vi-rVN/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-zh-rCN/help.html b/app/src/main/res/raw-zh-rCN/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-zh-rCN/help.html
+++ b/app/src/main/res/raw-zh-rCN/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-zh-rTW/help.html b/app/src/main/res/raw-zh-rTW/help.html
index 1b02bc801..e92e3bdac 100644
--- a/app/src/main/res/raw-zh-rTW/help.html
+++ b/app/src/main/res/raw-zh-rTW/help.html
@@ -100,7 +100,7 @@ <h2>Statistics</h2>
                         <li><strong>Line chart</strong>: Shows the average score per arrow per end. The orange linear regression line shows the overall trend. The chart can be zoomed by pinching two fingers horizontally.</li>
                         <li><strong>Distribution chart</strong>: Shows the distribution of arrows amongst the available rings. If no segment is selected, the overall count of hits and misses is shown. By tapping on a segment the exact number of shots in this category is shown.</li>
                         <li><strong>Dispersion pattern</strong>: Shows all shots on a single target face including the selected grouping method (can be changed in the app's settings). If you tap on the dispersion pattern you get a bigger version of the dispersion pattern. From the details screen you can also share the dispersion pattern image or print it.</li>
-                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best grouping are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
+                        <li><strong>Arrow ranking</strong>: If you have used the arrow numbering feature in one of the selected trainings, the arrow rankings are shown below. The arrows with the best average score are placed at the top of the list. Tapping on an arrow number takes you to a dispersion pattern, which only shows the shots of the selected arrow.</li>
                     </ul>
                 </details>
                 <details>
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 2c68391f0..cc0f7f3c1 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Options</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 604313c4f..44b05e594 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Options</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 0ab7d55dd..98bf31b5c 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Opcions</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 0b6433f85..f08388b68 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Možnosti</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 1d388f547..29263e20a 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Indstillinger</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 43db1d65d..da2538d12 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Einstellungen</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 2c68391f0..cc0f7f3c1 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Options</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b2ea4a057..1280759ea 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Opciones</string>
@@ -327,8 +325,8 @@
   <string name="show_arrow_average">Mostrar promedio de Flechas</string>
   <string name="image_deleted">Imagen borrada</string>
   <string name="delete_image">¿Borrar imagen?</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
+  <string name="keyboard_type">Tipo de teclado</string>
+  <string name="keyboard_enabled">Teclado habilitado</string>
   <string name="sort_shots">Sort shots</string>
   <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
   <string name="target_captain">Target captain</string>
@@ -338,31 +336,31 @@
   <string name="drawer_close">Close drawer</string>
   <string name="help">Help</string>
   <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
+  <string name="click_to_enter_profile">Haz Click para la informacion del perfil</string>
+  <string name="no_trainings">No tienes ningun entrenamiento todavía!</string>
+  <string name="no_bows">Sin Arcos</string>
+  <string name="no_arrows">Sin Flechas</string>
+  <string name="version_info">Información de la versión</string>
+  <string name="version_prefix">Versión</string>
+  <string name="max_arrow_number">Numero máximo de Flecha</string>
+  <string name="distances">Distancias</string>
+  <string name="diameters">Diametros</string>
+  <string name="bows">Arcos</string>
+  <string name="reset">Resetear</string>
   <string name="end_x_of_y">Tanda %1$d/%2$d</string>
   <string name="round_x_of_y">Serie %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
+  <string name="settings_summary_timer">Ajustar el comportamiento del reloj de tiro</string>
+  <string name="settings_summary_scoreboard">Cambiar la apariencia del marcador</string>
+  <string name="settings_summary_input">Customizar la pantalla de entrada</string>
+  <string name="settings_summary_overview">Personalizar la información mostrada para entrenamientos, entradas y rondas</string>
+  <string name="settings_summary_profile">Introducir información personal</string>
+  <string name="licence_number">Nº de Licencia</string>
+  <string name="file_type">Tipo de Archivo</string>
+  <string name="clear">Limpiar</string>
+  <string name="tap_to_sign">Pulsa para iniciar sesión</string>
+  <string name="pdf_file">Archivo PDF</string>
+  <string name="image_file">Archivo de imagen</string>
+  <string name="settings_summary_statistics">Ajustar la pantalla de estadísticas</string>
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
+  <string name="keep_above_lockscreen">Mantener sobre la pantalla de bloqueo</string>
 </resources>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index c38812f66..335d5b18b 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Seaded</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 4a67548b6..eb132ffb2 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Asetukset</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e03008129..ed2b68413 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Options</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index b348dc350..b7a8d0de2 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Beállítások</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 28320c77c..b38dcac7b 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Opsi</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 971cb2ae4..83dc0eb42 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Opzioni</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index c1e8ace9c..91884f744 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">אפשרויות</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 147787829..d53896132 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">設定</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index c75b25ad1..ef0811195 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Options</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index c33de0153..7bb03ecd2 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Opties</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 7e9c282c0..bbae02289 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Instillinger</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 1f0981cbd..2eee057f0 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Opcje</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 490b286c6..8b446e786 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Opções</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 879a0863b..3b579ff60 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Opções</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 2751eae43..4b4cbfbee 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Options</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index fefc430ae..68bca210b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Список опций</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index da6d0e3d3..6ca04118a 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Možnosti</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 4d1e395ff..3daecb7ea 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Možnosti</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 2751eae43..4b4cbfbee 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Options</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 67dd612d0..eef20bd04 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Inställningar</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 492e58c3b..33d693084 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Ayarlar</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 3ed920dca..4fe3b775a 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Налаштування</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index c75b25ad1..ef0811195 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">Options</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 41ca89da6..8c3d0a28e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">选项</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 83f47648a..259e3d944 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- General -->
   <string name="preferences">選擇</string>
diff --git a/shared/build.gradle b/shared/build.gradle
index c8452bf3b..dcc8f0527 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -58,7 +58,6 @@ dependencies {
     kapt dependencies.dbFlowProcessor
     implementation dependencies.dbFlowCore
     implementation dependencies.dbFlow
-    implementation dependencies.dbFlowKotlinExtensions
 
     implementation dependencies.androidState
     kapt dependencies.androidStateProcessor
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
index 6e0cc9a29..042dad78f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
@@ -16,241 +16,12 @@
 package de.dreier.mytargets.shared
 
 import com.raizlabs.android.dbflow.annotation.Database
-import com.raizlabs.android.dbflow.annotation.Migration
-import com.raizlabs.android.dbflow.kotlinextensions.delete
-import com.raizlabs.android.dbflow.kotlinextensions.save
-import com.raizlabs.android.dbflow.sql.language.SQLite
-import com.raizlabs.android.dbflow.sql.migration.BaseMigration
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
-import de.dreier.mytargets.shared.models.Image
-import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
-import de.dreier.mytargets.shared.models.db.*
-import de.dreier.mytargets.shared.utils.StandardRoundFactory
-import de.dreier.mytargets.shared.utils.moveTo
-import java.io.File
-import java.io.IOException
 
 @Database(name = AppDatabase.NAME, version = AppDatabase.VERSION, foreignKeyConstraintsEnforced = true)
 object AppDatabase {
 
     const val NAME = "database"
-    const val DATABASE_FILE_NAME = "database.db"
+    const val DATABASE_FILE_NAME = "$NAME.db"
     const val DATABASE_IMPORT_FILE_NAME = "database"
     const val VERSION = 26
-
-    @Migration(version = 0, database = AppDatabase::class)
-    class Migration0 : BaseMigration() {
-
-        override fun migrate(database: DatabaseWrapper) {
-            fillStandardRound(database)
-            createScoreTriggers(database)
-        }
-    }
-
-    @Migration(version = 26, database = AppDatabase::class)
-    class Migration26 : BaseMigration() {
-
-        override fun migrate(database: DatabaseWrapper) {
-            database.execSQL("ALTER TABLE `Training` ADD COLUMN scoreReachedPoints INTEGER;")
-            database.execSQL("ALTER TABLE `Training` ADD COLUMN scoreTotalPoints INTEGER;")
-            database.execSQL("ALTER TABLE `Training` ADD COLUMN scoreShotCount INTEGER;")
-
-            database.execSQL("ALTER TABLE `Round` ADD COLUMN scoreReachedPoints INTEGER;")
-            database.execSQL("ALTER TABLE `Round` ADD COLUMN scoreTotalPoints INTEGER;")
-            database.execSQL("ALTER TABLE `Round` ADD COLUMN scoreShotCount INTEGER;")
-
-            database.execSQL("ALTER TABLE `End` ADD COLUMN scoreReachedPoints INTEGER;")
-            database.execSQL("ALTER TABLE `End` ADD COLUMN scoreTotalPoints INTEGER;")
-            database.execSQL("ALTER TABLE `End` ADD COLUMN scoreShotCount INTEGER;")
-
-            createScoreTriggers(database)
-
-            val rounds = SQLite.select().from(Round::class.java).queryList(database)
-            for (round in rounds) {
-                val target = round.target
-                val ends = SQLite.select().from(End::class.java).where(End_Table.round.eq(round.id))
-                        .queryList(database)
-                for (end in ends) {
-                    val shots = SQLite.select().from(Shot::class.java)
-                            .where(Shot_Table.end.eq(end.id))
-                            .orderBy(Shot_Table.index, true)
-                            .queryList(database)
-                    end.score = target.getReachedScore(shots)
-                    end.save(database)
-                }
-            }
-        }
-    }
-
-    private fun createScoreTriggers(database: DatabaseWrapper) {
-        database.execSQL("CREATE TRIGGER round_sum_score " +
-                "AFTER UPDATE ON `End` " +
-                "BEGIN " +
-                "UPDATE `Round` SET " +
-                "scoreReachedPoints = (SELECT SUM(scoreReachedPoints) FROM `End` WHERE round = NEW.round), " +
-                "scoreTotalPoints = (SELECT SUM(scoreTotalPoints) FROM `End` WHERE round = NEW.round), " +
-                "scoreShotCount = (SELECT SUM(scoreShotCount) FROM `End` WHERE round = NEW.round) " +
-                "WHERE _id = NEW.round;" +
-                "END;")
-
-        database.execSQL("CREATE TRIGGER training_sum_score " +
-                "AFTER UPDATE ON `Round` " +
-                "BEGIN " +
-                "UPDATE `Training` SET " +
-                "scoreReachedPoints = (SELECT SUM(scoreReachedPoints) FROM `Round` WHERE training = NEW.training), " +
-                "scoreTotalPoints = (SELECT SUM(scoreTotalPoints) FROM `Round` WHERE training = NEW.training), " +
-                "scoreShotCount = (SELECT SUM(scoreShotCount) FROM `Round` WHERE training = NEW.training) " +
-                "WHERE _id = NEW.training;" +
-                "END;")
-    }
-
-    @Migration(version = 22, database = AppDatabase::class)
-    class Migration22 : BaseMigration() {
-
-        override fun migrate(database: DatabaseWrapper) {
-            fillStandardRound(database)
-        }
-    }
-
-    @Migration(version = 23, database = AppDatabase::class)
-    class Migration23 : BaseMigration() {
-
-        override fun migrate(database: DatabaseWrapper) {
-            removeFilePath(database, EndImage::class.java,
-                    { endImage, db -> endImage.save(db) },
-                    { endImage, db -> endImage.delete(db) })
-            removeFilePath(database, BowImage::class.java,
-                    { bowImage, db -> bowImage.save(db) },
-                    { bowImage, db -> bowImage.delete(db) })
-            removeFilePath(database, ArrowImage::class.java,
-                    { arrowImage, db -> arrowImage.save(db) },
-                    { arrowImage, db -> arrowImage.delete(db) })
-        }
-
-        private fun <T> removeFilePath(database: DatabaseWrapper, clazz: Class<out T>,
-                                       save: (T, DatabaseWrapper) -> Boolean,
-                                       delete: (T, DatabaseWrapper) -> Boolean) where T : Image {
-            val images = SQLite.select().from(clazz).queryList(database)
-            for (image in images) {
-                val filesDir = SharedApplicationInstance.context.filesDir
-                var imageFile = File(filesDir, image.fileName)
-
-                val imageFromSomewhere = File(image.fileName)
-                val imageFileFromSomewhere = File(filesDir, imageFromSomewhere.name)
-
-                // If imagePath is just the name and is placed inside files directory or
-                // In case the image was already copied to the files, but does still contain the wrong path
-                if (imageFile.exists() || imageFileFromSomewhere.exists()) {
-                    image.fileName = imageFile.name
-                    save(image, database)
-                    continue
-                }
-
-                // In case the image is placed somewhere else, but still exists
-                if (imageFromSomewhere.exists()) {
-                    try {
-                        imageFile = File
-                                .createTempFile("img", imageFromSomewhere.name, filesDir)
-                        imageFromSomewhere.moveTo(imageFile)
-                        image.fileName = imageFile.name
-                        save(image, database)
-                    } catch (e: IOException) {
-                        e.printStackTrace()
-                    }
-
-                } else {
-                    delete(image, database)
-                }
-            }
-        }
-    }
-
-    private fun fillStandardRound(db: DatabaseWrapper) {
-        val standardRounds = StandardRoundFactory.initTable()
-        for (standardRound in standardRounds) {
-            StandardRoundDAO.saveStandardRound(db, standardRound.standardRound, standardRound.roundTemplates)
-        }
-    }
-
-    @Migration(version = 3, database = AppDatabase::class)
-    class Migration3 : BaseMigration() {
-
-        override fun migrate(database: DatabaseWrapper) {
-            database.execSQL("ALTER TABLE SHOOT ADD COLUMN x REAL")
-            database.execSQL("ALTER TABLE SHOOT ADD COLUMN y REAL")
-            val cur = database.rawQuery("SELECT s._id, s.points, r.target " +
-                    "FROM SHOOT s, PASSE p, ROUND r " +
-                    "WHERE s.passe=p._id " +
-                    "AND p.round=r._id", null)
-            if (cur.moveToFirst()) {
-                do {
-                    val shoot = cur.getInt(0)
-                    database.execSQL("UPDATE SHOOT SET x=0, y=0 WHERE _id=" + shoot)
-                } while (cur.moveToNext())
-            }
-            cur.close()
-        }
-    }
-
-    @Migration(version = 4, database = AppDatabase::class)
-    class Migration4 : BaseMigration() {
-
-        override fun migrate(database: DatabaseWrapper) {
-            database.execSQL(
-                    "CREATE TABLE IF NOT EXISTS VISIER ( _id INTEGER PRIMARY KEY AUTOINCREMENT," +
-                            "bow REFERENCES BOW ON DELETE CASCADE," +
-                            "distance INTEGER," +
-                            "setting TEXT);")
-            val valuesMetric = intArrayOf(10, 15, 18, 20, 25, 30, 40, 50, 60, 70, 90)
-            for (table in arrayOf("ROUND", "VISIER")) {
-                for (i in 10 downTo 0) {
-                    database.execSQL("UPDATE " + table + " SET distance=" +
-                            valuesMetric[i] + " WHERE distance=" + i)
-                }
-            }
-            database.execSQL("ALTER TABLE BOW ADD COLUMN height TEXT DEFAULT '';")
-        }
-    }
-
-    @Migration(version = 6, database = AppDatabase::class)
-    class Migration6 : BaseMigration() {
-
-        override fun migrate(database: DatabaseWrapper) {
-            val filesDir = SharedApplicationInstance.context.filesDir
-
-            // Migrate all bow images
-            var cur = database.rawQuery("SELECT image FROM BOW WHERE image IS NOT NULL", null)
-            if (cur.moveToFirst()) {
-                val fileName = cur.getString(0)
-                try {
-                    val file = File.createTempFile("img_", ".png", filesDir)
-                    File(fileName).copyTo(file)
-                    database.execSQL(
-                            "UPDATE BOW SET image=\"" + file.name + "\" WHERE image=\"" +
-                                    fileName + "\"")
-                } catch (e: IOException) {
-                    e.printStackTrace()
-                }
-
-            }
-            cur.close()
-
-            // Migrate all arrows images
-            cur = database.rawQuery("SELECT image FROM ARROW WHERE image IS NOT NULL", null)
-            if (cur.moveToFirst()) {
-                val fileName = cur.getString(0)
-                try {
-                    val file = File.createTempFile("img_", ".png", filesDir)
-                    File(fileName).copyTo(file)
-                    database.execSQL(
-                            "UPDATE ARROW SET image=\"" + file.name + "\" WHERE image=\"" +
-                                    fileName + "\"")
-                } catch (e: IOException) {
-                    e.printStackTrace()
-                }
-
-            }
-            cur.close()
-        }
-    }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Dimension.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Dimension.kt
index 716db1e91..5b246a4da 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Dimension.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Dimension.kt
@@ -16,12 +16,9 @@ package de.dreier.mytargets.shared.models
 
 import android.annotation.SuppressLint
 import android.os.Parcelable
-import com.raizlabs.android.dbflow.sql.language.SQLite
 import de.dreier.mytargets.shared.R
 import de.dreier.mytargets.shared.SharedApplicationInstance
-import de.dreier.mytargets.shared.models.db.*
 import kotlinx.android.parcel.Parcelize
-import java.util.*
 
 @SuppressLint("ParcelCreator")
 @Parcelize
@@ -102,51 +99,6 @@ data class Dimension(val value: Float, val unit: Unit?) : IIdProvider, Comparabl
         fun from(value: Float, unit: String?): Dimension {
             return from(value, Unit.from(unit))
         }
-
-        /**
-         * Returns a list of all distances that are either default values or used somewhere in the app
-         *
-         * @param distance Distance to add to the list (current selected value)
-         * @param unit     Distances are only returned which match the specified unit
-         * @return List of distances
-         */
-        fun getAll(distance: Dimension, unit: Unit): List<Dimension> {
-            val distances = HashSet<Dimension>()
-
-            distances.add(Dimension.UNKNOWN)
-
-            // Add currently selected distance to list
-            if (distance.unit == unit) {
-                distances.add(distance)
-            }
-
-            // Get all distances used in Round or SightMark table
-            distances.addAll(SQLite
-                    .select(SightMark_Table.distance)
-                    .from(SightMark::class.java)
-                    .queryList()
-                    .map { it.distance }
-                    .filter { it.unit == unit }
-                    .toSet())
-
-            distances.addAll(SQLite
-                    .select(RoundTemplate_Table.distance)
-                    .from(RoundTemplate::class.java)
-                    .queryList()
-                    .map { it.distance }
-                    .filter { it.unit == unit }
-                    .toSet())
-
-            distances.addAll(SQLite
-                    .select(Round_Table.distance)
-                    .from(Round::class.java)
-                    .queryList()
-                    .map { it.distance }
-                    .filter { it.unit == unit }
-                    .toSet())
-
-            return ArrayList(distances)
-        }
     }
 }
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedStandardRound.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedStandardRound.kt
index a6ea86bcb..5f89541bf 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedStandardRound.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedStandardRound.kt
@@ -21,7 +21,6 @@ import android.os.Parcel
 import android.os.Parcelable
 import de.dreier.mytargets.shared.R
 import de.dreier.mytargets.shared.models.IIdProvider
-import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.StandardRound
@@ -35,8 +34,6 @@ data class AugmentedStandardRound(
     override val id: Long
         get() = standardRound.id
 
-    constructor(standardRound: StandardRound) : this(standardRound, StandardRoundDAO.loadRoundTemplates(standardRound.id))
-
     val targetDrawable: Drawable
         get() {
             val targets = roundTemplates.map { it.targetTemplate.drawable }
diff --git a/shared/src/main/res/values-af/rounds.xml b/shared/src/main/res/values-af/rounds.xml
index e931bf6b4..8cc6d7b64 100644
--- a/shared/src/main/res/values-af/rounds.xml
+++ b/shared/src/main/res/values-af/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-af/strings.xml b/shared/src/main/res/values-af/strings.xml
index 4a0317db1..e300885a2 100644
--- a/shared/src/main/res/values-af/strings.xml
+++ b/shared/src/main/res/values-af/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-af/target_faces.xml b/shared/src/main/res/values-af/target_faces.xml
index d75138f40..f7e59fc25 100644
--- a/shared/src/main/res/values-af/target_faces.xml
+++ b/shared/src/main/res/values-af/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-ar/rounds.xml b/shared/src/main/res/values-ar/rounds.xml
index e931bf6b4..8cc6d7b64 100644
--- a/shared/src/main/res/values-ar/rounds.xml
+++ b/shared/src/main/res/values-ar/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-ar/strings.xml b/shared/src/main/res/values-ar/strings.xml
index c5b95d823..065a7d164 100644
--- a/shared/src/main/res/values-ar/strings.xml
+++ b/shared/src/main/res/values-ar/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-ar/target_faces.xml b/shared/src/main/res/values-ar/target_faces.xml
index d75138f40..f7e59fc25 100644
--- a/shared/src/main/res/values-ar/target_faces.xml
+++ b/shared/src/main/res/values-ar/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-ca/rounds.xml b/shared/src/main/res/values-ca/rounds.xml
index e931bf6b4..8cc6d7b64 100644
--- a/shared/src/main/res/values-ca/rounds.xml
+++ b/shared/src/main/res/values-ca/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-ca/strings.xml b/shared/src/main/res/values-ca/strings.xml
index c42475b11..73399888a 100644
--- a/shared/src/main/res/values-ca/strings.xml
+++ b/shared/src/main/res/values-ca/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Arc recorbat</string>
   <string name="compound_bow">Arc compost</string>
diff --git a/shared/src/main/res/values-ca/target_faces.xml b/shared/src/main/res/values-ca/target_faces.xml
index d75138f40..f7e59fc25 100644
--- a/shared/src/main/res/values-ca/target_faces.xml
+++ b/shared/src/main/res/values-ca/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-cs/rounds.xml b/shared/src/main/res/values-cs/rounds.xml
index e3eb62d5b..b60c67436 100644
--- a/shared/src/main/res/values-cs/rounds.xml
+++ b/shared/src/main/res/values-cs/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-cs/strings.xml b/shared/src/main/res/values-cs/strings.xml
index 8bdc6220f..0b01cad53 100644
--- a/shared/src/main/res/values-cs/strings.xml
+++ b/shared/src/main/res/values-cs/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Reflexní luk</string>
   <string name="compound_bow">Kladkový luk</string>
diff --git a/shared/src/main/res/values-cs/target_faces.xml b/shared/src/main/res/values-cs/target_faces.xml
index 1631a31d3..d4e346017 100644
--- a/shared/src/main/res/values-cs/target_faces.xml
+++ b/shared/src/main/res/values-cs/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Klasický</string>
diff --git a/shared/src/main/res/values-da/rounds.xml b/shared/src/main/res/values-da/rounds.xml
index a53309924..cb572fbb9 100644
--- a/shared/src/main/res/values-da/rounds.xml
+++ b/shared/src/main/res/values-da/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-da/strings.xml b/shared/src/main/res/values-da/strings.xml
index 812ecfa01..d44a1bcf7 100644
--- a/shared/src/main/res/values-da/strings.xml
+++ b/shared/src/main/res/values-da/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Recurvebue</string>
   <string name="compound_bow">Compoundbue</string>
diff --git a/shared/src/main/res/values-da/target_faces.xml b/shared/src/main/res/values-da/target_faces.xml
index d75138f40..f7e59fc25 100644
--- a/shared/src/main/res/values-da/target_faces.xml
+++ b/shared/src/main/res/values-da/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-de/rounds.xml b/shared/src/main/res/values-de/rounds.xml
index b8b63c33d..43f4bb859 100644
--- a/shared/src/main/res/values-de/rounds.xml
+++ b/shared/src/main/res/values-de/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Kombiniert Halle</string>
diff --git a/shared/src/main/res/values-de/strings.xml b/shared/src/main/res/values-de/strings.xml
index 4b3a946e1..958828aa7 100644
--- a/shared/src/main/res/values-de/strings.xml
+++ b/shared/src/main/res/values-de/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Recurvebogen</string>
   <string name="compound_bow">Compoundbogen</string>
diff --git a/shared/src/main/res/values-de/target_faces.xml b/shared/src/main/res/values-de/target_faces.xml
index e017ca67a..1d4cdb696 100644
--- a/shared/src/main/res/values-de/target_faces.xml
+++ b/shared/src/main/res/values-de/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Normal</string>
diff --git a/shared/src/main/res/values-el/rounds.xml b/shared/src/main/res/values-el/rounds.xml
index e931bf6b4..8cc6d7b64 100644
--- a/shared/src/main/res/values-el/rounds.xml
+++ b/shared/src/main/res/values-el/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-el/strings.xml b/shared/src/main/res/values-el/strings.xml
index 4a0317db1..e300885a2 100644
--- a/shared/src/main/res/values-el/strings.xml
+++ b/shared/src/main/res/values-el/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-el/target_faces.xml b/shared/src/main/res/values-el/target_faces.xml
index d75138f40..f7e59fc25 100644
--- a/shared/src/main/res/values-el/target_faces.xml
+++ b/shared/src/main/res/values-el/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-es/rounds.xml b/shared/src/main/res/values-es/rounds.xml
index 257bd3c66..82eee43fe 100644
--- a/shared/src/main/res/values-es/rounds.xml
+++ b/shared/src/main/res/values-es/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australiana combinada Indoor</string>
diff --git a/shared/src/main/res/values-es/strings.xml b/shared/src/main/res/values-es/strings.xml
index 6a90b9381..6556ae9d6 100644
--- a/shared/src/main/res/values-es/strings.xml
+++ b/shared/src/main/res/values-es/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Arco Recurvo</string>
   <string name="compound_bow">Arco Compuesto</string>
@@ -59,8 +57,8 @@
   <string name="stop">STOP</string>
   <string name="end_n">End %d</string>
   <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %d: %s</string>
+  <string name="backspace">Atras</string>
+  <string name="accessibility_description_shot_n_score">Tiro %d: %s</string>
   <plurals name="rounds">
     <item quantity="one">%d round</item>
     <item quantity="other">%d rounds</item>
diff --git a/shared/src/main/res/values-es/target_faces.xml b/shared/src/main/res/values-es/target_faces.xml
index a43981645..68efe6b9a 100644
--- a/shared/src/main/res/values-es/target_faces.xml
+++ b/shared/src/main/res/values-es/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-et/rounds.xml b/shared/src/main/res/values-et/rounds.xml
index da18225ef..760a35643 100644
--- a/shared/src/main/res/values-et/rounds.xml
+++ b/shared/src/main/res/values-et/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Austraalia kombineeritud siselaskmine</string>
diff --git a/shared/src/main/res/values-et/strings.xml b/shared/src/main/res/values-et/strings.xml
index 1632fae1f..51276faa8 100644
--- a/shared/src/main/res/values-et/strings.xml
+++ b/shared/src/main/res/values-et/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">recurve vibu</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-et/target_faces.xml b/shared/src/main/res/values-et/target_faces.xml
index c28b7371c..645864faa 100644
--- a/shared/src/main/res/values-et/target_faces.xml
+++ b/shared/src/main/res/values-et/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Tavapärane</string>
diff --git a/shared/src/main/res/values-fi/rounds.xml b/shared/src/main/res/values-fi/rounds.xml
index e931bf6b4..8cc6d7b64 100644
--- a/shared/src/main/res/values-fi/rounds.xml
+++ b/shared/src/main/res/values-fi/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-fi/strings.xml b/shared/src/main/res/values-fi/strings.xml
index 4a0317db1..e300885a2 100644
--- a/shared/src/main/res/values-fi/strings.xml
+++ b/shared/src/main/res/values-fi/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-fi/target_faces.xml b/shared/src/main/res/values-fi/target_faces.xml
index d75138f40..f7e59fc25 100644
--- a/shared/src/main/res/values-fi/target_faces.xml
+++ b/shared/src/main/res/values-fi/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-fr/rounds.xml b/shared/src/main/res/values-fr/rounds.xml
index b0dce0660..0482da82e 100644
--- a/shared/src/main/res/values-fr/rounds.xml
+++ b/shared/src/main/res/values-fr/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australien Combiné Salle</string>
diff --git a/shared/src/main/res/values-fr/strings.xml b/shared/src/main/res/values-fr/strings.xml
index 546a08b3f..d61a11f80 100644
--- a/shared/src/main/res/values-fr/strings.xml
+++ b/shared/src/main/res/values-fr/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Arc classique</string>
   <string name="compound_bow">Arc à poulies</string>
diff --git a/shared/src/main/res/values-fr/target_faces.xml b/shared/src/main/res/values-fr/target_faces.xml
index 840d200ca..4c1518228 100644
--- a/shared/src/main/res/values-fr/target_faces.xml
+++ b/shared/src/main/res/values-fr/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Normal</string>
diff --git a/shared/src/main/res/values-hu/rounds.xml b/shared/src/main/res/values-hu/rounds.xml
index a3801f868..d7b3e1811 100644
--- a/shared/src/main/res/values-hu/rounds.xml
+++ b/shared/src/main/res/values-hu/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Ausztrál kombinált teremben</string>
diff --git a/shared/src/main/res/values-hu/strings.xml b/shared/src/main/res/values-hu/strings.xml
index cbf7e9293..ddc7ef1ac 100644
--- a/shared/src/main/res/values-hu/strings.xml
+++ b/shared/src/main/res/values-hu/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Olimpiai/Reflex íj</string>
   <string name="compound_bow">Csigás íj</string>
diff --git a/shared/src/main/res/values-hu/target_faces.xml b/shared/src/main/res/values-hu/target_faces.xml
index 6ae03bac2..63824a665 100644
--- a/shared/src/main/res/values-hu/target_faces.xml
+++ b/shared/src/main/res/values-hu/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Szokásos</string>
diff --git a/shared/src/main/res/values-in/rounds.xml b/shared/src/main/res/values-in/rounds.xml
index 71c3337d0..f8d2aab94 100644
--- a/shared/src/main/res/values-in/rounds.xml
+++ b/shared/src/main/res/values-in/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australia mengadakan didalam</string>
diff --git a/shared/src/main/res/values-in/strings.xml b/shared/src/main/res/values-in/strings.xml
index 39d7f7bd6..21142d353 100644
--- a/shared/src/main/res/values-in/strings.xml
+++ b/shared/src/main/res/values-in/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-in/target_faces.xml b/shared/src/main/res/values-in/target_faces.xml
index a6033e968..51d85aac8 100644
--- a/shared/src/main/res/values-in/target_faces.xml
+++ b/shared/src/main/res/values-in/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Reguler</string>
diff --git a/shared/src/main/res/values-it/rounds.xml b/shared/src/main/res/values-it/rounds.xml
index 6e001a1a3..6008433f8 100644
--- a/shared/src/main/res/values-it/rounds.xml
+++ b/shared/src/main/res/values-it/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-it/strings.xml b/shared/src/main/res/values-it/strings.xml
index 52a7c9500..3da1d9223 100644
--- a/shared/src/main/res/values-it/strings.xml
+++ b/shared/src/main/res/values-it/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Arco ricurvo</string>
   <string name="compound_bow">Arco compound</string>
diff --git a/shared/src/main/res/values-it/target_faces.xml b/shared/src/main/res/values-it/target_faces.xml
index 0601e5f56..d24bcb47a 100644
--- a/shared/src/main/res/values-it/target_faces.xml
+++ b/shared/src/main/res/values-it/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regolamentari</string>
diff --git a/shared/src/main/res/values-iw/rounds.xml b/shared/src/main/res/values-iw/rounds.xml
index e931bf6b4..8cc6d7b64 100644
--- a/shared/src/main/res/values-iw/rounds.xml
+++ b/shared/src/main/res/values-iw/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-iw/strings.xml b/shared/src/main/res/values-iw/strings.xml
index a0ee40589..5e217ea2e 100644
--- a/shared/src/main/res/values-iw/strings.xml
+++ b/shared/src/main/res/values-iw/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">קימור קשת</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-iw/target_faces.xml b/shared/src/main/res/values-iw/target_faces.xml
index d75138f40..f7e59fc25 100644
--- a/shared/src/main/res/values-iw/target_faces.xml
+++ b/shared/src/main/res/values-iw/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-ja/rounds.xml b/shared/src/main/res/values-ja/rounds.xml
index d2d49848e..c9e97395e 100644
--- a/shared/src/main/res/values-ja/rounds.xml
+++ b/shared/src/main/res/values-ja/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-ja/strings.xml b/shared/src/main/res/values-ja/strings.xml
index 6828f540f..6533ec4c1 100644
--- a/shared/src/main/res/values-ja/strings.xml
+++ b/shared/src/main/res/values-ja/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">リカーブボウ</string>
   <string name="compound_bow">コンパウンドボウ</string>
diff --git a/shared/src/main/res/values-ja/target_faces.xml b/shared/src/main/res/values-ja/target_faces.xml
index 6403fcae5..648c789e4 100644
--- a/shared/src/main/res/values-ja/target_faces.xml
+++ b/shared/src/main/res/values-ja/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-ko/rounds.xml b/shared/src/main/res/values-ko/rounds.xml
index e931bf6b4..8cc6d7b64 100644
--- a/shared/src/main/res/values-ko/rounds.xml
+++ b/shared/src/main/res/values-ko/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-ko/strings.xml b/shared/src/main/res/values-ko/strings.xml
index d05aa6b49..5cf2b03a6 100644
--- a/shared/src/main/res/values-ko/strings.xml
+++ b/shared/src/main/res/values-ko/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-ko/target_faces.xml b/shared/src/main/res/values-ko/target_faces.xml
index d75138f40..f7e59fc25 100644
--- a/shared/src/main/res/values-ko/target_faces.xml
+++ b/shared/src/main/res/values-ko/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-nl/rounds.xml b/shared/src/main/res/values-nl/rounds.xml
index 5cc1c677e..eb89ad6bc 100644
--- a/shared/src/main/res/values-nl/rounds.xml
+++ b/shared/src/main/res/values-nl/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australische gecombineerde Indoor</string>
diff --git a/shared/src/main/res/values-nl/strings.xml b/shared/src/main/res/values-nl/strings.xml
index d5ee0bed9..4a1591699 100644
--- a/shared/src/main/res/values-nl/strings.xml
+++ b/shared/src/main/res/values-nl/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Recurve boog</string>
   <string name="compound_bow">Compound boog</string>
diff --git a/shared/src/main/res/values-nl/target_faces.xml b/shared/src/main/res/values-nl/target_faces.xml
index ca7ab5e5d..1a8c9fcff 100644
--- a/shared/src/main/res/values-nl/target_faces.xml
+++ b/shared/src/main/res/values-nl/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Normaal</string>
diff --git a/shared/src/main/res/values-no/rounds.xml b/shared/src/main/res/values-no/rounds.xml
index bf5bbc0dc..c51115e99 100644
--- a/shared/src/main/res/values-no/rounds.xml
+++ b/shared/src/main/res/values-no/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australsk kombinert innendørs</string>
diff --git a/shared/src/main/res/values-no/strings.xml b/shared/src/main/res/values-no/strings.xml
index d4dd592af..cade05f25 100644
--- a/shared/src/main/res/values-no/strings.xml
+++ b/shared/src/main/res/values-no/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Recurve</string>
   <string name="compound_bow">Compound</string>
diff --git a/shared/src/main/res/values-no/target_faces.xml b/shared/src/main/res/values-no/target_faces.xml
index 9a9506cca..f0e5ef85b 100644
--- a/shared/src/main/res/values-no/target_faces.xml
+++ b/shared/src/main/res/values-no/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Vanlig</string>
diff --git a/shared/src/main/res/values-pl/rounds.xml b/shared/src/main/res/values-pl/rounds.xml
index c4315a44e..de1ae95fb 100644
--- a/shared/src/main/res/values-pl/rounds.xml
+++ b/shared/src/main/res/values-pl/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-pl/strings.xml b/shared/src/main/res/values-pl/strings.xml
index b90782121..39bd05ace 100644
--- a/shared/src/main/res/values-pl/strings.xml
+++ b/shared/src/main/res/values-pl/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Łuk klasyczny</string>
   <string name="compound_bow">Łuk bloczkowy</string>
diff --git a/shared/src/main/res/values-pl/target_faces.xml b/shared/src/main/res/values-pl/target_faces.xml
index 7ef353b69..cca2ab418 100644
--- a/shared/src/main/res/values-pl/target_faces.xml
+++ b/shared/src/main/res/values-pl/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Standardowe</string>
diff --git a/shared/src/main/res/values-pt-rBR/rounds.xml b/shared/src/main/res/values-pt-rBR/rounds.xml
index e15824bfc..d03d74b46 100644
--- a/shared/src/main/res/values-pt-rBR/rounds.xml
+++ b/shared/src/main/res/values-pt-rBR/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Indoor Combinado Australiano</string>
diff --git a/shared/src/main/res/values-pt-rBR/strings.xml b/shared/src/main/res/values-pt-rBR/strings.xml
index ff4c7eea5..f5872c1be 100644
--- a/shared/src/main/res/values-pt-rBR/strings.xml
+++ b/shared/src/main/res/values-pt-rBR/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Arco recurvo</string>
   <string name="compound_bow">Arco Composto</string>
diff --git a/shared/src/main/res/values-pt-rBR/target_faces.xml b/shared/src/main/res/values-pt-rBR/target_faces.xml
index e1d792ca3..055ec331b 100644
--- a/shared/src/main/res/values-pt-rBR/target_faces.xml
+++ b/shared/src/main/res/values-pt-rBR/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Normal</string>
diff --git a/shared/src/main/res/values-pt-rPT/rounds.xml b/shared/src/main/res/values-pt-rPT/rounds.xml
index e15824bfc..d03d74b46 100644
--- a/shared/src/main/res/values-pt-rPT/rounds.xml
+++ b/shared/src/main/res/values-pt-rPT/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Indoor Combinado Australiano</string>
diff --git a/shared/src/main/res/values-pt-rPT/strings.xml b/shared/src/main/res/values-pt-rPT/strings.xml
index 4a0317db1..e300885a2 100644
--- a/shared/src/main/res/values-pt-rPT/strings.xml
+++ b/shared/src/main/res/values-pt-rPT/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-pt-rPT/target_faces.xml b/shared/src/main/res/values-pt-rPT/target_faces.xml
index d75138f40..f7e59fc25 100644
--- a/shared/src/main/res/values-pt-rPT/target_faces.xml
+++ b/shared/src/main/res/values-pt-rPT/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-ro/rounds.xml b/shared/src/main/res/values-ro/rounds.xml
index e931bf6b4..8cc6d7b64 100644
--- a/shared/src/main/res/values-ro/rounds.xml
+++ b/shared/src/main/res/values-ro/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-ro/strings.xml b/shared/src/main/res/values-ro/strings.xml
index 6b91892fe..52d1c4a15 100644
--- a/shared/src/main/res/values-ro/strings.xml
+++ b/shared/src/main/res/values-ro/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-ro/target_faces.xml b/shared/src/main/res/values-ro/target_faces.xml
index d75138f40..f7e59fc25 100644
--- a/shared/src/main/res/values-ro/target_faces.xml
+++ b/shared/src/main/res/values-ro/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-ru/rounds.xml b/shared/src/main/res/values-ru/rounds.xml
index c2e10bc81..f8fce640d 100644
--- a/shared/src/main/res/values-ru/rounds.xml
+++ b/shared/src/main/res/values-ru/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Австралийский комбинированный для крытых помещений</string>
diff --git a/shared/src/main/res/values-ru/strings.xml b/shared/src/main/res/values-ru/strings.xml
index d16babe1a..a98f99e89 100644
--- a/shared/src/main/res/values-ru/strings.xml
+++ b/shared/src/main/res/values-ru/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Спортивный классический лук</string>
   <string name="compound_bow">Блочный лук</string>
diff --git a/shared/src/main/res/values-ru/target_faces.xml b/shared/src/main/res/values-ru/target_faces.xml
index 44454f7fa..94221e69a 100644
--- a/shared/src/main/res/values-ru/target_faces.xml
+++ b/shared/src/main/res/values-ru/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Стандартный</string>
diff --git a/shared/src/main/res/values-sk/rounds.xml b/shared/src/main/res/values-sk/rounds.xml
index ece9ccba4..19eb39591 100644
--- a/shared/src/main/res/values-sk/rounds.xml
+++ b/shared/src/main/res/values-sk/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-sk/strings.xml b/shared/src/main/res/values-sk/strings.xml
index 6af45f8ad..ed90eb0e4 100644
--- a/shared/src/main/res/values-sk/strings.xml
+++ b/shared/src/main/res/values-sk/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Zvratný luk</string>
   <string name="compound_bow">Kladkový luk</string>
diff --git a/shared/src/main/res/values-sk/target_faces.xml b/shared/src/main/res/values-sk/target_faces.xml
index b96685974..5f9df4a1e 100644
--- a/shared/src/main/res/values-sk/target_faces.xml
+++ b/shared/src/main/res/values-sk/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Štandardné</string>
diff --git a/shared/src/main/res/values-sl/rounds.xml b/shared/src/main/res/values-sl/rounds.xml
index e931bf6b4..8cc6d7b64 100644
--- a/shared/src/main/res/values-sl/rounds.xml
+++ b/shared/src/main/res/values-sl/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-sl/strings.xml b/shared/src/main/res/values-sl/strings.xml
index 44c152fe2..0d7589b1c 100644
--- a/shared/src/main/res/values-sl/strings.xml
+++ b/shared/src/main/res/values-sl/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Ukrivljeni lok</string>
   <string name="compound_bow">Sestavljeni lok</string>
diff --git a/shared/src/main/res/values-sl/target_faces.xml b/shared/src/main/res/values-sl/target_faces.xml
index d75138f40..f7e59fc25 100644
--- a/shared/src/main/res/values-sl/target_faces.xml
+++ b/shared/src/main/res/values-sl/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-sr/rounds.xml b/shared/src/main/res/values-sr/rounds.xml
index e931bf6b4..8cc6d7b64 100644
--- a/shared/src/main/res/values-sr/rounds.xml
+++ b/shared/src/main/res/values-sr/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-sr/strings.xml b/shared/src/main/res/values-sr/strings.xml
index 6b91892fe..52d1c4a15 100644
--- a/shared/src/main/res/values-sr/strings.xml
+++ b/shared/src/main/res/values-sr/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-sr/target_faces.xml b/shared/src/main/res/values-sr/target_faces.xml
index d75138f40..f7e59fc25 100644
--- a/shared/src/main/res/values-sr/target_faces.xml
+++ b/shared/src/main/res/values-sr/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-sv/rounds.xml b/shared/src/main/res/values-sv/rounds.xml
index 0e7f2664b..bff6ce7fe 100644
--- a/shared/src/main/res/values-sv/rounds.xml
+++ b/shared/src/main/res/values-sv/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australiska Kombinerade Inomhus</string>
diff --git a/shared/src/main/res/values-sv/strings.xml b/shared/src/main/res/values-sv/strings.xml
index deb26b54f..c338ae32c 100644
--- a/shared/src/main/res/values-sv/strings.xml
+++ b/shared/src/main/res/values-sv/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Recurvebåge</string>
   <string name="compound_bow">Compoundbåge</string>
diff --git a/shared/src/main/res/values-sv/target_faces.xml b/shared/src/main/res/values-sv/target_faces.xml
index a1450c70f..413905aaa 100644
--- a/shared/src/main/res/values-sv/target_faces.xml
+++ b/shared/src/main/res/values-sv/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-tr/rounds.xml b/shared/src/main/res/values-tr/rounds.xml
index 1f10fa2f1..4bc60df38 100644
--- a/shared/src/main/res/values-tr/rounds.xml
+++ b/shared/src/main/res/values-tr/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Avustralya kombine kapalı</string>
diff --git a/shared/src/main/res/values-tr/strings.xml b/shared/src/main/res/values-tr/strings.xml
index da6475735..aeebae6b2 100644
--- a/shared/src/main/res/values-tr/strings.xml
+++ b/shared/src/main/res/values-tr/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Olimpik Yay</string>
   <string name="compound_bow">Makaralı Yay</string>
diff --git a/shared/src/main/res/values-tr/target_faces.xml b/shared/src/main/res/values-tr/target_faces.xml
index ec17ae163..390347ac3 100644
--- a/shared/src/main/res/values-tr/target_faces.xml
+++ b/shared/src/main/res/values-tr/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Standart</string>
diff --git a/shared/src/main/res/values-uk/rounds.xml b/shared/src/main/res/values-uk/rounds.xml
index e931bf6b4..8cc6d7b64 100644
--- a/shared/src/main/res/values-uk/rounds.xml
+++ b/shared/src/main/res/values-uk/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-uk/strings.xml b/shared/src/main/res/values-uk/strings.xml
index 6b91892fe..52d1c4a15 100644
--- a/shared/src/main/res/values-uk/strings.xml
+++ b/shared/src/main/res/values-uk/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-uk/target_faces.xml b/shared/src/main/res/values-uk/target_faces.xml
index d75138f40..f7e59fc25 100644
--- a/shared/src/main/res/values-uk/target_faces.xml
+++ b/shared/src/main/res/values-uk/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-vi/rounds.xml b/shared/src/main/res/values-vi/rounds.xml
index e931bf6b4..8cc6d7b64 100644
--- a/shared/src/main/res/values-vi/rounds.xml
+++ b/shared/src/main/res/values-vi/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-vi/strings.xml b/shared/src/main/res/values-vi/strings.xml
index d05aa6b49..5cf2b03a6 100644
--- a/shared/src/main/res/values-vi/strings.xml
+++ b/shared/src/main/res/values-vi/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">Recurve bow</string>
   <string name="compound_bow">Compound bow</string>
diff --git a/shared/src/main/res/values-vi/target_faces.xml b/shared/src/main/res/values-vi/target_faces.xml
index d75138f40..f7e59fc25 100644
--- a/shared/src/main/res/values-vi/target_faces.xml
+++ b/shared/src/main/res/values-vi/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-zh-rCN/rounds.xml b/shared/src/main/res/values-zh-rCN/rounds.xml
index f3e456aae..ad938fe01 100644
--- a/shared/src/main/res/values-zh-rCN/rounds.xml
+++ b/shared/src/main/res/values-zh-rCN/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-zh-rCN/strings.xml b/shared/src/main/res/values-zh-rCN/strings.xml
index 65e93f72c..da11ba016 100644
--- a/shared/src/main/res/values-zh-rCN/strings.xml
+++ b/shared/src/main/res/values-zh-rCN/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">反曲弓</string>
   <string name="compound_bow">复合弓</string>
diff --git a/shared/src/main/res/values-zh-rCN/target_faces.xml b/shared/src/main/res/values-zh-rCN/target_faces.xml
index 20bd1e175..ff90b85f2 100644
--- a/shared/src/main/res/values-zh-rCN/target_faces.xml
+++ b/shared/src/main/res/values-zh-rCN/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/shared/src/main/res/values-zh-rTW/rounds.xml b/shared/src/main/res/values-zh-rTW/rounds.xml
index e931bf6b4..8cc6d7b64 100644
--- a/shared/src/main/res/values-zh-rTW/rounds.xml
+++ b/shared/src/main/res/values-zh-rTW/rounds.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Indoor -->
   <string name="australian_combined_indoor">Australian Combined Indoor</string>
diff --git a/shared/src/main/res/values-zh-rTW/strings.xml b/shared/src/main/res/values-zh-rTW/strings.xml
index f35a8e221..8196f0402 100644
--- a/shared/src/main/res/values-zh-rTW/strings.xml
+++ b/shared/src/main/res/values-zh-rTW/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="recurve_bow">反曲弓</string>
   <string name="compound_bow">複合弓</string>
diff --git a/shared/src/main/res/values-zh-rTW/target_faces.xml b/shared/src/main/res/values-zh-rTW/target_faces.xml
index d75138f40..f7e59fc25 100644
--- a/shared/src/main/res/values-zh-rTW/target_faces.xml
+++ b/shared/src/main/res/values-zh-rTW/target_faces.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <!-- Target groups -->
   <string name="target_type_target_archery">Regular</string>
diff --git a/wearable/build.gradle b/wearable/build.gradle
index 7797dc143..329920cdf 100644
--- a/wearable/build.gradle
+++ b/wearable/build.gradle
@@ -79,10 +79,6 @@ dependencies {
     implementation dependencies.supportCompat
     implementation dependencies.supportWear
 
-    kapt dependencies.dbFlowProcessor
-    implementation dependencies.dbFlowCore
-    implementation dependencies.dbFlow
-
     implementation dependencies.androidState
     kapt dependencies.androidStateProcessor
 
diff --git a/wearable/src/main/res/values-af/strings.xml b/wearable/src/main/res/values-af/strings.xml
index df0bae07f..2c33eb5e2 100644
--- a/wearable/src/main/res/values-af/strings.xml
+++ b/wearable/src/main/res/values-af/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-ar/strings.xml b/wearable/src/main/res/values-ar/strings.xml
index df0bae07f..2c33eb5e2 100644
--- a/wearable/src/main/res/values-ar/strings.xml
+++ b/wearable/src/main/res/values-ar/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-ca/strings.xml b/wearable/src/main/res/values-ca/strings.xml
index d37ad05ca..b3ea2cf76 100644
--- a/wearable/src/main/res/values-ca/strings.xml
+++ b/wearable/src/main/res/values-ca/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Guardat</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-cs/strings.xml b/wearable/src/main/res/values-cs/strings.xml
index b74082333..9edad321e 100644
--- a/wearable/src/main/res/values-cs/strings.xml
+++ b/wearable/src/main/res/values-cs/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Uloženo</string>
   <string name="start_phone_app">Spusťte aplikaci ve svém telefonu...</string>
diff --git a/wearable/src/main/res/values-da/strings.xml b/wearable/src/main/res/values-da/strings.xml
index 6d45f26d1..fd33538f5 100644
--- a/wearable/src/main/res/values-da/strings.xml
+++ b/wearable/src/main/res/values-da/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Gemt</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-de/strings.xml b/wearable/src/main/res/values-de/strings.xml
index b1eeddb07..f1e2d1122 100644
--- a/wearable/src/main/res/values-de/strings.xml
+++ b/wearable/src/main/res/values-de/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Gespeichert</string>
   <string name="start_phone_app">Starte die App auf deinem Handy um fortzufahren…</string>
diff --git a/wearable/src/main/res/values-el/strings.xml b/wearable/src/main/res/values-el/strings.xml
index df0bae07f..2c33eb5e2 100644
--- a/wearable/src/main/res/values-el/strings.xml
+++ b/wearable/src/main/res/values-el/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-es/strings.xml b/wearable/src/main/res/values-es/strings.xml
index 23ea43a17..bbf458b94 100644
--- a/wearable/src/main/res/values-es/strings.xml
+++ b/wearable/src/main/res/values-es/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Guardado</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-et/strings.xml b/wearable/src/main/res/values-et/strings.xml
index 0e76ea256..7fa63df09 100644
--- a/wearable/src/main/res/values-et/strings.xml
+++ b/wearable/src/main/res/values-et/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Salvestatud</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-fi/strings.xml b/wearable/src/main/res/values-fi/strings.xml
index df0bae07f..2c33eb5e2 100644
--- a/wearable/src/main/res/values-fi/strings.xml
+++ b/wearable/src/main/res/values-fi/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-fr/strings.xml b/wearable/src/main/res/values-fr/strings.xml
index b8f522c9b..002228a54 100644
--- a/wearable/src/main/res/values-fr/strings.xml
+++ b/wearable/src/main/res/values-fr/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Enregistré</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-hu/strings.xml b/wearable/src/main/res/values-hu/strings.xml
index 3514260c4..3574a7edb 100644
--- a/wearable/src/main/res/values-hu/strings.xml
+++ b/wearable/src/main/res/values-hu/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Mentve</string>
   <string name="start_phone_app">A folytatáshoz a fő eszközön is indítsd el a MyTargets-t</string>
diff --git a/wearable/src/main/res/values-in/strings.xml b/wearable/src/main/res/values-in/strings.xml
index 5bfef256f..0e25dcc8f 100644
--- a/wearable/src/main/res/values-in/strings.xml
+++ b/wearable/src/main/res/values-in/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Disimpan</string>
   <string name="start_phone_app">Jalankan aplikasi di ponsel Anda untuk melanjutkan …</string>
diff --git a/wearable/src/main/res/values-it/strings.xml b/wearable/src/main/res/values-it/strings.xml
index e96b563a2..935c81dba 100644
--- a/wearable/src/main/res/values-it/strings.xml
+++ b/wearable/src/main/res/values-it/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Salvato</string>
   <string name="start_phone_app">Avvia l\'app dal telefono per continuare…</string>
diff --git a/wearable/src/main/res/values-iw/strings.xml b/wearable/src/main/res/values-iw/strings.xml
index df0bae07f..2c33eb5e2 100644
--- a/wearable/src/main/res/values-iw/strings.xml
+++ b/wearable/src/main/res/values-iw/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-ja/strings.xml b/wearable/src/main/res/values-ja/strings.xml
index 8bfb343b7..124520e31 100644
--- a/wearable/src/main/res/values-ja/strings.xml
+++ b/wearable/src/main/res/values-ja/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">保存</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-ko/strings.xml b/wearable/src/main/res/values-ko/strings.xml
index df0bae07f..2c33eb5e2 100644
--- a/wearable/src/main/res/values-ko/strings.xml
+++ b/wearable/src/main/res/values-ko/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-nl/strings.xml b/wearable/src/main/res/values-nl/strings.xml
index c366c094f..286bab4d0 100644
--- a/wearable/src/main/res/values-nl/strings.xml
+++ b/wearable/src/main/res/values-nl/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Opgeslagen</string>
   <string name="start_phone_app">Start de app op uw telefoon om verder te gaan…</string>
diff --git a/wearable/src/main/res/values-no/strings.xml b/wearable/src/main/res/values-no/strings.xml
index 861b40775..7ca404c56 100644
--- a/wearable/src/main/res/values-no/strings.xml
+++ b/wearable/src/main/res/values-no/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Lagret</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-pl/strings.xml b/wearable/src/main/res/values-pl/strings.xml
index f1c4245c8..8a4d384ec 100644
--- a/wearable/src/main/res/values-pl/strings.xml
+++ b/wearable/src/main/res/values-pl/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Zapisano</string>
   <string name="start_phone_app">Włącz aplikację na swoim telefonie aby kontynuować…</string>
diff --git a/wearable/src/main/res/values-pt-rBR/strings.xml b/wearable/src/main/res/values-pt-rBR/strings.xml
index 053d7cde0..6ef89104e 100644
--- a/wearable/src/main/res/values-pt-rBR/strings.xml
+++ b/wearable/src/main/res/values-pt-rBR/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Salvo</string>
   <string name="start_phone_app">Inicie o aplicativo em seu telefone para continuar…</string>
diff --git a/wearable/src/main/res/values-pt-rPT/strings.xml b/wearable/src/main/res/values-pt-rPT/strings.xml
index bfacdbc43..ba7912e5d 100644
--- a/wearable/src/main/res/values-pt-rPT/strings.xml
+++ b/wearable/src/main/res/values-pt-rPT/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Salvo</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-ro/strings.xml b/wearable/src/main/res/values-ro/strings.xml
index df0bae07f..2c33eb5e2 100644
--- a/wearable/src/main/res/values-ro/strings.xml
+++ b/wearable/src/main/res/values-ro/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-ru/strings.xml b/wearable/src/main/res/values-ru/strings.xml
index 0c34b17b4..5f392cfbf 100644
--- a/wearable/src/main/res/values-ru/strings.xml
+++ b/wearable/src/main/res/values-ru/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Сохранено</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-sk/strings.xml b/wearable/src/main/res/values-sk/strings.xml
index 7a64da5de..b42b7df90 100644
--- a/wearable/src/main/res/values-sk/strings.xml
+++ b/wearable/src/main/res/values-sk/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Uložené</string>
   <string name="start_phone_app">Pre pokračovanie spustite na telefóne aplikáciu…</string>
diff --git a/wearable/src/main/res/values-sl/strings.xml b/wearable/src/main/res/values-sl/strings.xml
index 6d37605e5..4568b04ba 100644
--- a/wearable/src/main/res/values-sl/strings.xml
+++ b/wearable/src/main/res/values-sl/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Shranjeno</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-sr/strings.xml b/wearable/src/main/res/values-sr/strings.xml
index df0bae07f..2c33eb5e2 100644
--- a/wearable/src/main/res/values-sr/strings.xml
+++ b/wearable/src/main/res/values-sr/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-sv/strings.xml b/wearable/src/main/res/values-sv/strings.xml
index 29dd3e55a..85a138ccb 100644
--- a/wearable/src/main/res/values-sv/strings.xml
+++ b/wearable/src/main/res/values-sv/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Sparad</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-tr/strings.xml b/wearable/src/main/res/values-tr/strings.xml
index 94c4da02d..d405a206d 100644
--- a/wearable/src/main/res/values-tr/strings.xml
+++ b/wearable/src/main/res/values-tr/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Kaydedildi</string>
   <string name="start_phone_app">Devam etmek için telefonunuzdaki uygulamayı başlatın…</string>
diff --git a/wearable/src/main/res/values-uk/strings.xml b/wearable/src/main/res/values-uk/strings.xml
index df0bae07f..2c33eb5e2 100644
--- a/wearable/src/main/res/values-uk/strings.xml
+++ b/wearable/src/main/res/values-uk/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-vi/strings.xml b/wearable/src/main/res/values-vi/strings.xml
index df0bae07f..2c33eb5e2 100644
--- a/wearable/src/main/res/values-vi/strings.xml
+++ b/wearable/src/main/res/values-vi/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">Saved</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-zh-rCN/strings.xml b/wearable/src/main/res/values-zh-rCN/strings.xml
index 52b1036f6..29ec3da07 100644
--- a/wearable/src/main/res/values-zh-rCN/strings.xml
+++ b/wearable/src/main/res/values-zh-rCN/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">已保存</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
diff --git a/wearable/src/main/res/values-zh-rTW/strings.xml b/wearable/src/main/res/values-zh-rTW/strings.xml
index 4d8e5a0f1..2cefe2278 100644
--- a/wearable/src/main/res/values-zh-rTW/strings.xml
+++ b/wearable/src/main/res/values-zh-rTW/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2018 Florian Dreier
   ~
@@ -13,9 +14,6 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   -->
-
-<!--Generated by crowdin.com-->
-
 <resources>
   <string name="saved">已儲存</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>

From cc4df796ca4fb916ca375e49f6b060869ef624ec Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Tue, 16 Jan 2018 14:42:55 +0100
Subject: [PATCH 041/102] Closed #292

---
 .../features/training/RoundFragment.kt        |  1 +
 app/src/main/res/layout/item_end.xml          | 27 +++++++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
index 0b1094fbd..c8c2d94d9 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
@@ -186,6 +186,7 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
             binding.shoots.setShots(round!!.target, shots)
             binding.imageIndicator.visibility = if (item.images.isEmpty()) View.INVISIBLE else View.VISIBLE
             binding.end.text = getString(R.string.end_n, item.end.index + 1)
+            binding.endDetails.text = item.end.score.format(Utils.getCurrentLocale(context!!), SettingsManager.scoreConfiguration)
         }
     }
 
diff --git a/app/src/main/res/layout/item_end.xml b/app/src/main/res/layout/item_end.xml
index 71b047daf..e15c54a48 100644
--- a/app/src/main/res/layout/item_end.xml
+++ b/app/src/main/res/layout/item_end.xml
@@ -14,7 +14,8 @@
   -->
 
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto">
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools">
 
     <LinearLayout
         style="@style/MaterialItem"
@@ -24,14 +25,30 @@
         android:paddingLeft="16dp"
         android:paddingRight="16dp">
 
-        <TextView
-            android:id="@+id/end"
-            style="@style/primaryText"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_margin="5dp"
-            android:clickable="false"/>
+            android:clickable="false"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/end"
+                style="@style/primaryText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="End 1"/>
+
+            <TextView
+                android:id="@+id/endDetails"
+                style="@style/secondaryText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="28/30 (9 avg)"/>
+
+        </LinearLayout>
+
 
         <ImageView
             android:id="@+id/imageIndicator"

From cc8ee4954cbfa11e09cb95ad867d315511c89504 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Tue, 16 Jan 2018 14:43:23 +0100
Subject: [PATCH 042/102] Inlined initRoundsFromTemplate

---
 .../de/dreier/mytargets/utils/MobileWearableListener.kt   | 8 ++++++--
 .../shared/models/augmented/AugmentedTraining.kt          | 4 ----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
index 20aed688e..68e8ded12 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
@@ -25,7 +25,6 @@ import de.dreier.mytargets.base.db.dao.StandardRoundDAO
 import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.Environment
-import de.dreier.mytargets.utils.addEnd
 import de.dreier.mytargets.shared.models.TimerSettings
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
@@ -34,6 +33,7 @@ import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.utils.unmarshall
 import de.dreier.mytargets.shared.wearable.WearableClientBase
+import de.dreier.mytargets.utils.addEnd
 import org.threeten.bp.LocalDate
 
 /**
@@ -85,7 +85,11 @@ class MobileWearableListener : WearableListenerService() {
                 round.distance = SettingsManager.distance
                 aTraining.rounds = mutableListOf(AugmentedRound(round, mutableListOf()))
             } else {
-                aTraining.initRoundsFromTemplate(StandardRoundDAO.loadAugmentedStandardRound(lastTraining!!.standardRoundId!!))
+                aTraining.rounds = StandardRoundDAO
+                        .loadAugmentedStandardRound(lastTraining!!.standardRoundId!!)
+                        .createRoundsFromTemplate()
+                        .map { AugmentedRound(it, mutableListOf()) }
+                        .toMutableList()
             }
             ApplicationInstance.wearableClient.sendTrainingTemplate(aTraining)
         }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
index 1817867c8..7388fed04 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/augmented/AugmentedTraining.kt
@@ -24,10 +24,6 @@ data class AugmentedTraining(
         var rounds: MutableList<AugmentedRound>
 ) : Parcelable {
 
-    fun initRoundsFromTemplate(standardRound: AugmentedStandardRound) {
-        rounds = standardRound.createRoundsFromTemplate().map { AugmentedRound(it, mutableListOf()) }.toMutableList()
-    }
-
     constructor(source: Parcel) : this(
             source.readParcelable<Training>(Training::class.java.classLoader),
             source.createTypedArrayList(AugmentedRound.CREATOR)

From 150ad596f599630fe4be6254fe7448c8f1aea09e Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Tue, 16 Jan 2018 15:16:38 +0100
Subject: [PATCH 043/102] Cleaned up BackupUtils

---
 .../de/dreier/mytargets/app/MigrationTest.kt  | 16 +++--
 .../dreier/mytargets/base/db/dao/ImageDAO.kt  | 46 +++++++++++++
 .../settings/backup/provider/BackupUtils.kt   | 67 ++-----------------
 .../mytargets/utils/backup/MyBackupAgent.kt   |  5 +-
 .../mytargets/shared/utils/FileUtils.kt       |  4 +-
 5 files changed, 65 insertions(+), 73 deletions(-)
 create mode 100644 app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt

diff --git a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
index 4b893f343..4c0b915a6 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
@@ -26,16 +26,15 @@ import com.raizlabs.android.dbflow.config.FlowManager
 import com.raizlabs.android.dbflow.structure.database.AndroidDatabase
 import com.raizlabs.android.dbflow.structure.database.DatabaseHelperDelegate
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
-import de.dreier.mytargets.features.settings.backup.provider.BackupUtils
+import de.dreier.mytargets.base.db.dao.BowDAO
+import de.dreier.mytargets.base.db.dao.EndDAO
+import de.dreier.mytargets.base.db.dao.RoundDAO
+import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Dimension.Unit.CENTIMETER
 import de.dreier.mytargets.shared.models.Dimension.Unit.METER
 import de.dreier.mytargets.shared.models.EWeather
-import de.dreier.mytargets.base.db.dao.dao.BowDAO
-import de.dreier.mytargets.base.db.dao.dao.EndDAO
-import de.dreier.mytargets.base.db.dao.dao.RoundDAO
-import de.dreier.mytargets.base.db.dao.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.test.base.InstrumentedTestBase
@@ -76,7 +75,12 @@ class MigrationTest : InstrumentedTestBase() {
         val tmpDb = getTargetContext().getDatabasePath(DatabaseHelperDelegate
                 .getTempDbFileName(FlowManager.getDatabase(AppDatabase.NAME)))
 
-        BackupUtils.copy(getContext().assets.open("database.db"), FileOutputStream(tmpDb))
+        val `in` = getContext().assets.open("database.db")
+        val out = FileOutputStream(tmpDb)
+        `in`.copyTo(out)
+        out.flush()
+        `in`.close()
+        out.close()
 
         helper = FlowManager.getDatabase(AppDatabase.NAME).helper.delegate
         upgradedDb = FlowManager.getDatabase(AppDatabase.NAME).writableDatabase
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
new file mode 100644
index 000000000..328de25af
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.dao
+
+import com.raizlabs.android.dbflow.sql.language.SQLite
+import de.dreier.mytargets.shared.models.db.ArrowImage
+import de.dreier.mytargets.shared.models.db.BowImage
+import de.dreier.mytargets.shared.models.db.EndImage
+import java.util.*
+
+object ImageDAO {
+    /**
+     * Returns a list of file names, which are implicitly placed in the ../files/ folder of the app.
+     */
+    fun loadAllFileNames(): List<String> {
+        val list = ArrayList<String>()
+        list.addAll(SQLite.select()
+                .from(BowImage::class.java)
+                .queryList()
+                .map { (_, fileName) -> fileName })
+        list.addAll(SQLite.select()
+                .from(EndImage::class.java)
+                .queryList()
+                .map { (_, fileName) -> fileName }
+        )
+        list.addAll(SQLite.select()
+                .from(ArrowImage::class.java)
+                .queryList()
+                .map { (_, fileName) -> fileName }
+        )
+        return list
+    }
+}
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt
index b71019ade..06b43b6cf 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt
@@ -16,11 +16,8 @@
 package de.dreier.mytargets.features.settings.backup.provider
 
 import android.content.Context
-import com.raizlabs.android.dbflow.sql.language.SQLite
+import de.dreier.mytargets.base.db.dao.ImageDAO
 import de.dreier.mytargets.shared.AppDatabase
-import de.dreier.mytargets.shared.models.db.ArrowImage
-import de.dreier.mytargets.shared.models.db.BowImage
-import de.dreier.mytargets.shared.models.db.EndImage
 import java.io.*
 import java.text.SimpleDateFormat
 import java.util.*
@@ -36,42 +33,6 @@ object BackupUtils {
             return "MyTargets_backup_" + format.format(Date()) + ".zip"
         }
 
-    /**
-     * Returns a list of file names, which are implicitly placed in the ../files/ folder of the app.
-     */
-    val images: Array<String>
-        get() {
-            val list = ArrayList<String>()
-            list.addAll(SQLite.select()
-                    .from(BowImage::class.java)
-                    .queryList()
-                    .map { (_, fileName) -> fileName })
-            list.addAll(SQLite.select()
-                    .from(EndImage::class.java)
-                    .queryList()
-                    .map { (_, fileName) -> fileName }
-            )
-            list.addAll(SQLite.select()
-                    .from(ArrowImage::class.java)
-                    .queryList()
-                    .map { (_, fileName) -> fileName }
-            )
-            return list.toTypedArray()
-        }
-
-    @Throws(IOException::class)
-    fun copy(src: File, dst: File) {
-        src.copyTo(dst)
-    }
-
-    @Throws(IOException::class)
-    fun copy(`in`: InputStream, out: OutputStream) {
-        `in`.copyTo(out)
-        out.flush()
-        `in`.close()
-        out.close()
-    }
-
     @Throws(IOException::class)
     fun importZip(context: Context, `in`: InputStream) {
         // Unzip all images and database
@@ -90,8 +51,7 @@ object BackupUtils {
             out.putNextEntry(entry)
             FileInputStream(db).use { it.copyTo(out) }
 
-            val files = images
-            for (file in files) {
+            for (file in ImageDAO.loadAllFileNames()) {
                 try {
                     entry = ZipEntry("/" + file)
                     out.putNextEntry(entry)
@@ -105,22 +65,11 @@ object BackupUtils {
         }
     }
 
-    private fun safeCloseClosable(closeable: Closeable?) {
-        try {
-            closeable?.close()
-        } catch (e: IOException) {
-            e.printStackTrace()
-        }
-
-    }
-
     @Throws(IOException::class)
     private fun unzip(context: Context, `in`: InputStream): File? {
-        val tmpDb: File?
+        val tmpDb = File.createTempFile("import", ".db")
         var dbFiles = 0
-        try {
-            tmpDb = File.createTempFile("import", ".db")
-
+        `in`.use {
             val zin = ZipInputStream(`in`)
             var sourceEntry: ZipEntry?
             while (true) {
@@ -148,19 +97,15 @@ object BackupUtils {
                     fOut = context.openFileOutput(name, Context.MODE_PRIVATE)
                 }
 
-                try {
+                fOut.use {
                     zin.copyTo(fOut)
                     fOut.flush()
-                } finally {
-                    safeCloseClosable(fOut)
                 }
                 zin.closeEntry()
             }
-        } finally {
-            safeCloseClosable(`in`)
         }
         if (dbFiles != 1) {
-            throw IllegalStateException("Input file is not a valid backup")
+            throw IOException("Input file is not a valid backup")
         }
         return tmpDb
     }
diff --git a/app/src/main/java/de/dreier/mytargets/utils/backup/MyBackupAgent.kt b/app/src/main/java/de/dreier/mytargets/utils/backup/MyBackupAgent.kt
index 68ff6cc6f..893ade61b 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/backup/MyBackupAgent.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/backup/MyBackupAgent.kt
@@ -18,8 +18,7 @@ package de.dreier.mytargets.utils.backup
 import android.app.backup.BackupAgentHelper
 import android.app.backup.FileBackupHelper
 import android.app.backup.SharedPreferencesBackupHelper
-
-import de.dreier.mytargets.features.settings.backup.provider.BackupUtils
+import de.dreier.mytargets.base.db.dao.ImageDAO
 
 class MyBackupAgent : BackupAgentHelper() {
 
@@ -28,7 +27,7 @@ class MyBackupAgent : BackupAgentHelper() {
         addHelper(PREFS_BACKUP_KEY, SharedPreferencesBackupHelper(this, PREFS))
         addHelper(SQLITE_BACKUP_KEY, DbBackupHelper(this))
         addHelper(IMAGES_BACKUP_KEY,
-                FileBackupHelper(this, *BackupUtils.images))
+                FileBackupHelper(this, *ImageDAO.loadAllFileNames().toTypedArray()))
     }
 
     companion object {
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/FileUtils.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/FileUtils.kt
index 7edb6f257..d088a6606 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/FileUtils.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/FileUtils.kt
@@ -20,8 +20,6 @@ import android.net.Uri
 import android.support.v4.content.FileProvider
 import java.io.File
 import java.io.IOException
-import java.io.InputStream
-import java.io.OutputStream
 
 @Throws(IOException::class)
 fun File.moveTo(to: File) {
@@ -29,7 +27,7 @@ fun File.moveTo(to: File) {
     if (!directory.exists()) {
         directory.mkdir()
     }
-    copyTo(to)
+    copyTo(to, overwrite = true)
     delete()
 }
 

From 59526b8f20c6d4c39fb1e931d8bcab3748309f13 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Tue, 16 Jan 2018 20:11:49 +0100
Subject: [PATCH 044/102] Fixed #285

---
 .../mytargets/base/db/dao/TrainingDAO.kt      | 10 ---
 .../base/db/migrations/Migration26.kt         |  1 -
 .../fragments/EditableListFragmentBase.kt     |  5 ++
 .../features/rounds/EditRoundFragment.kt      |  8 +-
 .../features/statistics/ArrowStatistic.kt     |  4 +-
 .../features/statistics/StatisticsActivity.kt |  4 +-
 .../features/statistics/StatisticsFragment.kt | 88 ++++++++++++-------
 .../training/edit/EditTrainingFragment.kt     |  4 +-
 8 files changed, 69 insertions(+), 55 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
index 32647fc57..d2e84e85a 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
@@ -29,11 +29,6 @@ object TrainingDAO {
             .from(Training::class.java)
             .queryList()
 
-    fun loadTrainings(trainingIds: LongArray): List<Training> = SQLite.select()
-            .from(Training::class.java)
-            .where(Training_Table._id.`in`(trainingIds.toList()))
-            .queryList()
-
     fun loadTraining(id: Long): Training = SQLite.select()
             .from(Training::class.java)
             .where(Training_Table._id.eq(id))
@@ -43,11 +38,6 @@ object TrainingDAO {
             .map { RoundDAO.loadAugmentedRound(it) }
             .toMutableList())
 
-    fun loadTrainingOrNull(id: Long): Training? = SQLite.select()
-            .from(Training::class.java)
-            .where(Training_Table._id.eq(id))
-            .querySingle()
-
     fun loadRounds(id: Long): MutableList<Round> = SQLite.select()
             .from(Round::class.java)
             .where(Round_Table.training.eq(id))
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
index 358e5b659..6a9d5ee71 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
@@ -20,7 +20,6 @@ import com.raizlabs.android.dbflow.kotlinextensions.save
 import com.raizlabs.android.dbflow.sql.language.SQLite
 import com.raizlabs.android.dbflow.sql.migration.BaseMigration
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
-import de.dreier.mytargets.base.db.migrations.Migration0.Companion.createScoreTriggers
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.db.*
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
index 2df7e5c1a..49c1c002f 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
@@ -56,6 +56,11 @@ abstract class EditableListFragmentBase<T, U : ListAdapterBase<*, T>> : Fragment
         }
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putBundle(KEY_SELECTOR, selector.saveSelectionStates())
+    }
+
     override fun onResume() {
         super.onResume()
         reloadData()
diff --git a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
index 4338e62d6..a5e620bc4 100644
--- a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
@@ -21,8 +21,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.base.db.dao.RoundDAO
+import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.base.fragments.EditFragmentBase
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase.Companion.ITEM_ID
 import de.dreier.mytargets.databinding.FragmentEditRoundBinding
@@ -81,7 +81,7 @@ class EditRoundFragment : EditFragmentBase() {
             binding.distance.setItem(round.distance)
             binding.target.setItem(round.target)
             binding.notEditable.visibility = View.GONE
-            if (TrainingDAO.loadTrainingOrNull(round.trainingId!!)!!.standardRoundId != null) {
+            if (TrainingDAO.loadTraining(round.trainingId!!).standardRoundId != null) {
                 binding.distanceLayout.visibility = View.GONE
             }
         }
@@ -108,7 +108,7 @@ class EditRoundFragment : EditFragmentBase() {
     }
 
     private fun onSaveRound(): Round? {
-        val training = TrainingDAO.loadTrainingOrNull(trainingId)
+        val training = TrainingDAO.loadTraining(trainingId)
 
         val round: Round
         if (roundId == null) {
@@ -116,7 +116,7 @@ class EditRoundFragment : EditFragmentBase() {
             round.trainingId = trainingId
             round.shotsPerEnd = binding.arrows.progress
             round.maxEndCount = null
-            round.index = TrainingDAO.loadRounds(training!!.id).size
+            round.index = TrainingDAO.loadRounds(training.id).size
         } else {
             round = RoundDAO.loadRound(roundId!!)
         }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
index f208aac09..1b562c41f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
@@ -19,9 +19,9 @@ import android.annotation.SuppressLint
 import android.os.Parcelable
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.db.dao.ArrowDAO
-import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.base.db.dao.EndDAO
 import de.dreier.mytargets.base.db.dao.RoundDAO
+import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.shared.SharedApplicationInstance
 import de.dreier.mytargets.shared.analysis.aggregation.average.Average
 import de.dreier.mytargets.shared.models.Dimension
@@ -73,7 +73,7 @@ data class ArrowStatistic(
 
         fun getAll(target: Target, rounds: List<Round>): List<ArrowStatistic> {
             return rounds
-                    .groupBy { r -> TrainingDAO.loadTrainingOrNull(r.trainingId!!)!!.arrowId ?: 0 }
+                    .groupBy { r -> TrainingDAO.loadTraining(r.trainingId!!).arrowId ?: 0 }
                     .flatMap { t ->
                         val arrow = ArrowDAO.loadArrowOrNull(t.key)
                         val name = arrow?.name ?: SharedApplicationInstance.getStr(R.string.unknown)
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
index 02daf9296..ceeb42e09 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
@@ -37,9 +37,9 @@ import com.evernote.android.state.StateSaver
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.activities.ChildActivityBase
 import de.dreier.mytargets.base.db.dao.ArrowDAO
-import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.base.db.dao.BowDAO
 import de.dreier.mytargets.base.db.dao.RoundDAO
+import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.databinding.ActivityStatisticsBinding
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.db.Round
@@ -93,7 +93,7 @@ class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<Li
                 val rounds = RoundDAO.loadRounds(roundIds)
                 val trainingsMap = rounds.map { (_, trainingId) -> trainingId!! }
                         .distinct()
-                        .map { id -> Pair(id, TrainingDAO.loadTrainingOrNull(id)!!) }
+                        .map { id -> Pair(id, TrainingDAO.loadTraining(id)) }
                         .toSparseArray()
                 return rounds.map { round -> Pair(trainingsMap.get(round.trainingId!!), round) }
             }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
index 38382fa10..8ec700f95 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
@@ -34,9 +34,9 @@ import com.github.mikephil.charting.listener.OnChartValueSelectedListener
 import com.github.mikephil.charting.renderer.LineChartRenderer
 import com.github.mikephil.charting.utils.ColorTemplate
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.base.db.dao.EndDAO
 import de.dreier.mytargets.base.db.dao.RoundDAO
+import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.base.fragments.FragmentBase
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.databinding.FragmentStatisticsBinding
@@ -52,7 +52,6 @@ import de.dreier.mytargets.shared.utils.Color
 import de.dreier.mytargets.utils.*
 import de.dreier.mytargets.utils.MobileWearableClient.Companion.BROADCAST_UPDATE_TRAINING_FROM_REMOTE
 import org.threeten.bp.Duration
-import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDateTime
 import org.threeten.bp.format.DateTimeFormatter
 import org.threeten.bp.format.FormatStyle
@@ -93,39 +92,67 @@ class StatisticsFragment : FragmentBase() {
     private// Without regression line
     val lineChartDataSet: LineData?
         get() {
-            val trainingsMap = rounds!!
-                    .map { it.trainingId!! }
-                    .distinct()
-                    .map { TrainingDAO.loadTrainingOrNull(it)!! }
-                    .map { Pair(it.id, it) }
-                    .toMap()
-
-            val values = rounds!!
-                    .map { r -> Pair(trainingsMap[r.trainingId]!!.date, r) }
-                    .flatMap { roundIdPair ->
-                        RoundDAO.loadEnds(roundIdPair.second.id)
-                                .map { end -> Pair(roundIdPair.first, end) }
-                    }
-                    .map { endPair -> getPairEndSummary(endPair.second, endPair.first) }
-                    .sortedBy { pair -> pair.second }
-            if (values.isEmpty()) {
+            val isSingleTraining = rounds!!.distinctBy(Round::trainingId).count() == 1
+
+            val values = getDataPointsForLineChart(isSingleTraining)
+            if (values?.isEmpty() != false) {
                 return null
             }
 
-            val eval = getEntryEvaluator(values)
+            val eval = getEntryEvaluator(values, isSingleTraining)
             binding.chartView.xAxis.setValueFormatter { value, _ -> eval.getXValueFormatted(value) }
 
             val data: LineData
             if (values.size < 2) {
                 data = LineData(convertToLineData(values, eval))
             } else {
-                data = LineData(generateLinearRegressionLine(values, eval)!!)
+                data = LineData(generateLinearRegressionLine(values, eval))
                 data.addDataSet(convertToLineData(values, eval))
             }
             data.setDrawValues(false)
             return data
         }
 
+    private fun getDataPointsForLineChart(isSingleTraining: Boolean): List<Pair<Float, LocalDateTime>>? {
+        val trainingsMap = rounds!!
+                .map { it.trainingId!! }
+                .distinct()
+                .map { TrainingDAO.loadTraining(it) }
+                .map { Pair(it.id, it) }
+                .toMap()
+
+        val values: List<Pair<Float, LocalDateTime>>
+        if (isSingleTraining) {
+            val trainingDate = trainingsMap.values.toList()[0].date
+            val ends = rounds!!.sortedBy { it.index }.map { RoundDAO.loadEnds(it.id) }
+            val firstRound = ends[0]
+            if (firstRound.isEmpty()) {
+                return null
+            }
+            var firstEndTime = firstRound[0].saveTime
+            var dayShift = 0L
+            values = ends.flatMap { it }
+                    .map { end ->
+                        if (end.saveTime!!.isBefore(firstEndTime)) {
+                            dayShift += 1
+                            firstEndTime = end.saveTime
+                        }
+                        val dateTime = LocalDateTime.of(trainingDate, end.saveTime).plusDays(dayShift)
+                        Pair(end.score.shotAverage, dateTime)
+                    }
+                    .sortedBy { (_, date) -> date }
+        } else {
+            values = rounds!!
+                    .map { r -> Pair(trainingsMap[r.trainingId]!!.date, r) }
+                    .flatMap { (date, round) ->
+                        RoundDAO.loadEnds(round.id).map { end -> Pair(end, date) }
+                    }
+                    .map { (end, date) -> Pair(end.score.shotAverage, LocalDateTime.of(date, end.saveTime!!)) }
+                    .sortedBy { (_, date) -> date }
+        }
+        return values
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         LocalBroadcastManager.getInstance(context!!).registerReceiver(updateReceiver,
@@ -159,10 +186,7 @@ class StatisticsFragment : FragmentBase() {
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        rounds = roundIds!!
-                .map { RoundDAO.loadRoundOrNull(it) }
-                .filterNotNull()
-
+        rounds = RoundDAO.loadRounds(roundIds!!)
         val data = ArrowStatistic.getAll(target!!, rounds!!)
                 .sortedWith(compareByDescending { it.totalScore.shotAverage })
 
@@ -344,8 +368,7 @@ class StatisticsFragment : FragmentBase() {
         reloadData()
     }
 
-    private fun getEntryEvaluator(values: List<Pair<Float, LocalDateTime>>): Evaluator {
-        val singleTraining = rounds!!.groupBy { (_, trainingId) -> trainingId }.count() == 1
+    private fun getEntryEvaluator(values: List<Pair<Float, LocalDateTime>>, singleTraining: Boolean): Evaluator {
 
         val eval: Evaluator
         if (singleTraining) {
@@ -378,10 +401,6 @@ class StatisticsFragment : FragmentBase() {
         return eval
     }
 
-    private fun getPairEndSummary(end: End, trainingDate: LocalDate): Pair<Float, LocalDateTime> {
-        return Pair(end.score.shotAverage, LocalDateTime.of(trainingDate, end.saveTime!!))
-    }
-
     private fun convertToLineData(values: List<Pair<Float, LocalDateTime>>, evaluator: Evaluator): LineDataSet {
         val seriesEntries = values.indices.map { Entry(evaluator.getXValue(values, it).toFloat(), values[it].first) }
 
@@ -401,7 +420,10 @@ class StatisticsFragment : FragmentBase() {
         return series
     }
 
-    private fun generateLinearRegressionLine(values: List<Pair<Float, LocalDateTime>>, eval: Evaluator): ILineDataSet? {
+    /**
+     * @param values Must not be empty
+     */
+    private fun generateLinearRegressionLine(values: List<Pair<Float, LocalDateTime>>, eval: Evaluator): ILineDataSet {
         val dataSetSize = values.size
         val x = DoubleArray(dataSetSize)
         val y = DoubleArray(dataSetSize)
@@ -424,9 +446,7 @@ class StatisticsFragment : FragmentBase() {
             }
             n++
         }
-        if (n < 1) {
-            return null
-        }
+
         val xBar = sumX / n
         val yBar = sumY / n
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
index 5fd599ccc..3cb240b88 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
@@ -65,7 +65,7 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
             val training = if (trainingId == null) {
                 Training()
             } else {
-                TrainingDAO.loadTrainingOrNull(trainingId!!)!!
+                TrainingDAO.loadTraining(trainingId!!)
             }
             training.title = binding.training.text.toString()
             training.date = date
@@ -182,7 +182,7 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
                 GONE
         } else {
             ToolbarUtils.setTitle(this, R.string.edit_training)
-            val train = TrainingDAO.loadTrainingOrNull(trainingId!!)!!
+            val train = TrainingDAO.loadTraining(trainingId!!)
             binding.training.setText(train.title)
             date = train.date
             binding.bow.setItemId(train.bowId)

From 03ca2a53489d3f6a5d41ec93f7f4f587edd59eae Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Wed, 17 Jan 2018 20:07:10 +0100
Subject: [PATCH 045/102] Removed Parcelable proguard rule

Fixed in Kotlin 1.2.20
---
 tools/rules-proguard.pro | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tools/rules-proguard.pro b/tools/rules-proguard.pro
index 4a6198909..3792ebe39 100644
--- a/tools/rules-proguard.pro
+++ b/tools/rules-proguard.pro
@@ -70,10 +70,6 @@
 #DBFlow
 -keep class * extends com.raizlabs.android.dbflow.config.DatabaseHolder { *; }
 
-#Parcelize (Kotlin)
--keep class kotlin.internal.annotations.AvoidUninitializedObjectCopyingCheck { *; }
--dontwarn kotlin.internal.annotations.AvoidUninitializedObjectCopyingCheck
-
 #Serializeable (e.g.ThreeTenABP's LocalDate)
 -keepnames class * implements java.io.Serializable
 -keepclassmembers class * implements java.io.Serializable {

From 2232ddd4eef9331c4310817eeb0b9b77bd7b11dd Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier@cqse.eu>
Date: Mon, 22 Jan 2018 18:50:14 +0100
Subject: [PATCH 046/102] Fixed various lint issues

---
 .../utils/transitions/NoPauseAnimator.kt      | 54 +++++++++----------
 .../mytargets/shared/views/TargetViewBase.kt  | 26 +++------
 2 files changed, 35 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt b/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt
index 0048fe09c..2d414eb2b 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt
@@ -30,63 +30,63 @@ import java.util.*
  * transition tries to pause the animator. Yikes! We can fix this by wrapping the Animator:
  */
 @RequiresApi(Build.VERSION_CODES.KITKAT)
-class NoPauseAnimator(private val mAnimator: Animator) : Animator() {
-    private val mListeners = ArrayMap<Animator.AnimatorListener, Animator.AnimatorListener>()
+class NoPauseAnimator(private val animator: Animator) : Animator() {
+    private val listeners = ArrayMap<Animator.AnimatorListener, Animator.AnimatorListener>()
 
     override fun addListener(listener: Animator.AnimatorListener) {
         val wrapper = AnimatorListenerWrapper(this, listener)
-        if (!mListeners.containsKey(listener)) {
-            mListeners.put(listener, wrapper)
-            mAnimator.addListener(wrapper)
+        if (!listeners.containsKey(listener)) {
+            listeners[listener] = wrapper
+            animator.addListener(wrapper)
         }
     }
 
     override fun cancel() {
-        mAnimator.cancel()
+        animator.cancel()
     }
 
     override fun end() {
-        mAnimator.end()
+        animator.end()
     }
 
     override fun getDuration(): Long {
-        return mAnimator.duration
+        return animator.duration
     }
 
     override fun getInterpolator(): TimeInterpolator {
-        return mAnimator.interpolator
+        return animator.interpolator
     }
 
     override fun setInterpolator(timeInterpolator: TimeInterpolator) {
-        mAnimator.interpolator = timeInterpolator
+        animator.interpolator = timeInterpolator
     }
 
     override fun getListeners(): ArrayList<Animator.AnimatorListener> {
-        return ArrayList(mListeners.keys)
+        return ArrayList(listeners.keys)
     }
 
     override fun getStartDelay(): Long {
-        return mAnimator.startDelay
+        return animator.startDelay
     }
 
     override fun setStartDelay(delayMS: Long) {
-        mAnimator.startDelay = delayMS
+        animator.startDelay = delayMS
     }
 
     override fun isPaused(): Boolean {
-        return mAnimator.isPaused
+        return animator.isPaused
     }
 
     override fun isRunning(): Boolean {
-        return mAnimator.isRunning
+        return animator.isRunning
     }
 
     override fun isStarted(): Boolean {
-        return mAnimator.isStarted
+        return animator.isStarted
     }
 
     /* We don't want to override pause or resume methods because we don't want them
-         * to affect mAnimator.
+         * to affect animator.
         public void pause();
         public void resume();
         public void addPauseListener(AnimatorPauseListener listener);
@@ -94,37 +94,37 @@ class NoPauseAnimator(private val mAnimator: Animator) : Animator() {
         */
 
     override fun removeAllListeners() {
-        mListeners.clear()
-        mAnimator.removeAllListeners()
+        listeners.clear()
+        animator.removeAllListeners()
     }
 
     override fun removeListener(listener: Animator.AnimatorListener) {
-        val wrapper = mListeners[listener]
+        val wrapper = listeners[listener]
         if (wrapper != null) {
-            mListeners.remove(listener)
-            mAnimator.removeListener(wrapper)
+            listeners.remove(listener)
+            animator.removeListener(wrapper)
         }
     }
 
     override fun setDuration(durationMS: Long): Animator {
-        mAnimator.duration = durationMS
+        animator.duration = durationMS
         return this
     }
 
     override fun setTarget(target: Any?) {
-        mAnimator.setTarget(target)
+        animator.setTarget(target)
     }
 
     override fun setupEndValues() {
-        mAnimator.setupEndValues()
+        animator.setupEndValues()
     }
 
     override fun setupStartValues() {
-        mAnimator.setupStartValues()
+        animator.setupStartValues()
     }
 
     override fun start() {
-        mAnimator.start()
+        animator.start()
     }
 
     private class AnimatorListenerWrapper(private val mAnimator: Animator, private val mListener: Animator.AnimatorListener) : Animator.AnimatorListener {
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt
index cdc64f13f..f71b6b043 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt
@@ -102,7 +102,7 @@ abstract class TargetViewBase : View, View.OnTouchListener {
             : super(context, attrs, defStyleAttr, defStyleRes)
 
     init {
-        setOnTouchListener(this)
+        super.setOnTouchListener(this)
         density = resources.displayMetrics.density
         ViewCompat.setAccessibilityDelegate(this, touchHelper)
         ViewCompat.setImportantForAccessibility(this, ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_YES)
@@ -113,7 +113,7 @@ abstract class TargetViewBase : View, View.OnTouchListener {
     protected val isCurrentlySelecting: Boolean
         get() = currentShotIndex != EndRenderer.NO_SELECTION && shots[currentShotIndex].scoringRing != Shot.NOTHING_SELECTED
 
-    protected val circleAnimation: Animator?
+    private val circleAnimation: Animator?
         get() {
             var pos: PointF? = null
             if (isCurrentlySelecting) {
@@ -264,7 +264,7 @@ abstract class TargetViewBase : View, View.OnTouchListener {
      * Can also be set to -1, to start the search from the first shot.
      * @return Returns a valid index or EndRenderer.NO_SELECTION
      */
-    protected fun getNextShotIndex(currentShotIndex: Int): Int {
+    private fun getNextShotIndex(currentShotIndex: Int): Int {
         var nextShotIndex = currentShotIndex + 1
         while (nextShotIndex < shots.size && shots[nextShotIndex].scoringRing != Shot.NOTHING_SELECTED) {
             nextShotIndex++
@@ -278,7 +278,7 @@ abstract class TargetViewBase : View, View.OnTouchListener {
         invalidate()
     }
 
-    protected fun notifyEndFinished() {
+    private fun notifyEndFinished() {
         if (this.currentShotIndex == EndRenderer.NO_SELECTION) {
             setListener?.onEndFinished(shots)
         }
@@ -303,7 +303,7 @@ abstract class TargetViewBase : View, View.OnTouchListener {
         }
     }
 
-    protected fun playAnimations(setList: List<Animator>) {
+    private fun playAnimations(setList: List<Animator>) {
         cancelPendingAnimations()
         animator = AnimatorSet()
         animator!!.playTogether(setList)
@@ -362,7 +362,7 @@ abstract class TargetViewBase : View, View.OnTouchListener {
         return false
     }
 
-    protected fun updateSelectableZones() {
+    private fun updateSelectableZones() {
         if (currentShotIndex != EndRenderer.NO_SELECTION) {
             selectableZones = target.getSelectableZoneList(currentShotIndex)
             if (virtualViews.size > 0) {
@@ -427,12 +427,7 @@ abstract class TargetViewBase : View, View.OnTouchListener {
         }
 
         private fun findVirtualViewByPosition(x: Float, y: Float): VirtualView? {
-            for (virtualView in targetView.virtualViews) {
-                if (virtualView.rect!!.contains(x.toInt(), y.toInt())) {
-                    return virtualView
-                }
-            }
-            return null
+            return targetView.virtualViews.firstOrNull { it.rect!!.contains(x.toInt(), y.toInt()) }
         }
 
         override fun getVisibleVirtualViews(virtualViewIds: MutableList<Int>) {
@@ -447,12 +442,7 @@ abstract class TargetViewBase : View, View.OnTouchListener {
         }
 
         private fun findVirtualViewById(virtualViewId: Int): VirtualView? {
-            for (virtualView in targetView.virtualViews) {
-                if (virtualView.id == virtualViewId) {
-                    return virtualView
-                }
-            }
-            return null
+            return targetView.virtualViews.firstOrNull { it.id == virtualViewId }
         }
 
         override fun onPopulateNodeForVirtualView(virtualViewId: Int, node: AccessibilityNodeInfoCompat) {

From 654ef72b40fd963e825df9c8120ad3c8fdaf5737 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier@cqse.eu>
Date: Tue, 23 Jan 2018 11:50:29 +0100
Subject: [PATCH 047/102] Moved DAOs and Migrations back to shared

Migrations did not work if they are not part of the db module (shared)
---
 shared/build.gradle                                              | 1 +
 .../src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt    | 0
 .../src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt      | 0
 .../main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt    | 0
 .../src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt      | 0
 .../src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt    | 0
 .../src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt    | 0
 .../main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt    | 0
 .../java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt     | 0
 .../src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt | 0
 .../java/de/dreier/mytargets/base/db/migrations/Migration0.kt    | 0
 .../java/de/dreier/mytargets/base/db/migrations/Migration22.kt   | 0
 .../java/de/dreier/mytargets/base/db/migrations/Migration23.kt   | 0
 .../java/de/dreier/mytargets/base/db/migrations/Migration26.kt   | 0
 .../java/de/dreier/mytargets/base/db/migrations/Migration3.kt    | 0
 .../java/de/dreier/mytargets/base/db/migrations/Migration4.kt    | 0
 .../java/de/dreier/mytargets/base/db/migrations/Migration6.kt    | 0
 .../java/de/dreier/mytargets/base/db/migrations/Migration9.kt    | 0
 18 files changed, 1 insertion(+)
 rename {app => shared}/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt (100%)
 rename {app => shared}/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt (100%)
 rename {app => shared}/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt (100%)
 rename {app => shared}/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt (100%)
 rename {app => shared}/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt (100%)
 rename {app => shared}/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt (100%)
 rename {app => shared}/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt (100%)
 rename {app => shared}/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt (100%)
 rename {app => shared}/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt (100%)
 rename {app => shared}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration0.kt (100%)
 rename {app => shared}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt (100%)
 rename {app => shared}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt (100%)
 rename {app => shared}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt (100%)
 rename {app => shared}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt (100%)
 rename {app => shared}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt (100%)
 rename {app => shared}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt (100%)
 rename {app => shared}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt (100%)

diff --git a/shared/build.gradle b/shared/build.gradle
index dcc8f0527..c8452bf3b 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -58,6 +58,7 @@ dependencies {
     kapt dependencies.dbFlowProcessor
     implementation dependencies.dbFlowCore
     implementation dependencies.dbFlow
+    implementation dependencies.dbFlowKotlinExtensions
 
     implementation dependencies.androidState
     kapt dependencies.androidStateProcessor
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
similarity index 100%
rename from app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
rename to shared/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
similarity index 100%
rename from app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
rename to shared/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
similarity index 100%
rename from app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
rename to shared/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
similarity index 100%
rename from app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
rename to shared/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
similarity index 100%
rename from app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
rename to shared/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
similarity index 100%
rename from app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
rename to shared/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
similarity index 100%
rename from app/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
rename to shared/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
similarity index 100%
rename from app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
rename to shared/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
similarity index 100%
rename from app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
rename to shared/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration0.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration0.kt
similarity index 100%
rename from app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration0.kt
rename to shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration0.kt
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
similarity index 100%
rename from app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
rename to shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
similarity index 100%
rename from app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
rename to shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
similarity index 100%
rename from app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
rename to shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt
similarity index 100%
rename from app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt
rename to shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt
similarity index 100%
rename from app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt
rename to shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt
similarity index 100%
rename from app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt
rename to shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
similarity index 100%
rename from app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
rename to shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt

From bdd032fd99d57b15fdec430542aab6c9c543c947 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier@cqse.eu>
Date: Tue, 23 Jan 2018 11:50:58 +0100
Subject: [PATCH 048/102] Got rid of non null assertion

---
 .../dreier/mytargets/views/selector/StandardRoundSelector.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
index 4c24c73be..065788147 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
@@ -41,9 +41,9 @@ class StandardRoundSelector @JvmOverloads constructor(context: Context, attrs: A
         var standardRound = StandardRoundDAO.loadStandardRoundOrNull(standardRoundId!!)
         // If the round has been removed, choose default one
         if (standardRound == null || StandardRoundDAO.loadRoundTemplates(standardRound.id).isEmpty()) {
-            standardRound = StandardRoundDAO.loadStandardRoundOrNull(32L)
+            standardRound = StandardRoundDAO.loadStandardRound(32L)
         }
-        setItem(AugmentedStandardRound(standardRound!!, StandardRoundDAO.loadRoundTemplates(standardRound.id)))
+        setItem(AugmentedStandardRound(standardRound, StandardRoundDAO.loadRoundTemplates(standardRound.id)))
     }
 
     companion object {

From e3ccd7c4e249c5e35ab98b28028ccaa9e9720c04 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier@cqse.eu>
Date: Tue, 23 Jan 2018 12:22:01 +0100
Subject: [PATCH 049/102] Closed #342

---
 .../features/statistics/CustomPieChart.kt     |  29 ++
 .../statistics/CustomPieChartRenderer.kt      | 426 ++++++++++++++++++
 .../main/res/layout/fragment_statistics.xml   |   2 +-
 3 files changed, 456 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/de/dreier/mytargets/features/statistics/CustomPieChart.kt
 create mode 100644 app/src/main/java/de/dreier/mytargets/features/statistics/CustomPieChartRenderer.kt

diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/CustomPieChart.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/CustomPieChart.kt
new file mode 100644
index 000000000..e923e6845
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/CustomPieChart.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.features.statistics
+
+import android.content.Context
+import android.util.AttributeSet
+
+import com.github.mikephil.charting.charts.PieChart
+
+class CustomPieChart @JvmOverloads constructor(
+        context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+) : PieChart(context, attrs, defStyleAttr) {
+    init {
+        renderer = CustomPieChartRenderer(this, mAnimator, mViewPortHandler)
+    }
+}
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/CustomPieChartRenderer.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/CustomPieChartRenderer.kt
new file mode 100644
index 000000000..551e2b25f
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/CustomPieChartRenderer.kt
@@ -0,0 +1,426 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.features.statistics
+
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Paint.Style
+import android.graphics.Path
+import android.graphics.RectF
+import com.github.mikephil.charting.animation.ChartAnimator
+import com.github.mikephil.charting.charts.PieChart
+import com.github.mikephil.charting.highlight.Highlight
+import com.github.mikephil.charting.interfaces.datasets.IPieDataSet
+import com.github.mikephil.charting.renderer.PieChartRenderer
+import com.github.mikephil.charting.utils.MPPointF
+import com.github.mikephil.charting.utils.Utils
+import com.github.mikephil.charting.utils.ViewPortHandler
+import de.dreier.mytargets.shared.utils.Color
+
+/**
+ * Copy of
+ * https://github.com/PhilJay/MPAndroidChart/blob/master/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.java
+ *
+ * Copied to implement https://stackoverflow.com/questions/38758885/border-around-pie-chart-in-mpchart#38775142
+ */
+class CustomPieChartRenderer(chart: PieChart, animator: ChartAnimator, viewPortHandler: ViewPortHandler) : PieChartRenderer(chart, animator, viewPortHandler) {
+
+    /**
+     * paint object for the stroke around the slices
+     */
+    private val mStrokeRenderPaint = Paint(Paint.ANTI_ALIAS_FLAG)
+
+    private val mPathBuffer = Path()
+    private val mInnerRectBuffer = RectF()
+
+    init {
+        mStrokeRenderPaint.style = Style.STROKE
+        mStrokeRenderPaint.strokeWidth = Utils.convertDpToPixel(1f)
+    }
+
+    override fun drawDataSet(c: Canvas?, dataSet: IPieDataSet) {
+
+        var angle = 0f
+        val rotationAngle = mChart.rotationAngle
+
+        val phaseX = mAnimator.phaseX
+        val phaseY = mAnimator.phaseY
+
+        val circleBox = mChart.circleBox
+
+        val entryCount = dataSet.entryCount
+        val drawAngles = mChart.drawAngles
+        val center = mChart.centerCircleBox
+        val radius = mChart.radius
+        val drawInnerArc = mChart.isDrawHoleEnabled && !mChart.isDrawSlicesUnderHoleEnabled
+        val userInnerRadius = if (drawInnerArc)
+            radius * (mChart.holeRadius / 100f)
+        else
+            0f
+
+        val visibleAngleCount = (0 until entryCount).count { // draw only if the value is greater than zero
+            Math.abs(dataSet.getEntryForIndex(it).y) > Utils.FLOAT_EPSILON
+        }
+
+        val sliceSpace = if (visibleAngleCount <= 1) 0f else getSliceSpace(dataSet)
+
+        for (j in 0 until entryCount) {
+
+            val sliceAngle = drawAngles[j]
+            var innerRadius = userInnerRadius
+
+            val e = dataSet.getEntryForIndex(j)
+
+            // draw only if the value is greater than zero
+            if (Math.abs(e.y) > Utils.FLOAT_EPSILON) {
+
+                if (!mChart.needsHighlight(j)) {
+
+                    val accountForSliceSpacing = sliceSpace > 0f && sliceAngle <= 180f
+
+                    mRenderPaint.color = dataSet.getColor(j)
+
+                    val sliceSpaceAngleOuter = if (visibleAngleCount == 1)
+                        0f
+                    else
+                        sliceSpace / (Utils.FDEG2RAD * radius)
+                    val startAngleOuter = rotationAngle + (angle + sliceSpaceAngleOuter / 2f) * phaseY
+                    var sweepAngleOuter = (sliceAngle - sliceSpaceAngleOuter) * phaseY
+                    if (sweepAngleOuter < 0f) {
+                        sweepAngleOuter = 0f
+                    }
+
+                    mPathBuffer.reset()
+
+                    val arcStartPointX = center.x + radius * Math.cos((startAngleOuter * Utils.FDEG2RAD).toDouble()).toFloat()
+                    val arcStartPointY = center.y + radius * Math.sin((startAngleOuter * Utils.FDEG2RAD).toDouble()).toFloat()
+
+                    if (sweepAngleOuter >= 360f && sweepAngleOuter % 360f <= Utils.FLOAT_EPSILON) {
+                        // Android is doing "mod 360"
+                        mPathBuffer.addCircle(center.x, center.y, radius, Path.Direction.CW)
+                    } else {
+
+                        mPathBuffer.moveTo(arcStartPointX, arcStartPointY)
+
+                        mPathBuffer.arcTo(
+                                circleBox,
+                                startAngleOuter,
+                                sweepAngleOuter
+                        )
+                    }
+
+                    // API < 21 does not receive floats in addArc, but a RectF
+                    mInnerRectBuffer.set(
+                            center.x - innerRadius,
+                            center.y - innerRadius,
+                            center.x + innerRadius,
+                            center.y + innerRadius)
+
+                    if (drawInnerArc && (innerRadius > 0f || accountForSliceSpacing)) {
+
+                        if (accountForSliceSpacing) {
+                            var minSpacedRadius = calculateMinimumRadiusForSpacedSlice(
+                                    center, radius,
+                                    sliceAngle * phaseY,
+                                    arcStartPointX, arcStartPointY,
+                                    startAngleOuter,
+                                    sweepAngleOuter)
+
+                            if (minSpacedRadius < 0f) {
+                                minSpacedRadius = -minSpacedRadius
+                            }
+
+                            innerRadius = Math.max(innerRadius, minSpacedRadius)
+                        }
+
+                        val sliceSpaceAngleInner = if (visibleAngleCount == 1 || innerRadius == 0f)
+                            0f
+                        else
+                            sliceSpace / (Utils.FDEG2RAD * innerRadius)
+                        val startAngleInner = rotationAngle + (angle + sliceSpaceAngleInner / 2f) * phaseY
+                        var sweepAngleInner = (sliceAngle - sliceSpaceAngleInner) * phaseY
+                        if (sweepAngleInner < 0f) {
+                            sweepAngleInner = 0f
+                        }
+                        val endAngleInner = startAngleInner + sweepAngleInner
+
+                        if (sweepAngleOuter >= 360f && sweepAngleOuter % 360f <= Utils.FLOAT_EPSILON) {
+                            // Android is doing "mod 360"
+                            mPathBuffer
+                                    .addCircle(center.x, center.y, innerRadius, Path.Direction.CCW)
+                        } else {
+
+                            mPathBuffer.lineTo(
+                                    center.x + innerRadius * Math.cos((endAngleInner * Utils.FDEG2RAD).toDouble()).toFloat(),
+                                    center.y + innerRadius * Math.sin((endAngleInner * Utils.FDEG2RAD).toDouble()).toFloat())
+
+                            mPathBuffer.arcTo(
+                                    mInnerRectBuffer,
+                                    endAngleInner,
+                                    -sweepAngleInner
+                            )
+                        }
+                    } else {
+
+                        if (sweepAngleOuter % 360f > Utils.FLOAT_EPSILON) {
+                            if (accountForSliceSpacing) {
+
+                                val angleMiddle = startAngleOuter + sweepAngleOuter / 2f
+
+                                val sliceSpaceOffset = calculateMinimumRadiusForSpacedSlice(
+                                        center,
+                                        radius,
+                                        sliceAngle * phaseY,
+                                        arcStartPointX,
+                                        arcStartPointY,
+                                        startAngleOuter,
+                                        sweepAngleOuter)
+
+                                val arcEndPointX = center.x + sliceSpaceOffset * Math.cos((angleMiddle * Utils.FDEG2RAD).toDouble()).toFloat()
+                                val arcEndPointY = center.y + sliceSpaceOffset * Math.sin((angleMiddle * Utils.FDEG2RAD).toDouble()).toFloat()
+
+                                mPathBuffer.lineTo(
+                                        arcEndPointX,
+                                        arcEndPointY)
+
+                            } else {
+                                mPathBuffer.lineTo(
+                                        center.x,
+                                        center.y)
+                            }
+                        }
+
+                    }
+
+                    mPathBuffer.close()
+
+                    mBitmapCanvas.drawPath(mPathBuffer, mRenderPaint)
+
+                    // MODIFIED CODE START
+
+                    mStrokeRenderPaint.color = Color.getStrokeColor(dataSet.getColor(j))
+                    mBitmapCanvas.drawPath(mPathBuffer, mStrokeRenderPaint)
+
+                    // MODIFIED CODE END
+                }
+            }
+
+            angle += sliceAngle * phaseX
+        }
+
+        MPPointF.recycleInstance(center)
+    }
+
+    override fun drawHighlighted(c: Canvas?, indices: Array<Highlight>) {
+
+        val phaseX = mAnimator.phaseX
+        val phaseY = mAnimator.phaseY
+
+        var angle: Float
+        val rotationAngle = mChart.rotationAngle
+
+        val drawAngles = mChart.drawAngles
+        val absoluteAngles = mChart.absoluteAngles
+        val center = mChart.centerCircleBox
+        val radius = mChart.radius
+        val drawInnerArc = mChart.isDrawHoleEnabled && !mChart.isDrawSlicesUnderHoleEnabled
+        val userInnerRadius = if (drawInnerArc)
+            radius * (mChart.holeRadius / 100f)
+        else
+            0f
+
+        val highlightedCircleBox = mDrawHighlightedRectF
+        highlightedCircleBox.set(0f, 0f, 0f, 0f)
+
+        for (i in indices.indices) {
+
+            // get the index to highlight
+            val index = indices[i].x.toInt()
+
+            if (index >= drawAngles.size) {
+                continue
+            }
+
+            val set = mChart.data
+                    .getDataSetByIndex(indices[i]
+                            .dataSetIndex)
+
+            if (set == null || !set.isHighlightEnabled) {
+                continue
+            }
+
+            val entryCount = set.entryCount
+            val visibleAngleCount = (0 until entryCount).count {
+                // draw only if the value is greater than zero
+                Math.abs(set.getEntryForIndex(it).y) > Utils.FLOAT_EPSILON
+            }
+
+            angle = if (index == 0) {
+                0f
+            } else {
+                absoluteAngles[index - 1] * phaseX
+            }
+
+            val sliceSpace = if (visibleAngleCount <= 1) 0f else set.sliceSpace
+
+            val sliceAngle = drawAngles[index]
+            var innerRadius = userInnerRadius
+
+            val shift = set.selectionShift
+            val highlightedRadius = radius + shift
+            highlightedCircleBox.set(mChart.circleBox)
+            highlightedCircleBox.inset(-shift, -shift)
+
+            val accountForSliceSpacing = sliceSpace > 0f && sliceAngle <= 180f
+
+            mRenderPaint.color = set.getColor(index)
+
+            val sliceSpaceAngleOuter = if (visibleAngleCount == 1)
+                0f
+            else
+                sliceSpace / (Utils.FDEG2RAD * radius)
+
+            val sliceSpaceAngleShifted = if (visibleAngleCount == 1)
+                0f
+            else
+                sliceSpace / (Utils.FDEG2RAD * highlightedRadius)
+
+            val startAngleOuter = rotationAngle + (angle + sliceSpaceAngleOuter / 2f) * phaseY
+            var sweepAngleOuter = (sliceAngle - sliceSpaceAngleOuter) * phaseY
+            if (sweepAngleOuter < 0f) {
+                sweepAngleOuter = 0f
+            }
+
+            val startAngleShifted = rotationAngle + (angle + sliceSpaceAngleShifted / 2f) * phaseY
+            var sweepAngleShifted = (sliceAngle - sliceSpaceAngleShifted) * phaseY
+            if (sweepAngleShifted < 0f) {
+                sweepAngleShifted = 0f
+            }
+
+            mPathBuffer.reset()
+
+            if (sweepAngleOuter >= 360f && sweepAngleOuter % 360f <= Utils.FLOAT_EPSILON) {
+                // Android is doing "mod 360"
+                mPathBuffer.addCircle(center.x, center.y, highlightedRadius, Path.Direction.CW)
+            } else {
+
+                mPathBuffer.moveTo(
+                        center.x + highlightedRadius * Math.cos((startAngleShifted * Utils.FDEG2RAD).toDouble()).toFloat(),
+                        center.y + highlightedRadius * Math.sin((startAngleShifted * Utils.FDEG2RAD).toDouble()).toFloat())
+
+                mPathBuffer.arcTo(
+                        highlightedCircleBox,
+                        startAngleShifted,
+                        sweepAngleShifted
+                )
+            }
+
+            var sliceSpaceRadius = 0f
+            if (accountForSliceSpacing) {
+                sliceSpaceRadius = calculateMinimumRadiusForSpacedSlice(
+                        center, radius,
+                        sliceAngle * phaseY,
+                        center.x + radius * Math.cos((startAngleOuter * Utils.FDEG2RAD).toDouble()).toFloat(),
+                        center.y + radius * Math.sin((startAngleOuter * Utils.FDEG2RAD).toDouble()).toFloat(),
+                        startAngleOuter,
+                        sweepAngleOuter)
+            }
+
+            // API < 21 does not receive floats in addArc, but a RectF
+            mInnerRectBuffer.set(
+                    center.x - innerRadius,
+                    center.y - innerRadius,
+                    center.x + innerRadius,
+                    center.y + innerRadius)
+
+            if (drawInnerArc && (innerRadius > 0f || accountForSliceSpacing)) {
+
+                if (accountForSliceSpacing) {
+                    var minSpacedRadius = sliceSpaceRadius
+
+                    if (minSpacedRadius < 0f) {
+                        minSpacedRadius = -minSpacedRadius
+                    }
+
+                    innerRadius = Math.max(innerRadius, minSpacedRadius)
+                }
+
+                val sliceSpaceAngleInner = if (visibleAngleCount == 1 || innerRadius == 0f)
+                    0f
+                else
+                    sliceSpace / (Utils.FDEG2RAD * innerRadius)
+                val startAngleInner = rotationAngle + (angle + sliceSpaceAngleInner / 2f) * phaseY
+                var sweepAngleInner = (sliceAngle - sliceSpaceAngleInner) * phaseY
+                if (sweepAngleInner < 0f) {
+                    sweepAngleInner = 0f
+                }
+                val endAngleInner = startAngleInner + sweepAngleInner
+
+                if (sweepAngleOuter >= 360f && sweepAngleOuter % 360f <= Utils.FLOAT_EPSILON) {
+                    // Android is doing "mod 360"
+                    mPathBuffer.addCircle(center.x, center.y, innerRadius, Path.Direction.CCW)
+                } else {
+
+                    mPathBuffer.lineTo(
+                            center.x + innerRadius * Math.cos((endAngleInner * Utils.FDEG2RAD).toDouble()).toFloat(),
+                            center.y + innerRadius * Math.sin((endAngleInner * Utils.FDEG2RAD).toDouble()).toFloat())
+
+                    mPathBuffer.arcTo(
+                            mInnerRectBuffer,
+                            endAngleInner,
+                            -sweepAngleInner
+                    )
+                }
+            } else {
+
+                if (sweepAngleOuter % 360f > Utils.FLOAT_EPSILON) {
+
+                    if (accountForSliceSpacing) {
+                        val angleMiddle = startAngleOuter + sweepAngleOuter / 2f
+
+                        val arcEndPointX = center.x + sliceSpaceRadius * Math.cos((angleMiddle * Utils.FDEG2RAD).toDouble()).toFloat()
+                        val arcEndPointY = center.y + sliceSpaceRadius * Math.sin((angleMiddle * Utils.FDEG2RAD).toDouble()).toFloat()
+
+                        mPathBuffer.lineTo(
+                                arcEndPointX,
+                                arcEndPointY)
+
+                    } else {
+
+                        mPathBuffer.lineTo(
+                                center.x,
+                                center.y)
+                    }
+
+                }
+
+            }
+
+            mPathBuffer.close()
+
+            mBitmapCanvas.drawPath(mPathBuffer, mRenderPaint)
+
+            // MODIFIED START
+
+            mStrokeRenderPaint.color = Color.getStrokeColor(set.getColor(index))
+            mBitmapCanvas.drawPath(mPathBuffer, mStrokeRenderPaint)
+
+            // MODIFIED END
+        }
+
+        MPPointF.recycleInstance(center)
+    }
+}
diff --git a/app/src/main/res/layout/fragment_statistics.xml b/app/src/main/res/layout/fragment_statistics.xml
index 2e0c3494e..0ea7fc284 100644
--- a/app/src/main/res/layout/fragment_statistics.xml
+++ b/app/src/main/res/layout/fragment_statistics.xml
@@ -45,7 +45,7 @@
                     android:paddingTop="16dp"
                     android:text="@string/distribution"/>
 
-                <com.github.mikephil.charting.charts.PieChart
+                <de.dreier.mytargets.features.statistics.CustomPieChart
                     android:id="@+id/distributionChart"
                     android:layout_width="250dp"
                     android:layout_height="250dp"

From 1692e419506ced5b700758e7cf44a2aa3d85bdad Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier@cqse.eu>
Date: Tue, 23 Jan 2018 13:41:46 +0100
Subject: [PATCH 050/102] Closed #336

- Increased default dispersion pattern resolution to 1200x1200
- Made pdf option use vectors instead of a rendered image
---
 .../features/scoreboard/ScoreboardFragment.kt |   5 +-
 .../features/scoreboard/ScoreboardUtils.kt    |  10 +-
 .../statistics/DispersionPatternActivity.kt   |  30 ++---
 .../statistics/DispersionPatternUtils.kt      |  64 +++--------
 .../features/statistics/StatisticsFragment.kt |   6 +-
 .../java/de/dreier/mytargets/utils/Utils.kt   |   2 +-
 .../print/CustomPrintDocumentAdapter.kt}      |   7 +-
 .../utils/print/DrawableToPdfWriter.kt        | 108 ++++++++++++++++++
 .../mytargets/utils/print/IPdfWriter.kt       |  37 ++++++
 .../pdf => utils/print}/ViewToPdfWriter.kt    |  34 +++---
 .../dreier/mytargets/shared/models/Target.kt  |   5 -
 .../mytargets/shared/utils/RectUtils.kt       |   5 +
 .../mytargets/shared/views/TargetViewBase.kt  |   4 +-
 13 files changed, 213 insertions(+), 104 deletions(-)
 rename app/src/main/java/de/dreier/mytargets/{features/scoreboard/pdf/ViewPrintDocumentAdapter.kt => utils/print/CustomPrintDocumentAdapter.kt} (90%)
 create mode 100644 app/src/main/java/de/dreier/mytargets/utils/print/DrawableToPdfWriter.kt
 create mode 100644 app/src/main/java/de/dreier/mytargets/utils/print/IPdfWriter.kt
 rename app/src/main/java/de/dreier/mytargets/{features/scoreboard/pdf => utils/print}/ViewToPdfWriter.kt (78%)

diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
index a21cdeebb..fe9b94411 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
@@ -42,7 +42,6 @@ import de.dreier.mytargets.base.fragments.FragmentBase
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.databinding.FragmentScoreboardBinding
 import de.dreier.mytargets.databinding.PartialScoreboardSignaturesBinding
-import de.dreier.mytargets.features.scoreboard.pdf.ViewPrintDocumentAdapter
 import de.dreier.mytargets.features.settings.ESettingsScreens
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.db.End
@@ -52,6 +51,8 @@ import de.dreier.mytargets.shared.utils.toUri
 import de.dreier.mytargets.utils.MobileWearableClient
 import de.dreier.mytargets.utils.MobileWearableClient.Companion.BROADCAST_UPDATE_TRAINING_FROM_REMOTE
 import de.dreier.mytargets.utils.Utils
+import de.dreier.mytargets.utils.print.CustomPrintDocumentAdapter
+import de.dreier.mytargets.utils.print.ViewToPdfWriter
 import org.threeten.bp.format.DateTimeFormatter
 import java.io.File
 import java.io.IOException
@@ -228,7 +229,7 @@ class ScoreboardFragment : FragmentBase() {
                 .scoreboardConfiguration)
 
         val jobName = getString(R.string.scoreboard) + " Document"
-        val pda = ViewPrintDocumentAdapter(content, fileName)
+        val pda = CustomPrintDocumentAdapter(ViewToPdfWriter(content), fileName)
 
         // Create a print job with name and adapter instance
         val printManager = context!!
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
index f37f5985c..d18977698 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
@@ -25,14 +25,14 @@ import android.print.PageRange
 import android.support.annotation.RequiresApi
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.LinearLayout
-import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.base.db.dao.RoundDAO
+import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.features.scoreboard.builder.ViewBuilder
 import de.dreier.mytargets.features.scoreboard.layout.DefaultScoreboardLayout
-import de.dreier.mytargets.features.scoreboard.pdf.ViewPrintDocumentAdapter
-import de.dreier.mytargets.features.scoreboard.pdf.ViewToPdfWriter
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
+import de.dreier.mytargets.utils.print.CustomPrintDocumentAdapter
+import de.dreier.mytargets.utils.print.ViewToPdfWriter
 import de.dreier.mytargets.utils.writeToJPGFile
 import java.io.File
 import java.io.FileOutputStream
@@ -61,8 +61,8 @@ object ScoreboardUtils {
     @Throws(IOException::class)
     fun generatePdf(content: LinearLayout, file: File) {
         val writer = ViewToPdfWriter(content)
-        writer.layoutPages(ViewPrintDocumentAdapter
-                .DEFAULT_RESOLUTION, ViewPrintDocumentAdapter
+        writer.layoutPages(CustomPrintDocumentAdapter
+                .DEFAULT_RESOLUTION, CustomPrintDocumentAdapter
                 .DEFAULT_MEDIA_SIZE)
 
         val fileOutputStream = FileOutputStream(file)
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
index 21a66fd70..cba42e362 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
@@ -15,13 +15,15 @@
 
 package de.dreier.mytargets.features.statistics
 
+import android.content.Context
 import android.content.Intent
 import android.databinding.DataBindingUtil
 import android.os.Build
 import android.os.Bundle
+import android.print.PrintAttributes
+import android.print.PrintManager
 import android.support.annotation.RequiresApi
 import android.support.design.widget.Snackbar
-import android.support.v4.print.PrintHelper
 import android.view.Menu
 import android.view.MenuItem
 import de.dreier.mytargets.R
@@ -33,6 +35,8 @@ import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.utils.toUri
 import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.Utils
+import de.dreier.mytargets.utils.print.CustomPrintDocumentAdapter
+import de.dreier.mytargets.utils.print.DrawableToPdfWriter
 import java.io.File
 import java.io.IOException
 
@@ -59,13 +63,7 @@ class DispersionPatternActivity : ChildActivityBase() {
 
     override fun onResume() {
         super.onResume()
-
-        val strategy = SettingsManager.statisticsDispersionPatternAggregationStrategy
-        val drawable = statistic.target.impactAggregationDrawable
-        drawable.setAggregationStrategy(strategy)
-        drawable.replaceShotsWith(statistic.shots)
-        drawable.setArrowDiameter(statistic.arrowDiameter, SettingsManager.inputArrowDiameterScale)
-
+        val drawable = DispersionPatternUtils.targetFromArrowStatistics(statistic)
         binding!!.dispersionView.setImageDrawable(drawable)
     }
 
@@ -94,7 +92,7 @@ class DispersionPatternActivity : ChildActivityBase() {
                 if (fileType === EFileType.PDF && Utils.isKitKat) {
                     DispersionPatternUtils.generatePdf(f, statistic)
                 } else {
-                    DispersionPatternUtils.createDispersionPatternImageFile(800, f, statistic)
+                    DispersionPatternUtils.createDispersionPatternImageFile(1200, f, statistic)
                 }
 
                 // Build and fire intent to ask for share provider
@@ -112,12 +110,14 @@ class DispersionPatternActivity : ChildActivityBase() {
 
     @RequiresApi(Build.VERSION_CODES.KITKAT)
     private fun print() {
-        val printHelper = PrintHelper(this)
-        printHelper.scaleMode = PrintHelper.SCALE_MODE_FIT
-
-        // Get the image
-        val image = DispersionPatternUtils.getDispersionPatternBitmap(800, statistic)
-        printHelper.printBitmap("Dispersion Pattern", image)
+        val target = DispersionPatternUtils.targetFromArrowStatistics(statistic)
+        val fileName = getDefaultFileName(EFileType.PDF)
+        val pda = CustomPrintDocumentAdapter(DrawableToPdfWriter(target), fileName)
+
+        // Create a print job with name and adapter instance
+        val printManager = getSystemService(Context.PRINT_SERVICE) as PrintManager
+        val jobName = "Dispersion Pattern"
+        printManager.print(jobName, pda, PrintAttributes.Builder().build())
     }
 
     private fun getDefaultFileName(extension: EFileType): String {
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternUtils.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternUtils.kt
index f62c685df..427cd90aa 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternUtils.kt
@@ -15,17 +15,17 @@
 
 package de.dreier.mytargets.features.statistics
 
-import android.annotation.SuppressLint
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Rect
-import android.graphics.pdf.PdfDocument
 import android.os.Build
-import android.print.PrintAttributes
+import android.print.PageRange
 import android.support.annotation.RequiresApi
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.targets.drawable.TargetImpactAggregationDrawable
+import de.dreier.mytargets.utils.print.CustomPrintDocumentAdapter
+import de.dreier.mytargets.utils.print.DrawableToPdfWriter
 import de.dreier.mytargets.utils.writeToJPGFile
 import java.io.File
 import java.io.FileNotFoundException
@@ -36,61 +36,31 @@ object DispersionPatternUtils {
 
     @Throws(IOException::class)
     fun createDispersionPatternImageFile(size: Int, file: File, statistic: ArrowStatistic) {
-        val b = getDispersionPatternBitmap(size, statistic)
-        b.writeToJPGFile(file)
+        val bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)
+        val canvas = Canvas(bitmap)
+        canvas.drawColor(Color.WHITE)
+        val target = targetFromArrowStatistics(statistic)
+        target.bounds = Rect(0, 0, size, size)
+        target.draw(canvas)
+        bitmap.writeToJPGFile(file)
     }
 
     @RequiresApi(api = Build.VERSION_CODES.KITKAT)
     @Throws(FileNotFoundException::class)
     fun generatePdf(f: File, statistic: ArrowStatistic) {
-        val outputStream = FileOutputStream(f)
-        try {
-            val target = TargetImpactAggregationDrawable(statistic.target)
-            target.replaceShotsWith(statistic.shots)
-            target.setAggregationStrategy(SettingsManager.statisticsDispersionPatternAggregationStrategy)
-            target.setArrowDiameter(statistic.arrowDiameter, SettingsManager.inputArrowDiameterScale)
-
-            val document = PdfDocument()
-
-            val mediaSize = PrintAttributes.MediaSize.ISO_A4
-            @SuppressLint("Range")
-            val pageInfo = PdfDocument.PageInfo.Builder((mediaSize
-                    .widthMils * 0.072f).toInt(), (mediaSize.heightMils * 0.072f).toInt(), 1)
-                    .create()
-
-            val page = document.startPage(pageInfo)
-            val canvas = page.canvas
-            target.setBounds(0, 0, canvas.width, canvas.height)
-            target.draw(canvas)
-            document.finishPage(page)
-
-            document.writeTo(outputStream)
-            document.close()
-            outputStream.flush()
-            outputStream.close()
-        } catch (e: IOException) {
-            e.printStackTrace()
-        } finally {
-            try {
-                outputStream.close()
-            } catch (e: IOException) {
-                e.printStackTrace()
-            }
-
+        FileOutputStream(f).use { outputStream ->
+            val target = targetFromArrowStatistics(statistic)
+            val pdfWriter = DrawableToPdfWriter(target)
+            pdfWriter.layoutPages(CustomPrintDocumentAdapter.DEFAULT_RESOLUTION, CustomPrintDocumentAdapter.DEFAULT_MEDIA_SIZE)
+            pdfWriter.writePdfDocument(arrayOf(PageRange(0, 0)), outputStream)
         }
     }
 
-    fun getDispersionPatternBitmap(size: Int, statistic: ArrowStatistic): Bitmap {
-        val bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)
-        val canvas = Canvas(bitmap)
-        canvas.drawColor(Color.WHITE)
-
+    fun targetFromArrowStatistics(statistic: ArrowStatistic): TargetImpactAggregationDrawable {
         val target = TargetImpactAggregationDrawable(statistic.target)
         target.replaceShotsWith(statistic.shots)
         target.setAggregationStrategy(SettingsManager.statisticsDispersionPatternAggregationStrategy)
         target.setArrowDiameter(statistic.arrowDiameter, SettingsManager.inputArrowDiameterScale)
-        target.bounds = Rect(0, 0, size, size)
-        target.draw(canvas)
-        return bitmap
+        return target
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
index 8ec700f95..5d64b0eb0 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
@@ -232,11 +232,7 @@ class StatisticsFragment : FragmentBase() {
             stats.exportFileName = ""
         }
 
-        val strategy = SettingsManager.statisticsDispersionPatternAggregationStrategy
-        val drawable = stats.target.impactAggregationDrawable
-        drawable.setAggregationStrategy(strategy)
-        drawable.replaceShotsWith(stats.shots)
-        drawable.setArrowDiameter(stats.arrowDiameter, SettingsManager.inputArrowDiameterScale)
+        val drawable = DispersionPatternUtils.targetFromArrowStatistics(stats)
         binding.dispersionView.setImageDrawable(drawable)
 
         binding.dispersionViewOverlay.setOnClickListener {
diff --git a/app/src/main/java/de/dreier/mytargets/utils/Utils.kt b/app/src/main/java/de/dreier/mytargets/utils/Utils.kt
index 2be5be40d..90abc3e7a 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/Utils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/Utils.kt
@@ -153,7 +153,7 @@ object Utils {
 
 fun Bitmap.writeToJPGFile(file: File) {
     val fileOutputStream = FileOutputStream(file)
-    compress(Bitmap.CompressFormat.JPEG, 100, fileOutputStream)
+    compress(Bitmap.CompressFormat.JPEG, 99, fileOutputStream)
     fileOutputStream.flush()
     fileOutputStream.close()
     recycle()
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/pdf/ViewPrintDocumentAdapter.kt b/app/src/main/java/de/dreier/mytargets/utils/print/CustomPrintDocumentAdapter.kt
similarity index 90%
rename from app/src/main/java/de/dreier/mytargets/features/scoreboard/pdf/ViewPrintDocumentAdapter.kt
rename to app/src/main/java/de/dreier/mytargets/utils/print/CustomPrintDocumentAdapter.kt
index 502c691f3..873713fcc 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/pdf/ViewPrintDocumentAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/print/CustomPrintDocumentAdapter.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.features.scoreboard.pdf
+package de.dreier.mytargets.utils.print
 
 import android.os.Build
 import android.os.Bundle
@@ -24,13 +24,10 @@ import android.print.PrintAttributes
 import android.print.PrintDocumentAdapter
 import android.print.PrintDocumentInfo
 import android.support.annotation.RequiresApi
-import android.widget.LinearLayout
 import java.io.FileOutputStream
 
 @RequiresApi(api = Build.VERSION_CODES.KITKAT)
-class ViewPrintDocumentAdapter(content: LinearLayout, private val fileName: String) : PrintDocumentAdapter() {
-
-    private val pdfWriter = ViewToPdfWriter(content)
+class CustomPrintDocumentAdapter(private val pdfWriter: IPdfWriter, private val fileName: String) : PrintDocumentAdapter() {
 
     override fun onLayout(oldAttributes: PrintAttributes, newAttributes: PrintAttributes, cancellationSignal: CancellationSignal, callback: PrintDocumentAdapter.LayoutResultCallback, extras: Bundle) {
         if (cancellationSignal.isCanceled) {
diff --git a/app/src/main/java/de/dreier/mytargets/utils/print/DrawableToPdfWriter.kt b/app/src/main/java/de/dreier/mytargets/utils/print/DrawableToPdfWriter.kt
new file mode 100644
index 000000000..00db896f6
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/utils/print/DrawableToPdfWriter.kt
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.utils.print
+
+import android.annotation.SuppressLint
+import android.graphics.Rect
+import android.graphics.RectF
+import android.graphics.drawable.Drawable
+import android.graphics.pdf.PdfDocument
+import android.os.Build
+import android.print.PageRange
+import android.print.PrintAttributes
+import android.support.annotation.RequiresApi
+import de.dreier.mytargets.shared.utils.RectUtils
+import de.dreier.mytargets.shared.utils.toClosestRect
+import java.io.IOException
+import java.io.OutputStream
+
+/**
+ * Handles printing the content view to a PDF stream.
+ * It is responsible for laying out pages by traversing the children of the content view and
+ * printing them onto the page. If one of the child views does no longer have sufficient space
+ * it gets placed on the next page.
+ */
+@RequiresApi(api = Build.VERSION_CODES.KITKAT)
+class DrawableToPdfWriter(private val content: Drawable) : IPdfWriter {
+    private lateinit var contentRect: Rect
+    private lateinit var fullPage: Rect
+
+    /**
+     * Calculates the number of pages it takes to print the content to the given print medium.
+     * MUST be called before [.writePdfDocument].
+     */
+    @SuppressLint("Range")
+    override fun layoutPages(resolution: PrintAttributes.Resolution, mediaSize: PrintAttributes.MediaSize): Int {
+        val fullPageRectF = RectF(0f, 0f,
+                mediaSize.widthMils * resolution.horizontalDpi / 1000f,
+                mediaSize.heightMils * resolution.verticalDpi / 1000f)
+        fullPage = fullPageRectF.toClosestRect()
+
+        val contentRectF = RectF(fullPageRectF)
+        contentRectF.inset(resolution.horizontalDpi * MARGIN_HORIZONTAL,
+                resolution.verticalDpi * MARGIN_VERTICAL)
+
+        contentRect = RectUtils.fitRectWithin(Rect(0, 0, 1, 1), contentRectF.toClosestRect())
+        return 1
+    }
+
+    /**
+     * Writes the given pages as PDF to the output stream.
+     */
+    @Throws(IOException::class)
+    override fun writePdfDocument(pages: Array<PageRange>, outputStream: OutputStream) {
+        val document = PdfDocument()
+
+        if (!containsPage(pages, 0)) {
+            document.close()
+            return
+        }
+        val pageInfo = PdfDocument.PageInfo.Builder(fullPage.width(), fullPage.height(), 0).create()
+        val page = document.startPage(pageInfo)
+
+        val canvas = page.canvas
+        content.bounds = contentRect
+        content.draw(canvas)
+
+        document.finishPage(page)
+
+        document.writeTo(outputStream)
+        document.close()
+    }
+
+    /**
+     * Tests if the given page is contained in one of the given page ranges.
+     *
+     * @param pages      Page ranges (zero-based indices)
+     * @param pageNumber Page to search for (zero-based)
+     */
+    private fun containsPage(pages: Array<PageRange>, pageNumber: Int): Boolean {
+        return pages.any { (it.start..it.end).contains(pageNumber) }
+    }
+
+    companion object {
+
+        /**
+         * Left and Right page margin in inches
+         */
+        private const val MARGIN_HORIZONTAL = 0.78f
+
+        /**
+         * Top and Bottom page margin in inches
+         */
+        private const val MARGIN_VERTICAL = 0.78f
+    }
+}
diff --git a/app/src/main/java/de/dreier/mytargets/utils/print/IPdfWriter.kt b/app/src/main/java/de/dreier/mytargets/utils/print/IPdfWriter.kt
new file mode 100644
index 000000000..c7fc9b3c2
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/utils/print/IPdfWriter.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.utils.print
+
+import android.annotation.SuppressLint
+import android.print.PageRange
+import android.print.PrintAttributes
+import java.io.IOException
+import java.io.OutputStream
+
+interface IPdfWriter {
+    /**
+     * Calculates the number of pages it takes to print the content to the given print medium.
+     * MUST be called before [.writePdfDocument].
+     */
+    @SuppressLint("Range")
+    fun layoutPages(resolution: PrintAttributes.Resolution, mediaSize: PrintAttributes.MediaSize): Int
+
+    /**
+     * Writes the given pages as PDF to the output stream.
+     */
+    @Throws(IOException::class)
+    fun writePdfDocument(pages: Array<PageRange>, outputStream: OutputStream)
+}
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/pdf/ViewToPdfWriter.kt b/app/src/main/java/de/dreier/mytargets/utils/print/ViewToPdfWriter.kt
similarity index 78%
rename from app/src/main/java/de/dreier/mytargets/features/scoreboard/pdf/ViewToPdfWriter.kt
rename to app/src/main/java/de/dreier/mytargets/utils/print/ViewToPdfWriter.kt
index fc57a01a8..af5e94734 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/pdf/ViewToPdfWriter.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/print/ViewToPdfWriter.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.features.scoreboard.pdf
+package de.dreier.mytargets.utils.print
 
 import android.annotation.SuppressLint
 import android.graphics.RectF
@@ -36,34 +36,34 @@ import java.io.OutputStream
  * it gets placed on the next page.
  */
 @RequiresApi(api = Build.VERSION_CODES.KITKAT)
-class ViewToPdfWriter(private val content: LinearLayout) {
-    private var contentRect: RectF? = null
-    private var fullPage: RectF? = null
+class ViewToPdfWriter(private val content: LinearLayout) : IPdfWriter {
+    private lateinit var contentRect: RectF
+    private lateinit var fullPage: RectF
 
     /**
      * Calculates the number of pages it takes to print the content to the given print medium.
      * MUST be called before [.writePdfDocument].
      */
     @SuppressLint("Range")
-    fun layoutPages(resolution: PrintAttributes.Resolution, mediaSize: PrintAttributes.MediaSize): Int {
+    override fun layoutPages(resolution: PrintAttributes.Resolution, mediaSize: PrintAttributes.MediaSize): Int {
         fullPage = RectF(0f, 0f,
                 mediaSize.widthMils * resolution.horizontalDpi / 1000f,
                 mediaSize.heightMils * resolution.verticalDpi / 1000f)
 
         contentRect = RectF(fullPage)
-        contentRect!!.inset(resolution.horizontalDpi * MARGIN_HORIZONTAL,
+        contentRect.inset(resolution.horizontalDpi * MARGIN_HORIZONTAL,
                 resolution.verticalDpi * MARGIN_VERTICAL)
 
-        content.measure(makeMeasureSpec(contentRect!!.width().toInt(), EXACTLY),
-                makeMeasureSpec(contentRect!!.height().toInt(), View.MeasureSpec.UNSPECIFIED))
-        content.layout(0, 0, contentRect!!.width().toInt(), contentRect!!.height().toInt())
+        content.measure(makeMeasureSpec(contentRect.width().toInt(), EXACTLY),
+                makeMeasureSpec(contentRect.height().toInt(), View.MeasureSpec.UNSPECIFIED))
+        content.layout(0, 0, contentRect.width().toInt(), contentRect.height().toInt())
 
         var sumHeight = 0
         var pageCount = 1
         for (i in 0 until content.childCount) {
             val measuredHeight = content.getChildAt(i).measuredHeight
             sumHeight += measuredHeight
-            if (sumHeight > contentRect!!.height().toInt()) {
+            if (sumHeight > contentRect.height().toInt()) {
                 sumHeight = measuredHeight
                 pageCount++
             }
@@ -75,7 +75,7 @@ class ViewToPdfWriter(private val content: LinearLayout) {
      * Writes the given pages as PDF to the output stream.
      */
     @Throws(IOException::class)
-    fun writePdfDocument(pages: Array<PageRange>, outputStream: OutputStream) {
+    override fun writePdfDocument(pages: Array<PageRange>, outputStream: OutputStream) {
         val document = PdfDocument()
 
         var sumHeight = 0
@@ -83,15 +83,15 @@ class ViewToPdfWriter(private val content: LinearLayout) {
         var topAnchor = 0
         var page: PdfDocument.Page? = null
         if (containsPage(pages, pageNumber)) {
-            val pageInfo = PdfDocument.PageInfo.Builder(fullPage!!
-                    .width().toInt(), fullPage!!.height().toInt(), pageNumber).create()
+            val pageInfo = PdfDocument.PageInfo.Builder(fullPage
+                    .width().toInt(), fullPage.height().toInt(), pageNumber).create()
             page = document.startPage(pageInfo)
         }
 
         for (i in 0 until content.childCount) {
             val view = content.getChildAt(i)
             val measuredHeight = view.measuredHeight
-            if (sumHeight + measuredHeight > contentRect!!.height()) {
+            if (sumHeight + measuredHeight > contentRect.height()) {
                 sumHeight = 0
                 topAnchor = view.top
                 pageNumber++
@@ -102,8 +102,8 @@ class ViewToPdfWriter(private val content: LinearLayout) {
                 }
 
                 if (containsPage(pages, pageNumber)) {
-                    val pageInfo = PdfDocument.PageInfo.Builder(fullPage!!
-                            .width().toInt(), fullPage!!.height().toInt(), pageNumber).create()
+                    val pageInfo = PdfDocument.PageInfo.Builder(fullPage
+                            .width().toInt(), fullPage.height().toInt(), pageNumber).create()
                     page = document.startPage(pageInfo)
                 }
             }
@@ -111,7 +111,7 @@ class ViewToPdfWriter(private val content: LinearLayout) {
             if (page != null) {
                 val canvas = page.canvas
                 canvas.save()
-                canvas.translate(contentRect!!.left, contentRect!!.top + view.top - topAnchor)
+                canvas.translate(contentRect.left, contentRect.top + view.top - topAnchor)
                 view.draw(canvas)
                 canvas.restore()
             }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
index ccf83a37b..739fd61c2 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
@@ -20,7 +20,6 @@ import android.os.Parcelable
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.targets.TargetFactory
 import de.dreier.mytargets.shared.targets.drawable.TargetDrawable
-import de.dreier.mytargets.shared.targets.drawable.TargetImpactAggregationDrawable
 import de.dreier.mytargets.shared.targets.models.TargetModelBase
 import de.dreier.mytargets.shared.targets.scoringstyle.ScoringStyle
 import kotlinx.android.parcel.IgnoredOnParcel
@@ -42,10 +41,6 @@ data class Target(
     val model: TargetModelBase by lazy { TargetFactory.getTarget(id.toInt()) }
     @IgnoredOnParcel
     val drawable: TargetDrawable by lazy { TargetDrawable(this) }
-    @IgnoredOnParcel
-    val impactAggregationDrawable: TargetImpactAggregationDrawable by lazy {
-        TargetImpactAggregationDrawable(this)
-    }
 
     constructor(target: Long, scoringStyle: Int) : this(target, scoringStyle, Dimension.UNKNOWN) {
         this.diameter = model.diameters[0]
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/RectUtils.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/RectUtils.kt
index 8e1f35b20..4a4607657 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/RectUtils.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/RectUtils.kt
@@ -16,6 +16,7 @@
 package de.dreier.mytargets.shared.utils
 
 import android.graphics.Rect
+import android.graphics.RectF
 
 object RectUtils {
     fun fitRectWithin(inner: Rect, outer: Rect): Rect {
@@ -35,3 +36,7 @@ object RectUtils {
         return Rect(newLeft.toInt(), newTop.toInt(), (newWidth + newLeft).toInt(), (newHeight + newTop).toInt())
     }
 }
+
+fun RectF.toClosestRect(): Rect {
+    return Rect(left.toInt(), top.toInt(), right.toInt(), bottom.toInt())
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt
index f71b6b043..c22b6ea11 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt
@@ -131,7 +131,7 @@ abstract class TargetViewBase : View, View.OnTouchListener {
             shots[0].x = 0.01f
             shots[0].y = 0.05f
             target = Target(WAFull.ID, 0)
-            targetDrawable = target.impactAggregationDrawable
+            targetDrawable = TargetImpactAggregationDrawable(target)
             endRenderer.init(this, density, target)
             endRenderer.setShots(shots)
             currentShotIndex = 1
@@ -146,7 +146,7 @@ abstract class TargetViewBase : View, View.OnTouchListener {
 
     open fun initWithTarget(target: Target) {
         this.target = target
-        targetDrawable = this.target.impactAggregationDrawable
+        targetDrawable = TargetImpactAggregationDrawable(this.target)
         targetDrawable?.callback = this
         endRenderer.init(this, density, this.target)
         updateSelectableZones()

From 838560e270c278f23aae3b1c1cb1157f906a796c Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier@cqse.eu>
Date: Tue, 23 Jan 2018 19:43:51 +0100
Subject: [PATCH 051/102] Fixed #341

---
 .../settings/backup/BackupSettingsFragment.kt | 33 ++++++++++++-------
 app/src/main/res/values/strings.xml           |  2 ++
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupSettingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupSettingsFragment.kt
index 6ac961262..ca75c9524 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupSettingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupSettingsFragment.kt
@@ -51,6 +51,7 @@ import de.dreier.mytargets.features.settings.backup.synchronization.SyncUtils
 import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.Utils
 import permissions.dispatcher.NeedsPermission
+import permissions.dispatcher.OnNeverAskAgain
 import permissions.dispatcher.OnPermissionDenied
 import permissions.dispatcher.RuntimePermissions
 import java.io.FileNotFoundException
@@ -64,6 +65,8 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
     private var adapter: BackupAdapter? = null
     private lateinit var binding: FragmentBackupBinding
     private var updateLabelTimer: Timer? = null
+    private var isLeaving = false
+
     /**
      * Handle to a SyncObserver. The ProgressBar element is visible until the SyncObserver reports
      * that the sync is complete.
@@ -156,8 +159,10 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
 
     override fun onResume() {
         super.onResume()
-        internalApplyBackupLocationWithPermissionCheck(SettingsManager.backupLocation)
-        updateAutomaticBackupSwitch()
+        if (!isLeaving) {
+            internalApplyBackupLocationWithPermissionCheck(SettingsManager.backupLocation)
+            updateAutomaticBackupSwitch()
+        }
 
         syncStatusObserver.onStatusChanged(0)
         syncObserverHandle = ContentResolver.addStatusChangeListener(
@@ -165,12 +170,8 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
     }
 
     override fun onPause() {
-        if (backup != null) {
-            backup!!.stop()
-        }
-        if (updateLabelTimer != null) {
-            updateLabelTimer!!.cancel()
-        }
+        backup?.stop()
+        updateLabelTimer?.cancel()
         if (syncObserverHandle != null) {
             ContentResolver.removeStatusChangeListener(syncObserverHandle)
             syncObserverHandle = null
@@ -289,9 +290,7 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
         binding.recentBackupsList.visibility = VISIBLE
         adapter!!.setList(list.toMutableList())
         binding.lastBackupLabel.visibility = if (list.isNotEmpty()) VISIBLE else GONE
-        if (updateLabelTimer != null) {
-            updateLabelTimer!!.cancel()
-        }
+        updateLabelTimer?.cancel()
         if (list.isNotEmpty()) {
             val time = list[0].modifiedDate!!.time
             updateLabelTimer = Timer()
@@ -380,12 +379,24 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
         startActivityForResult(intent, IMPORT_FROM_URI)
     }
 
+    @OnNeverAskAgain(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+    fun neverAskAgainForWritePermission() {
+        isLeaving = true
+        MaterialDialog.Builder(context!!)
+                .title(R.string.permission_required)
+                .content(R.string.backup_permission_explanation)
+                .positiveText(android.R.string.ok)
+                .onPositive { _, _ -> leaveBackupSettings() }
+                .show()
+    }
+
     @OnPermissionDenied(Manifest.permission.WRITE_EXTERNAL_STORAGE)
     internal fun showDeniedForWrite() {
         leaveBackupSettings()
     }
 
     private fun leaveBackupSettings() {
+        isLeaving = true
         val h = Handler()
         h.post { activity!!.supportFragmentManager.popBackStack() }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 40663d846..bc3519401 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -389,4 +389,6 @@
     <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
     <string name="keep_above_lockscreen">Keep above lockscreen</string>
     <string name="scoreboard_title_all_rounds">All rounds</string>
+    <string name="permission_required">Permission required</string>
+    <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>

From de5f4882977ca48ce2b6809f581b5146c74d7d64 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier@cqse.eu>
Date: Tue, 23 Jan 2018 21:11:01 +0100
Subject: [PATCH 052/102] Removed Kotlin EAP maven repositories

---
 build.gradle | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7ab3b8d1c..95393691a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,6 @@ buildscript {
         jcenter()
         google()
         maven { url "https://jitpack.io" }
-        maven { url "https://dl.bintray.com/kotlin/kotlin-eap" }
     }
 
     dependencies {
@@ -47,7 +46,6 @@ allprojects {
         google()
         maven { url 'https://jitpack.io' }
         maven { url 'https://clojars.org/repo/' }
-        maven { url "https://dl.bintray.com/kotlin/kotlin-eap" }
     }
 }
 

From 2a6d34e7085a319137147138cefad1595f7e3e16 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier@cqse.eu>
Date: Tue, 23 Jan 2018 21:25:17 +0100
Subject: [PATCH 053/102] Updated libraries

---
 build.gradle        |  2 +-
 dependencies.gradle | 70 ++++++++++++++++++++++-----------------------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/build.gradle b/build.gradle
index 95393691a..0a1fde1a2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@
 
 buildscript {
     ext.androidPluginVersion = '3.0.1'
-    ext.kotlinVersion = '1.2.20'
+    ext.kotlinVersion = '1.2.21'
     repositories {
         jcenter()
         google()
diff --git a/dependencies.gradle b/dependencies.gradle
index 0e4a5ef31..22c01aa49 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -17,42 +17,42 @@ ext {
     compileSdkVersionCode = 27
 
     libraryVersion = [
-            aboutPage            : '1.2.2',
-            androidLanguages     : 'v1.0.1',
-            androidState         : '1.1.6',
+            aboutPage             : '1.2.2',
+            androidLanguages      : 'v1.0.1',
+            androidState          : '1.1.6',
             architectureComponents: '1.0.0',
-            dbFlow               : '4.2.4',
-            dexmaker             : '2.2.0',
-            discreteSeekbar      : '1.0.1',
-            easyImage            : '2.0.4',
-            espresso             : '3.0.1',
-            findbugs             : '3.0.2',
-            gson                 : '2.8.2',
-            homage               : '0.2.0',
-            iab                  : '1.0.44',
-            jUnit                : '4.12',
-            materialDialogs      : '0.9.6.0',
-            materialIntroScreen  : '0.0.5',
-            mpAndroidChart       : 'v3.0.3',
-            mockito              : '2.13.0',
-            multidex             : '1.0.2',
-            okhttp               : '3.9.1',
-            permissionsdispatcher: '3.1.0',
-            photoView            : '2.1.3',
-            picasso              : '2.5.2',
-            playService          : '11.8.0',
-            screengrab           : '1.1.0',
-            retrofit             : '2.3.0',
-            roundedImageView     : '2.3.0',
-            signaturePad         : '1.2.1',
-            support              : '27.0.2',
-            supportWearable      : '2.1.0',
-            testSupport          : '1.0.1',
-            threeTenABP          : '1.0.5',
-            timber               : '4.6.0',
-            truth                : '0.37',
-            uiAutomator          : '2.1.3',
-            versionInfoDialog    : '0.1.0'
+            dbFlow                : '4.2.4',
+            dexmaker              : '2.2.0',
+            discreteSeekbar       : '1.0.1',
+            easyImage             : '2.0.4',
+            espresso              : '3.0.1',
+            findbugs              : '3.0.2',
+            gson                  : '2.8.2',
+            homage                : '0.2.0',
+            iab                   : '1.0.44',
+            jUnit                 : '4.12',
+            materialDialogs       : '0.9.6.0',
+            materialIntroScreen   : '0.0.5',
+            mpAndroidChart        : 'v3.0.3',
+            mockito               : '2.13.0',
+            multidex              : '1.0.2',
+            okhttp                : '3.9.1',
+            permissionsdispatcher : '3.1.0',
+            photoView             : '2.1.3',
+            picasso               : '2.5.2',
+            playService           : '11.8.0',
+            screengrab            : '1.1.0',
+            retrofit              : '2.3.0',
+            roundedImageView      : '2.3.0',
+            signaturePad          : '1.2.1',
+            support               : '27.0.2',
+            supportWearable       : '2.1.0',
+            testSupport           : '1.0.1',
+            threeTenABP           : '1.0.5',
+            timber                : '4.6.0',
+            truth                 : '0.39',
+            uiAutomator           : '2.1.3',
+            versionInfoDialog     : '0.1.0'
     ]
 
     dependencies = [

From b3403d2d3a90a448f3763d268cc529bc7f85e167 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier@cqse.eu>
Date: Wed, 24 Jan 2018 15:43:50 +0100
Subject: [PATCH 054/102] Fixed loader creation

---
 .../java/de/dreier/mytargets/base/fragments/FragmentBase.kt   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
index 3e4261161..811c492ca 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
@@ -57,15 +57,17 @@ abstract class FragmentBase : Fragment(), LoaderManager.LoaderCallbacks<Fragment
 
     @SuppressLint("StaticFieldLeak")
     override fun onCreateLoader(id: Int, args: Bundle?): Loader<LoaderUICallbackHelper>? {
-        val callback = onLoad(args)
         return  object : AsyncTaskLoader<LoaderUICallbackHelper>(context!!) {
             override fun loadInBackground(): LoaderUICallbackHelper? {
+                val callback = onLoad(args)
                 return object : LoaderUICallbackHelper {
                     override fun applyData() {
                         callback.invoke()
                     }
                 }
             }
+
+
         }
     }
 

From 7518ae66118adee822fef984c0ce9f60c6efd5df Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Wed, 14 Mar 2018 20:28:28 +0100
Subject: [PATCH 055/102] Updated state saver library

---
 app/build.gradle                              |  2 +-
 .../mytargets/app/ApplicationInstance.kt      |  2 +
 .../mytargets/base/fragments/FragmentBase.kt  | 11 ---
 .../mytargets/base/gallery/GalleryActivity.kt |  7 --
 .../features/statistics/StatisticsActivity.kt |  6 --
 .../features/training/input/InputActivity.kt  |  6 --
 build.gradle                                  |  2 +-
 dependencies.gradle                           | 73 ++++++++++---------
 shared/build.gradle                           |  2 +-
 wearable/build.gradle                         |  2 +-
 10 files changed, 43 insertions(+), 70 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index bc7cc1f72..bb1d0fd4b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -225,4 +225,4 @@ dependencies {
 // Must be at the bottom
 if (HAS_GMS_SECRET) {
     apply plugin: 'com.google.gms.google-services'
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
index a3e62c9ee..86f888f71 100644
--- a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
+++ b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
@@ -20,6 +20,7 @@ import android.content.SharedPreferences
 import android.content.res.Configuration
 import android.support.multidex.MultiDex
 import android.util.Log
+import com.evernote.android.state.StateSaver
 import com.google.firebase.crash.FirebaseCrash
 import com.raizlabs.android.dbflow.config.FlowConfig
 import com.raizlabs.android.dbflow.config.FlowManager
@@ -58,6 +59,7 @@ class ApplicationInstance : SharedApplicationInstance() {
         handleDatabaseImport()
         initFlowManager(this)
         wearableClient = MobileWearableClient(this)
+        StateSaver.setEnabledForAllActivitiesAndSupportFragments(this, true);
     }
 
     private fun handleDatabaseImport() {
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
index 811c492ca..ff86dfe90 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
@@ -38,17 +38,6 @@ abstract class FragmentBase : Fragment(), LoaderManager.LoaderCallbacks<Fragment
 
     protected lateinit var navigationController: NavigationController
 
-    @CallSuper
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        StateSaver.restoreInstanceState(this, savedInstanceState)
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        StateSaver.saveInstanceState(this, outState)
-    }
-
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         navigationController = NavigationController(this)
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
index 9db1681c5..d50c6e97d 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
@@ -66,8 +66,6 @@ class GalleryActivity : ChildActivityBase() {
         val title = intent.getStringExtra(EXTRA_TITLE)
         if (savedInstanceState == null) {
             imageList = intent.getParcelableExtra(EXTRA_IMAGES)
-        } else {
-            StateSaver.restoreInstanceState(this, savedInstanceState)
         }
 
         setSupportActionBar(binding.toolbar)
@@ -173,11 +171,6 @@ class GalleryActivity : ChildActivityBase() {
         navigationController.setResultSuccess(imageList)
     }
 
-    public override fun onSaveInstanceState(outState: Bundle?) {
-        super.onSaveInstanceState(outState)
-        StateSaver.saveInstanceState(this, outState!!)
-    }
-
     @NeedsPermission(Manifest.permission.CAMERA)
     internal fun onTakePicture() {
         EasyImage.openCamera(this, 0)
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
index ceeb42e09..9e1388c70 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
@@ -80,7 +80,6 @@ class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<Li
         binding.progressBar.show()
 
         ToolbarUtils.showHomeAsUp(this)
-        StateSaver.restoreInstanceState(this, savedInstanceState)
 
         loaderManager.initLoader(0, intent.extras, this).forceLoad()
     }
@@ -246,11 +245,6 @@ class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<Li
                 .map { Tag(it.id, it.toString()) }
     }
 
-    public override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        StateSaver.saveInstanceState(this, outState)
-    }
-
     override fun onLoaderReset(loader: Loader<List<Pair<Training, Round>>>) {
 
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
index 7067519be..16eb38eb8 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
@@ -110,7 +110,6 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
 
         updateSummaryVisibility()
 
-        StateSaver.restoreInstanceState(this, savedInstanceState)
         if (data == null) {
             supportLoaderManager.initLoader(0, intent.extras, this).forceLoad()
         }
@@ -445,11 +444,6 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
         invalidateOptionsMenu()
     }
 
-    public override fun onSaveInstanceState(outState: Bundle?) {
-        super.onSaveInstanceState(outState)
-        StateSaver.saveInstanceState(this, outState!!)
-    }
-
     private class UITaskAsyncTaskLoader(
             context: Context,
             private val trainingId: Long,
diff --git a/build.gradle b/build.gradle
index 0a1fde1a2..6107c2499 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ buildscript {
         classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
         classpath 'com.dicedmelon.gradle:jacoco-android:0.1.2'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
-        classpath 'com.google.gms:google-services:3.1.2'
+        classpath 'com.google.gms:google-services:3.2.0'
         classpath 'com.google.firebase:firebase-plugins:1.1.5'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
diff --git a/dependencies.gradle b/dependencies.gradle
index 22c01aa49..5f5d7378d 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -17,42 +17,43 @@ ext {
     compileSdkVersionCode = 27
 
     libraryVersion = [
-            aboutPage             : '1.2.2',
-            androidLanguages      : 'v1.0.1',
-            androidState          : '1.1.6',
-            architectureComponents: '1.0.0',
-            dbFlow                : '4.2.4',
-            dexmaker              : '2.2.0',
-            discreteSeekbar       : '1.0.1',
-            easyImage             : '2.0.4',
-            espresso              : '3.0.1',
-            findbugs              : '3.0.2',
-            gson                  : '2.8.2',
-            homage                : '0.2.0',
-            iab                   : '1.0.44',
-            jUnit                 : '4.12',
-            materialDialogs       : '0.9.6.0',
-            materialIntroScreen   : '0.0.5',
-            mpAndroidChart        : 'v3.0.3',
-            mockito               : '2.13.0',
-            multidex              : '1.0.2',
-            okhttp                : '3.9.1',
-            permissionsdispatcher : '3.1.0',
-            photoView             : '2.1.3',
-            picasso               : '2.5.2',
-            playService           : '11.8.0',
-            screengrab            : '1.1.0',
-            retrofit              : '2.3.0',
-            roundedImageView      : '2.3.0',
-            signaturePad          : '1.2.1',
-            support               : '27.0.2',
-            supportWearable       : '2.1.0',
-            testSupport           : '1.0.1',
-            threeTenABP           : '1.0.5',
-            timber                : '4.6.0',
-            truth                 : '0.39',
-            uiAutomator           : '2.1.3',
-            versionInfoDialog     : '0.1.0'
+            aboutPage                 : '1.2.2',
+            androidLanguages          : 'v1.0.1',
+            androidState              : '1.2.0',
+            architectureComponents    : '1.1.0',
+            architectureComponentsRoom: '1.0.0',
+            dbFlow                    : '4.2.4',
+            dexmaker                  : '2.2.0',
+            discreteSeekbar           : '1.0.1',
+            easyImage                 : '2.0.4',
+            espresso                  : '3.0.1',
+            findbugs                  : '3.0.2',
+            gson                      : '2.8.2',
+            homage                    : '0.2.0',
+            iab                       : '1.0.44',
+            jUnit                     : '4.12',
+            materialDialogs           : '0.9.6.0',
+            materialIntroScreen       : '0.0.5',
+            mpAndroidChart            : 'v3.0.3',
+            mockito                   : '2.15.0',
+            multidex                  : '1.0.2',
+            okhttp                    : '3.9.1',
+            permissionsdispatcher     : '3.1.0',
+            photoView                 : '2.1.3',
+            picasso                   : '2.5.2',
+            playService               : '11.8.0',
+            screengrab                : '1.1.0',
+            retrofit                  : '2.3.0',
+            roundedImageView          : '2.3.0',
+            signaturePad              : '1.2.1',
+            support                   : '27.0.2',
+            supportWearable           : '2.2.0',
+            testSupport               : '1.0.1',
+            threeTenABP               : '1.0.5',
+            timber                    : '4.6.1',
+            truth                     : '0.39',
+            uiAutomator               : '2.1.3',
+            versionInfoDialog         : '0.1.0'
     ]
 
     dependencies = [
diff --git a/shared/build.gradle b/shared/build.gradle
index c8452bf3b..2b2bf0aeb 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -70,4 +70,4 @@ dependencies {
     testImplementation dependencies.mockito
     androidTestImplementation dependencies.runner
     implementation dependencies.kotlinStdlibJre7
-}
+}
\ No newline at end of file
diff --git a/wearable/build.gradle b/wearable/build.gradle
index 329920cdf..8b20162ef 100644
--- a/wearable/build.gradle
+++ b/wearable/build.gradle
@@ -84,4 +84,4 @@ dependencies {
 
     implementation project(':shared')
     implementation dependencies.kotlinStdlibJre7
-}
+}
\ No newline at end of file

From 2568ebfe5222b1fedc487d9461aa03ce801bbae0 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Wed, 14 Mar 2018 19:56:05 +0100
Subject: [PATCH 056/102] Updated dependencies

---
 build.gradle               |  2 +-
 dependencies.gradle        | 15 +++++++--------
 tools/script-codacy.gradle |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6107c2499..03372940b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@
 
 buildscript {
     ext.androidPluginVersion = '3.0.1'
-    ext.kotlinVersion = '1.2.21'
+    ext.kotlinVersion = '1.2.30'
     repositories {
         jcenter()
         google()
diff --git a/dependencies.gradle b/dependencies.gradle
index 5f5d7378d..62775f1b2 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -17,7 +17,7 @@ ext {
     compileSdkVersionCode = 27
 
     libraryVersion = [
-            aboutPage                 : '1.2.2',
+            aboutPage                 : '1.2.3',
             androidLanguages          : 'v1.0.1',
             androidState              : '1.2.0',
             architectureComponents    : '1.1.0',
@@ -35,18 +35,18 @@ ext {
             materialDialogs           : '0.9.6.0',
             materialIntroScreen       : '0.0.5',
             mpAndroidChart            : 'v3.0.3',
-            mockito                   : '2.15.0',
-            multidex                  : '1.0.2',
-            okhttp                    : '3.9.1',
+            mockito                   : '2.16.0',
+            multidex                  : '1.0.3',
+            okhttp                    : '3.10.0',
             permissionsdispatcher     : '3.1.0',
             photoView                 : '2.1.3',
-            picasso                   : '2.5.2',
+            picasso                   : '2.71828',
             playService               : '11.8.0',
             screengrab                : '1.1.0',
-            retrofit                  : '2.3.0',
+            retrofit                  : '2.4.0',
             roundedImageView          : '2.3.0',
             signaturePad              : '1.2.1',
-            support                   : '27.0.2',
+            support                   : '27.1.0',
             supportWearable           : '2.2.0',
             testSupport               : '1.0.1',
             threeTenABP               : '1.0.5',
@@ -152,7 +152,6 @@ ext {
             kotlinTest                    : "org.jetbrains.kotlin:kotlin-test:$kotlinVersion",
             kotlinTestJunit               : "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion",
 
-
             multiDex                      : "com.android.support:multidex:$libraryVersion.multidex",
 
             threeTenABP                   : "com.jakewharton.threetenabp:threetenabp:$libraryVersion.threeTenABP",
diff --git a/tools/script-codacy.gradle b/tools/script-codacy.gradle
index 613ac0825..4dd936bef 100644
--- a/tools/script-codacy.gradle
+++ b/tools/script-codacy.gradle
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    codacy 'com.github.codacy:codacy-coverage-reporter:2.0.2'
+    codacy 'com.github.codacy:codacy-coverage-reporter:3.0.0'
 }
 
 task sendCoverageToCodacy(type: JavaExec, dependsOn: jacocoTestReport) {

From bfe2420526aaf16059a6148c4fad6000a553bdc4 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Wed, 14 Mar 2018 20:26:48 +0100
Subject: [PATCH 057/102] Added code style settings

---
 .idea/codeStyleSettings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 8c198c008..e0cf5608a 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -34,6 +34,9 @@
         <AndroidXmlCodeStyleSettings>
           <option name="USE_CUSTOM_SETTINGS" value="true" />
         </AndroidXmlCodeStyleSettings>
+        <JetCodeStyleSettings>
+          <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+        </JetCodeStyleSettings>
         <Objective-C-extensions>
           <file>
             <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
@@ -225,6 +228,9 @@
             </rules>
           </arrangement>
         </codeStyleSettings>
+        <codeStyleSettings language="kotlin">
+          <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+        </codeStyleSettings>
       </value>
     </option>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />

From 0df0565052673f80909a773f104289ba1a316bf5 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Wed, 14 Mar 2018 20:31:13 +0100
Subject: [PATCH 058/102] Fixed dependency stuff

---
 .../java/de/dreier/mytargets/base/fragments/FragmentBase.kt | 6 ++----
 .../mytargets/features/training/input/InputActivity.kt      | 6 ++++--
 dependencies.gradle                                         | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
index ff86dfe90..75478f001 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
@@ -45,8 +45,8 @@ abstract class FragmentBase : Fragment(), LoaderManager.LoaderCallbacks<Fragment
     }
 
     @SuppressLint("StaticFieldLeak")
-    override fun onCreateLoader(id: Int, args: Bundle?): Loader<LoaderUICallbackHelper>? {
-        return  object : AsyncTaskLoader<LoaderUICallbackHelper>(context!!) {
+    override fun onCreateLoader(id: Int, args: Bundle?): Loader<LoaderUICallbackHelper> {
+        return object : AsyncTaskLoader<LoaderUICallbackHelper>(context!!) {
             override fun loadInBackground(): LoaderUICallbackHelper? {
                 val callback = onLoad(args)
                 return object : LoaderUICallbackHelper {
@@ -55,8 +55,6 @@ abstract class FragmentBase : Fragment(), LoaderManager.LoaderCallbacks<Fragment
                     }
                 }
             }
-
-
         }
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
index 16eb38eb8..570d74184 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
@@ -38,7 +38,6 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import com.afollestad.materialdialogs.MaterialDialog
 import com.evernote.android.state.State
-import com.evernote.android.state.StateSaver
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.activities.ChildActivityBase
@@ -246,7 +245,10 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
         return true
     }
 
-    override fun onCreateLoader(id: Int, args: Bundle): Loader<LoaderResult> {
+    override fun onCreateLoader(id: Int, args: Bundle?): Loader<LoaderResult> {
+        if (args == null) {
+            throw IllegalArgumentException("Bundle expected")
+        }
         val trainingId = args.getLong(TRAINING_ID)
         val roundId = args.getLong(ROUND_ID)
         val endIndex = args.getInt(END_INDEX)
diff --git a/dependencies.gradle b/dependencies.gradle
index 62775f1b2..ab004eab3 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -40,7 +40,7 @@ ext {
             okhttp                    : '3.10.0',
             permissionsdispatcher     : '3.1.0',
             photoView                 : '2.1.3',
-            picasso                   : '2.71828',
+            picasso                   : '2.5.2',
             playService               : '11.8.0',
             screengrab                : '1.1.0',
             retrofit                  : '2.4.0',

From ed61f47bba3fabfb01040bc55cfb2f296084ce33 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Wed, 14 Mar 2018 20:41:43 +0100
Subject: [PATCH 059/102] Replaced Firebase Crash Reporting with Crashlytics

---
 app/build.gradle    | 6 ++++--
 build.gradle        | 3 +++
 dependencies.gradle | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index bb1d0fd4b..34c112298 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,7 +20,7 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.github.triplet.play'
 apply plugin: 'jacoco-android'
 apply plugin: 'com.getkeepsafe.dexcount'
-apply plugin: 'com.google.firebase.firebase-crash'
+apply plugin: 'io.fabric'
 
 android {
     compileOptions {
@@ -139,7 +139,9 @@ dependencies {
 
     implementation dependencies.playServicesDrive
     implementation dependencies.firebaseCore
-    implementation dependencies.firebaseCrash
+    implementation(dependencies.firebaseCrashlytics) {
+        transitive = true
+    }
 
     implementation dependencies.gson
 
diff --git a/build.gradle b/build.gradle
index 03372940b..41a0a1d6d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,6 +20,7 @@ buildscript {
         jcenter()
         google()
         maven { url "https://jitpack.io" }
+        maven { url 'https://maven.fabric.io/public' }
     }
 
     dependencies {
@@ -30,6 +31,7 @@ buildscript {
         classpath 'com.google.gms:google-services:3.2.0'
         classpath 'com.google.firebase:firebase-plugins:1.1.5'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath 'io.fabric.tools:gradle:1.25.1'
     }
 }
 
@@ -46,6 +48,7 @@ allprojects {
         google()
         maven { url 'https://jitpack.io' }
         maven { url 'https://clojars.org/repo/' }
+        maven { url 'https://maven.google.com/' }
     }
 }
 
diff --git a/dependencies.gradle b/dependencies.gradle
index ab004eab3..e2d8dd6ab 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -22,6 +22,7 @@ ext {
             androidState              : '1.2.0',
             architectureComponents    : '1.1.0',
             architectureComponentsRoom: '1.0.0',
+            crashlytics               : '2.9.1',
             dbFlow                    : '4.2.4',
             dexmaker                  : '2.2.0',
             discreteSeekbar           : '1.0.1',
@@ -83,7 +84,7 @@ ext {
             playServicesDrive             : "com.google.android.gms:play-services-drive:$libraryVersion.playService",
             playServicesWearable          : "com.google.android.gms:play-services-wearable:$libraryVersion.playService",
             firebaseCore                  : "com.google.firebase:firebase-core:$libraryVersion.playService",
-            firebaseCrash                 : "com.google.firebase:firebase-crash:$libraryVersion.playService",
+            firebaseCrashlytics           : "com.crashlytics.sdk.android:crashlytics:$libraryVersion.crashlytics@aar",
 
             gson                          : "com.google.code.gson:gson:$libraryVersion.gson",
 

From ec48dbb2f5ec414a53b9385aa19fee57295ffc75 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Wed, 14 Mar 2018 20:50:19 +0100
Subject: [PATCH 060/102] Fixed report logs

---
 .../java/de/dreier/mytargets/app/ApplicationInstance.kt   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
index 86f888f71..6cecb5255 100644
--- a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
+++ b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
@@ -20,8 +20,8 @@ import android.content.SharedPreferences
 import android.content.res.Configuration
 import android.support.multidex.MultiDex
 import android.util.Log
+import com.crashlytics.android.Crashlytics
 import com.evernote.android.state.StateSaver
-import com.google.firebase.crash.FirebaseCrash
 import com.raizlabs.android.dbflow.config.FlowConfig
 import com.raizlabs.android.dbflow.config.FlowManager
 import de.dreier.mytargets.BuildConfig
@@ -90,13 +90,13 @@ class ApplicationInstance : SharedApplicationInstance() {
                 return
             }
 
-            FirebaseCrash.log(message)
+            Crashlytics.log(message)
 
             if (t != null) {
                 if (priority == Log.ERROR) {
-                    FirebaseCrash.report(t)
+                    Crashlytics.logException(t)
                 } else if (priority == Log.WARN) {
-                    FirebaseCrash.report(t)
+                    Crashlytics.logException(t)
                 }
             }
         }

From 65960adc005f9f75f2d72f2a497d5d8799aa7fa1 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier@cqse.eu>
Date: Sun, 28 Jan 2018 10:45:45 +0100
Subject: [PATCH 061/102] Converted migrations and tables to Room Entities

---
 .idea/misc.xml                                |  14 +-
 app/build.gradle                              |  18 +-
 .../main/assets/migrations/database/10.sql    |   3 -
 .../main/assets/migrations/database/11.sql    |   3 -
 .../main/assets/migrations/database/12.sql    |   2 -
 .../main/assets/migrations/database/13.sql    |  12 -
 .../main/assets/migrations/database/14.sql    |   5 -
 .../main/assets/migrations/database/15.sql    |   5 -
 .../main/assets/migrations/database/16.sql    |  12 -
 .../main/assets/migrations/database/17.sql    |  34 ---
 .../main/assets/migrations/database/18.sql    | 249 ----------------
 .../main/assets/migrations/database/19.sql    |   4 -
 app/src/main/assets/migrations/database/2.sql |   1 -
 .../main/assets/migrations/database/20.sql    |   6 -
 .../main/assets/migrations/database/24.sql    |  86 ------
 .../main/assets/migrations/database/25.sql    |   3 -
 app/src/main/assets/migrations/database/5.sql |  27 --
 app/src/main/assets/migrations/database/7.sql |   3 -
 app/src/main/assets/migrations/database/8.sql |   3 -
 .../mytargets/app/ApplicationInstance.kt      |  22 +-
 .../mytargets/features/bows/BowAdapter.kt     |   3 +-
 .../features/bows/EditBowFragment.kt          |   2 +-
 .../features/distance/DistanceGridFragment.kt |  12 +-
 .../StandardRoundListFragment.kt              |   3 +-
 dependencies.gradle                           |   3 +
 shared/build.gradle                           |   6 +-
 .../base/db/migrations/Migration0.kt          |  63 ----
 .../base/db/migrations/Migration10.kt         |  27 ++
 .../base/db/migrations/Migration11.kt         |  27 ++
 .../base/db/migrations/Migration12.kt         |  26 ++
 .../base/db/migrations/Migration13.kt         |  36 +++
 .../base/db/migrations/Migration14.kt         |  29 ++
 .../base/db/migrations/Migration15.kt         |  29 ++
 .../base/db/migrations/Migration16.kt         |  36 +++
 .../base/db/migrations/Migration17.kt         |  58 ++++
 .../base/db/migrations/Migration18.kt         | 269 ++++++++++++++++++
 .../base/db/migrations/Migration19.kt         |  28 ++
 .../base/db/migrations/Migration2.kt          |  25 ++
 .../base/db/migrations/Migration20.kt         |  30 ++
 .../base/db/migrations/Migration21.kt         |  24 ++
 .../base/db/migrations/Migration22.kt         |  14 +-
 .../base/db/migrations/Migration23.kt         |  53 ++--
 .../base/db/migrations/Migration24.kt         | 106 +++++++
 .../base/db/migrations/Migration25.kt         |  27 ++
 .../base/db/migrations/Migration26.kt         |  89 +++---
 .../base/db/migrations/Migration3.kt          |  16 +-
 .../base/db/migrations/Migration4.kt          |  12 +-
 .../base/db/migrations/Migration5.kt          |  51 ++++
 .../base/db/migrations/Migration6.kt          |  18 +-
 .../base/db/migrations/Migration7.kt          |  27 ++
 .../base/db/migrations/Migration8.kt          |  27 ++
 .../base/db/migrations/Migration9.kt          | 158 +++++-----
 .../db/migrations/RoomCreationCallback.kt     |  58 ++++
 .../de/dreier/mytargets/shared/AppDatabase.kt |  45 ++-
 .../shared/SharedApplicationInstance.kt       |   9 +-
 .../dreier/mytargets/shared/models/Target.kt  |   4 +
 .../mytargets/shared/models/db/Arrow.kt       |  41 +--
 .../mytargets/shared/models/db/ArrowImage.kt  |  21 +-
 .../dreier/mytargets/shared/models/db/Bow.kt  |  61 +---
 .../mytargets/shared/models/db/BowImage.kt    |  21 +-
 .../dreier/mytargets/shared/models/db/End.kt  |  44 +--
 .../mytargets/shared/models/db/EndImage.kt    |  21 +-
 .../mytargets/shared/models/db/Round.kt       |  58 ++--
 .../shared/models/db/RoundTemplate.kt         |  46 +--
 .../dreier/mytargets/shared/models/db/Shot.kt |  23 +-
 .../mytargets/shared/models/db/SightMark.kt   |  21 +-
 .../mytargets/shared/models/db/Signature.kt   |  18 +-
 .../shared/models/db/StandardRound.kt         |  17 +-
 .../mytargets/shared/models/db/Training.kt    |  88 +++---
 .../targets/scoringstyle/ScoringStyle.kt      |   2 +-
 ...BitmapConverter.kt => BitmapConverters.kt} |  15 +-
 .../typeconverters/DimensionConverter.kt      |  11 +-
 ...TypeConverter.kt => EBowTypeConverters.kt} |  11 +-
 ...therConverter.kt => EWeatherConverters.kt} |  11 +-
 ...ateConverter.kt => LocalDateConverters.kt} |  11 +-
 ...imeConverter.kt => LocalTimeConverters.kt} |  11 +-
 ...ailConverter.kt => ThumbnailConverters.kt} |  16 +-
 77 files changed, 1433 insertions(+), 1097 deletions(-)
 delete mode 100644 app/src/main/assets/migrations/database/10.sql
 delete mode 100644 app/src/main/assets/migrations/database/11.sql
 delete mode 100644 app/src/main/assets/migrations/database/12.sql
 delete mode 100644 app/src/main/assets/migrations/database/13.sql
 delete mode 100644 app/src/main/assets/migrations/database/14.sql
 delete mode 100644 app/src/main/assets/migrations/database/15.sql
 delete mode 100644 app/src/main/assets/migrations/database/16.sql
 delete mode 100644 app/src/main/assets/migrations/database/17.sql
 delete mode 100644 app/src/main/assets/migrations/database/18.sql
 delete mode 100644 app/src/main/assets/migrations/database/19.sql
 delete mode 100644 app/src/main/assets/migrations/database/2.sql
 delete mode 100644 app/src/main/assets/migrations/database/20.sql
 delete mode 100644 app/src/main/assets/migrations/database/24.sql
 delete mode 100644 app/src/main/assets/migrations/database/25.sql
 delete mode 100644 app/src/main/assets/migrations/database/5.sql
 delete mode 100644 app/src/main/assets/migrations/database/7.sql
 delete mode 100644 app/src/main/assets/migrations/database/8.sql
 delete mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration0.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration10.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration11.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration12.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration13.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration14.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration15.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration16.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration17.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration18.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration19.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration2.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration20.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration21.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration24.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration25.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration5.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration7.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration8.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
 rename shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/{BitmapConverter.kt => BitmapConverters.kt} (65%)
 rename shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/{EBowTypeConverter.kt => EBowTypeConverters.kt} (76%)
 rename shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/{EWeatherConverter.kt => EWeatherConverters.kt} (77%)
 rename shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/{LocalDateConverter.kt => LocalDateConverters.kt} (76%)
 rename shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/{LocalTimeConverter.kt => LocalTimeConverters.kt} (76%)
 rename shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/{ThumbnailConverter.kt => ThumbnailConverters.kt} (61%)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 701d67a30..26a936db9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,12 +4,14 @@
     <option name="CORE_LIBRARY" value="true" />
   </component>
   <component name="EntryPointsManager">
-    <list size="5">
-      <item index="0" class="java.lang.String" itemvalue="android.databinding.BindingAdapter" />
-      <item index="1" class="java.lang.String" itemvalue="android.databinding.InverseBindingAdapter" />
-      <item index="2" class="java.lang.String" itemvalue="butterknife.OnClick" />
-      <item index="3" class="java.lang.String" itemvalue="butterknife.OnTextChanged" />
-      <item index="4" class="java.lang.String" itemvalue="org.junit.Rule" />
+    <list size="7">
+      <item index="0" class="java.lang.String" itemvalue="android.arch.persistence.room.Query" />
+      <item index="1" class="java.lang.String" itemvalue="android.arch.persistence.room.Query" />
+      <item index="2" class="java.lang.String" itemvalue="android.databinding.BindingAdapter" />
+      <item index="3" class="java.lang.String" itemvalue="android.databinding.InverseBindingAdapter" />
+      <item index="4" class="java.lang.String" itemvalue="butterknife.OnClick" />
+      <item index="5" class="java.lang.String" itemvalue="butterknife.OnTextChanged" />
+      <item index="6" class="java.lang.String" itemvalue="org.junit.Rule" />
     </list>
   </component>
   <component name="NullableNotNullManager">
diff --git a/app/build.gradle b/app/build.gradle
index 34c112298..6ad574644 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,6 +45,16 @@ android {
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
         vectorDrawables.useSupportLibrary true
         playAccountConfig = playAccountConfigs.defaultAccountConfig
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
+            }
+        }
+    }
+
+    // used by Room, to test migrations
+    sourceSets {
+        androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
 
     dataBinding {
@@ -178,11 +188,6 @@ dependencies {
 
     implementation dependencies.materialIntroScreen
 
-    kapt dependencies.dbFlowProcessor
-    implementation dependencies.dbFlowCore
-    implementation dependencies.dbFlow
-    implementation dependencies.dbFlowKotlinExtensions
-
     implementation dependencies.photoView
 
     implementation dependencies.androidLanguages
@@ -193,6 +198,8 @@ dependencies {
 
     implementation dependencies.archLifecycleExtensions
     kapt dependencies.archLifecycleCompiler
+    implementation dependencies.archRoomRuntime
+    kapt dependencies.archRoomCompiler
 
     implementation project(':shared')
     wearApp project(':wearable')
@@ -220,6 +227,7 @@ dependencies {
 
     implementation dependencies.espressoIdlingResource
     androidTestScreengrabImplementation dependencies.screengrab
+    androidTestImplementation dependencies.archRoomTesting
 
     implementation dependencies.multiDex
 }
diff --git a/app/src/main/assets/migrations/database/10.sql b/app/src/main/assets/migrations/database/10.sql
deleted file mode 100644
index 0887974d5..000000000
--- a/app/src/main/assets/migrations/database/10.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE BOW ADD COLUMN limbs TEXT DEFAULT '';
-ALTER TABLE BOW ADD COLUMN sight TEXT DEFAULT '';
-ALTER TABLE BOW ADD COLUMN draw_weight TEXT DEFAULT '';
diff --git a/app/src/main/assets/migrations/database/11.sql b/app/src/main/assets/migrations/database/11.sql
deleted file mode 100644
index 259ca4f89..000000000
--- a/app/src/main/assets/migrations/database/11.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE ARROW ADD COLUMN tip_weight TEXT DEFAULT '';
-ALTER TABLE PASSE ADD COLUMN exact INTEGER DEFAULT 0;
-UPDATE PASSE SET exact=1 WHERE _id IN (SELECT DISTINCT p._id FROM PASSE p, SHOOT s WHERE p._id=s.passe AND s.x!=0);
diff --git a/app/src/main/assets/migrations/database/12.sql b/app/src/main/assets/migrations/database/12.sql
deleted file mode 100644
index 732e43822..000000000
--- a/app/src/main/assets/migrations/database/12.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE BOW ADD COLUMN stabilizer TEXT DEFAULT '';
-ALTER TABLE BOW ADD COLUMN clicker TEXT DEFAULT '';
diff --git a/app/src/main/assets/migrations/database/13.sql b/app/src/main/assets/migrations/database/13.sql
deleted file mode 100644
index 3638077f8..000000000
--- a/app/src/main/assets/migrations/database/13.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-UPDATE PASSE SET exact=1
-WHERE _id IN (SELECT DISTINCT p._id
-  FROM PASSE p, SHOOT s
-  WHERE p._id=s.passe
-  AND s.x!=0);
-ALTER TABLE TRAINING ADD COLUMN exact INTEGER DEFAULT 0;
-UPDATE TRAINING SET exact=1
-WHERE _id IN (SELECT DISTINCT t._id
-  FROM TRAINING t, ROUND r, PASSE p
-  WHERE t._id=r.training
-  AND r._id=p.round
-  AND p.exact=1);
diff --git a/app/src/main/assets/migrations/database/14.sql b/app/src/main/assets/migrations/database/14.sql
deleted file mode 100644
index 27c396f1b..000000000
--- a/app/src/main/assets/migrations/database/14.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-UPDATE PASSE SET exact=1 WHERE _id IN (SELECT DISTINCT p._id
-  FROM PASSE p, ROUND r, TRAINING t
-  WHERE p.round=r._id
-  AND r.training=t._id
-  AND t.exact=1);
diff --git a/app/src/main/assets/migrations/database/15.sql b/app/src/main/assets/migrations/database/15.sql
deleted file mode 100644
index a06ffd5da..000000000
--- a/app/src/main/assets/migrations/database/15.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-UPDATE SHOOT SET arrow=NULL WHERE arrow='-1';
-UPDATE PASSE SET exact=1 WHERE _id IN (SELECT DISTINCT p._id
-  FROM PASSE p, SHOOT s
-  WHERE p._id=s.passe
-  AND s.x!=0);
diff --git a/app/src/main/assets/migrations/database/16.sql b/app/src/main/assets/migrations/database/16.sql
deleted file mode 100644
index ff15b7b1b..000000000
--- a/app/src/main/assets/migrations/database/16.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-ALTER TABLE ARROW ADD COLUMN diameter TEXT DEFAULT '5.0';
-ALTER TABLE ARROW ADD COLUMN diameter_unit TEXT DEFAULT 'mm';
-ALTER TABLE PASSE ADD COLUMN save_time INTEGER;
-UPDATE PASSE
-SET save_time=(
-  SELECT t.datum + 43200000 + COUNT(p2._id) * 300000
-  FROM TRAINING t
-  JOIN  ROUND r1 ON r1.training = t._id AND r1._id = PASSE.round
-  LEFT OUTER JOIN ROUND r2 ON r2.training = t._id
-  LEFT OUTER JOIN PASSE p2 ON r2._id = p2.round AND p2._id < PASSE._id
-  GROUP BY t._id, t.datum
-);
diff --git a/app/src/main/assets/migrations/database/17.sql b/app/src/main/assets/migrations/database/17.sql
deleted file mode 100644
index 93350e142..000000000
--- a/app/src/main/assets/migrations/database/17.sql
+++ /dev/null
@@ -1,34 +0,0 @@
-CREATE TEMP TABLE IF NOT EXISTS DAIR_TRANSLATION AS
-SELECT  sr._id
-FROM STANDARD_ROUND_TEMPLATE sr
-WHERE sr._id>198
-AND sr.club<256
-AND sr.name='DAIR 380';
-CREATE TEMP TABLE IF NOT EXISTS SR_TRANSLATION AS
-SELECT  sr._id AS fromSR, (4+sr._id-(SELECT MAX(tr._id) FROM DAIR_TRANSLATION tr WHERE tr._id-4<sr._id)) AS toSR
-FROM STANDARD_ROUND_TEMPLATE sr
-WHERE sr._id>198
-AND sr.club<256;
-CREATE TEMP TABLE IF NOT EXISTS R_TRANSLATION AS
-SELECT  r1._id AS fromR, r2._id AS toR
-FROM ROUND_TEMPLATE r1, ROUND_TEMPLATE r2, SR_TRANSLATION sr
-WHERE r1.sid=sr.fromSR
-AND r2.sid=sr.toSR
-AND r1.r_index=r2.r_index;
-UPDATE ROUND
-SET template = (SELECT toR
-  FROM R_TRANSLATION
-  WHERE fromR=template)
-WHERE template IN (SELECT fromR FROM R_TRANSLATION);
-UPDATE TRAINING
-SET standard_round = (SELECT toSR
-  FROM SR_TRANSLATION
-  WHERE fromSR=standard_round)
-  WHERE standard_round IN (SELECT fromSR FROM SR_TRANSLATION);
-DELETE FROM STANDARD_ROUND_TEMPLATE
-WHERE _id IN (SELECT fromSR FROM SR_TRANSLATION);
-DELETE FROM ROUND_TEMPLATE
-WHERE _id IN (SELECT fromR FROM R_TRANSLATION);
-DROP TABLE DAIR_TRANSLATION;
-DROP TABLE SR_TRANSLATION;
-DROP TABLE R_TRANSLATION;
diff --git a/app/src/main/assets/migrations/database/18.sql b/app/src/main/assets/migrations/database/18.sql
deleted file mode 100644
index 51091bc3c..000000000
--- a/app/src/main/assets/migrations/database/18.sql
+++ /dev/null
@@ -1,249 +0,0 @@
--- Rename existing tables
-DROP TABLE IF EXISTS ROUND_OLD;
-DROP TABLE IF EXISTS `End`;
-DROP TABLE IF EXISTS `StandardRound`;
-DROP TABLE IF EXISTS `RoundTemplate`;
-DROP TABLE IF EXISTS `Shot`;
-DROP TABLE IF EXISTS `SightMark`;
-ALTER TABLE ARROW RENAME TO ARROW_OLD;
-ALTER TABLE BOW RENAME TO BOW_OLD;
-ALTER TABLE PASSE RENAME TO PASSE_OLD;
-ALTER TABLE ROUND RENAME TO ROUND_OLD;
-ALTER TABLE ROUND_TEMPLATE RENAME TO ROUND_TEMPLATE_OLD;
-ALTER TABLE SHOOT RENAME TO SHOOT_OLD;
-ALTER TABLE STANDARD_ROUND_TEMPLATE RENAME TO STANDARD_ROUND_TEMPLATE_OLD;
-ALTER TABLE TRAINING RENAME TO TRAINING_OLD;
-ALTER TABLE VISIER RENAME TO VISIER_OLD;
-
--- Arrow migration
-CREATE TABLE IF NOT EXISTS `Arrow`(
-    `_id` INTEGER PRIMARY KEY AUTOINCREMENT,
-    `name` TEXT,
-    `length` TEXT,
-    `material` TEXT,
-    `spine` TEXT,
-    `weight` TEXT,
-    `tipWeight` TEXT,
-    `vanes` TEXT,
-    `nock` TEXT,
-    `comment` TEXT,
-    `diameter` TEXT,
-    `thumbnail` BLOB
-);
-INSERT INTO `Arrow`
-    SELECT `_id`,`name`,`length`,`material`,`spine`,
-    `weight`,`tip_weight`,`vanes`,`nock`,
-    `comment`,`diameter` || ' ' || `diameter_unit`,
-    `thumbnail`
-    FROM ARROW_OLD;
-
--- Arrow image migration
-CREATE TABLE IF NOT EXISTS `ArrowImage`(
-    `_id` INTEGER PRIMARY KEY AUTOINCREMENT,
-    `fileName` TEXT,
-    `arrow` INTEGER,
-    FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE
-);
-INSERT INTO `ArrowImage`(`fileName`,`arrow`)
-    SELECT `image`, `_id`
-    FROM ARROW_OLD
-    WHERE `image` <> '';
-
--- Bow migration
-CREATE TABLE IF NOT EXISTS `Bow`(
-    `_id` INTEGER PRIMARY KEY AUTOINCREMENT,
-    `name` TEXT,
-    `type` INTEGER,
-    `brand` TEXT,
-    `size` TEXT,
-    `braceHeight` TEXT,
-    `tiller` TEXT,
-    `limbs` TEXT,
-    `sight` TEXT,
-    `drawWeight` TEXT,
-    `stabilizer` TEXT,
-    `clicker` TEXT,
-    `button` TEXT,
-    `string` TEXT,
-    `nockingPoint` TEXT,
-    `letoffWeight` TEXT,
-    `arrowRest` TEXT,
-    `restHorizontalPosition` TEXT,
-    `restVerticalPosition` TEXT,
-    `restStiffness` TEXT,
-    `camSetting` TEXT,
-    `scopeMagnification` TEXT,
-    `description` TEXT,
-    `thumbnail` BLOB
-);
-INSERT INTO `Bow`
-    SELECT `_id`,`name`,`type`,`brand`,`size`,
-           `height`,`tiller`,`limbs`,`sight`,
-           `draw_weight`,`stabilizer`,`clicker`,
-           '', '', '', '', '',
-           '', '', '', '', '',
-           `description`,`thumbnail`
-    FROM BOW_OLD;
-
--- Bow image migration
-CREATE TABLE IF NOT EXISTS `BowImage`(
-    `_id` INTEGER PRIMARY KEY AUTOINCREMENT,
-    `fileName` TEXT,
-    `bow` INTEGER,
-    FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE
-);
-INSERT INTO `BowImage`(`fileName`,`bow`)
-    SELECT `image`, `_id`
-    FROM BOW_OLD
-    WHERE `image` <> '';
-
--- StandardRound migration
-CREATE TABLE IF NOT EXISTS `StandardRound`(
-    `_id` INTEGER PRIMARY KEY AUTOINCREMENT,
-    `club` INTEGER,
-    `name` TEXT
-);
-INSERT INTO `StandardRound`
-    SELECT `_id`,`club`,`name`
-    FROM STANDARD_ROUND_TEMPLATE_OLD
-    WHERE `club` < 512;
-
--- RoundTemplate migration
-CREATE TABLE IF NOT EXISTS `RoundTemplate`(
-    `_id` INTEGER PRIMARY KEY AUTOINCREMENT,
-    `standardRound` INTEGER,
-    `index` INTEGER,
-    `shotsPerEnd` INTEGER,
-    `endCount` INTEGER,
-    `distance` TEXT,
-    `targetId` INTEGER,
-    `targetScoringStyle` INTEGER,
-    `targetDiameter` TEXT,
-    FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE
-);
-INSERT INTO `RoundTemplate`
-    SELECT `_id`,`sid`,`r_index`,`arrows`,`passes`,
-    `distance` || ' ' || `unit`,
-    `target`,`scoring_style`,`size` || ' ' || `target_unit`
-    FROM ROUND_TEMPLATE_OLD;
-
--- Training migration
-CREATE TABLE IF NOT EXISTS `Training`(
-    `_id` INTEGER PRIMARY KEY AUTOINCREMENT,
-    `title` TEXT,
-    `date` INTEGER,
-    `standardRound` INTEGER,
-    `bow` INTEGER,
-    `arrow` INTEGER,
-    `arrowNumbering` INTEGER,
-    `indoor` INTEGER,
-    `weather` INTEGER,
-    `windDirection` INTEGER,
-    `windSpeed` INTEGER,
-    `location` TEXT,
-    FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE NO ACTION,
-    FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL,
-    FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL
-);
-UPDATE TRAINING_OLD SET bow = null WHERE bow < 1;
-UPDATE TRAINING_OLD SET arrow = null WHERE arrow < 1;
-
-INSERT INTO `Training`
-    SELECT t.`_id`,t.`title`,t.`datum`,
-    CASE WHEN s.club < 512 THEN t.`standard_round` ELSE NULL END,
-    t.`bow`,t.`arrow`, t.`arrow_numbering`,
-    s.`indoor`,t.`weather`,t.`wind_direction`,t.`wind_speed`,t.`location`
-    FROM TRAINING_OLD t, STANDARD_ROUND_TEMPLATE_OLD s
-    WHERE t.standard_round=s._id;
-
--- Round migration
-CREATE TABLE IF NOT EXISTS `Round`(
-    `_id` INTEGER PRIMARY KEY AUTOINCREMENT,
-    `training` INTEGER,
-    `index` INTEGER,
-    `shotsPerEnd` INTEGER,
-    `maxEndCount` INTEGER,
-    `distance` TEXT,
-    `comment` TEXT,
-    `targetId` INTEGER,
-    `targetScoringStyle` INTEGER,
-    `targetDiameter` TEXT,
-    FOREIGN KEY(`training`) REFERENCES Training(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE
-);
-INSERT INTO `Round`
-    SELECT r.`_id`,r.`training`,t.`r_index`,t.`arrows`,
-    CASE WHEN s.club = 512 THEN NULL ELSE t.`passes` END,
-    t.`distance` || ' ' || t.`unit`, r.`comment`,r.`target`,r.`scoring_style`,
-    t.`size` || ' ' || t.`target_unit`
-    FROM ROUND_OLD r, ROUND_TEMPLATE_OLD t, STANDARD_ROUND_TEMPLATE_OLD s
-    WHERE r.template=t._id
-    AND s._id=t.sid;
-
--- End migration
-CREATE TABLE IF NOT EXISTS `End`(
-    `_id` INTEGER PRIMARY KEY AUTOINCREMENT,
-    `index` INTEGER,
-    `round` INTEGER,
-    `exact` INTEGER,
-    `saveTime` INTEGER,
-    FOREIGN KEY(`round`) REFERENCES Round(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE
-);
-INSERT INTO `End`
-SELECT `_id`, (SELECT COUNT(*)
-                FROM PASSE_OLD p
-                WHERE PASSE_OLD.round = p.round
-                AND PASSE_OLD._id > p._id),
-                `round`,`exact`,`save_time`
-FROM PASSE_OLD;
-
--- End image migration
-CREATE TABLE IF NOT EXISTS `EndImage`(
-    `_id` INTEGER PRIMARY KEY AUTOINCREMENT,
-    `fileName` TEXT,
-    `end` INTEGER,
-    FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE
-);
-INSERT INTO `EndImage`(`fileName`,`end`)
-    SELECT `image`, `_id`
-    FROM PASSE_OLD
-    WHERE `image` <> '';
-
--- Shot migration
-CREATE TABLE IF NOT EXISTS `Shot`(
-    `_id` INTEGER PRIMARY KEY AUTOINCREMENT,
-    `index` INTEGER,
-    `end` INTEGER,
-    `x` REAL,
-    `y` REAL,
-    `scoringRing` INTEGER,
-    `comment` TEXT,
-    `arrowNumber` TEXT,
-    FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE
-);
-INSERT INTO `Shot`
-    SELECT `_id`,`arrow_index`,`passe`,`x`,`y`,`points`,`comment`,`arrow`
-    FROM SHOOT_OLD;
-
--- SightMark migration
-CREATE TABLE IF NOT EXISTS `SightMark`(
-    `_id` INTEGER PRIMARY KEY AUTOINCREMENT,
-    `bow` INTEGER,
-    `distance` TEXT,
-    `value` TEXT,
-    FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE
-);
-INSERT INTO `SightMark`
-    SELECT `_id`,`bow`,`distance` || ' ' || `unit`,`setting`
-    FROM VISIER_OLD;
-
--- Remove old tables
-DROP TABLE ARROW_OLD;
-DROP TABLE BOW_OLD;
-DROP TABLE IF EXISTS NUMBER;
-DROP TABLE PASSE_OLD;
-DROP TABLE ROUND_OLD;
-DROP TABLE ROUND_TEMPLATE_OLD;
-DROP TABLE SHOOT_OLD;
-DROP TABLE STANDARD_ROUND_TEMPLATE_OLD;
-DROP TABLE TRAINING_OLD;
-DROP TABLE VISIER_OLD;
diff --git a/app/src/main/assets/migrations/database/19.sql b/app/src/main/assets/migrations/database/19.sql
deleted file mode 100644
index acac500d6..000000000
--- a/app/src/main/assets/migrations/database/19.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-UPDATE Round SET distance="-1 m" WHERE distance IS NULL;
-UPDATE Round SET targetDiameter="-1 cm" WHERE targetDiameter IS NULL;
-UPDATE RoundTemplate SET distance="-1 m" WHERE distance IS NULL;
-UPDATE RoundTemplate SET targetDiameter="-1 cm" WHERE targetDiameter IS NULL;
\ No newline at end of file
diff --git a/app/src/main/assets/migrations/database/2.sql b/app/src/main/assets/migrations/database/2.sql
deleted file mode 100644
index f4b804fd0..000000000
--- a/app/src/main/assets/migrations/database/2.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE IF EXISTS BOW_IMAGE;
diff --git a/app/src/main/assets/migrations/database/20.sql b/app/src/main/assets/migrations/database/20.sql
deleted file mode 100644
index 0e9fbb60a..000000000
--- a/app/src/main/assets/migrations/database/20.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-UPDATE Round SET targetScoringStyle=targetScoringStyle+1
-    WHERE targetScoringStyle>0
-    AND (targetId<7 OR targetId=26 OR targetId=27);
-UPDATE RoundTemplate SET targetScoringStyle=targetScoringStyle+1
-    WHERE targetScoringStyle>0
-    AND (targetId<7 OR targetId=26 OR targetId=27);
\ No newline at end of file
diff --git a/app/src/main/assets/migrations/database/24.sql b/app/src/main/assets/migrations/database/24.sql
deleted file mode 100644
index 407631e60..000000000
--- a/app/src/main/assets/migrations/database/24.sql
+++ /dev/null
@@ -1,86 +0,0 @@
--- Add signature table
-CREATE TABLE IF NOT EXISTS `Signature`(
-    `_id` INTEGER PRIMARY KEY AUTOINCREMENT,
-    `name` TEXT,
-    `bitmap` BLOB
-);
-
--- Rename existing tables
-ALTER TABLE `Shot` RENAME TO SHOT_OLD;
-ALTER TABLE `End` RENAME TO END_OLD;
-ALTER TABLE `Training` RENAME TO TRAINING_OLD;
-
--- Training migration
-CREATE TABLE IF NOT EXISTS `Training`(
-    `_id` INTEGER PRIMARY KEY AUTOINCREMENT,
-    `title` TEXT,
-    `date` TEXT,
-    `standardRound` INTEGER,
-    `bow` INTEGER,
-    `arrow` INTEGER,
-    `arrowNumbering` INTEGER,
-    `indoor` INTEGER,
-    `weather` INTEGER,
-    `windDirection` INTEGER,
-    `windSpeed` INTEGER,
-    `location` TEXT,
-    `comment` TEXT,
-    `archerSignature` INTEGER,
-    `witnessSignature` INTEGER,
-    FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL,
-    FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL,
-    FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL,
-    FOREIGN KEY(`archerSignature`) REFERENCES Signature(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL,
-    FOREIGN KEY(`witnessSignature`) REFERENCES Signature(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL
-);
-
-INSERT INTO `Training`
-    SELECT `_id`, `title`, date(`date`/1000, 'unixepoch', 'localtime'),
-    `standardRound`, `bow`, `arrow`,
-    `arrowNumbering`, `indoor`,
-    `weather`, `windDirection`, `windSpeed`, `location`, '', NULL, NULL
-    FROM TRAINING_OLD;
-
-UPDATE Round SET comment = "" WHERE comment = NULL;
-UPDATE Round SET targetDiameter = "-1 m" WHERE targetDiameter = NULL;
-UPDATE RoundTemplate SET targetDiameter = "-1 m" WHERE targetDiameter = NULL;
-
--- End migration
-CREATE TABLE IF NOT EXISTS `End`(
-    `_id` INTEGER PRIMARY KEY AUTOINCREMENT,
-    `index` INTEGER,
-    `round` INTEGER,
-    `exact` INTEGER,
-    `saveTime` TEXT,
-    `comment` TEXT,
-    FOREIGN KEY(`round`) REFERENCES Round(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE
-);
-
-INSERT INTO `End`
-SELECT e.`_id`, e.`index`, e.`round`, e.`exact`, time(e.`saveTime`/1000, 'unixepoch', 'localtime'),
-    TRIM(GROUP_CONCAT(s.`comment`, x'0a'), x'0a' || " ")
-FROM END_OLD e LEFT OUTER JOIN SHOT_OLD s ON s.`end`=e._id
-GROUP BY e._id;
-
-CREATE TABLE IF NOT EXISTS `Shot`(
-    `_id` INTEGER PRIMARY KEY AUTOINCREMENT,
-    `index` INTEGER,
-    `end` INTEGER,
-    `x` REAL,
-    `y` REAL,
-    `scoringRing` INTEGER,
-    `arrowNumber` TEXT,
-    FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE
-);
-INSERT INTO `Shot`
-    SELECT `_id`,`index`,`end`,`x`,`y`,`scoringRing`,`arrowNumber`
-    FROM SHOT_OLD;
-
--- Remove old tables
-DROP TABLE SHOT_OLD;
-DROP TABLE END_OLD;
-DROP TABLE TRAINING_OLD;
-
--- Add max arrow number
-ALTER TABLE `Arrow` ADD COLUMN maxArrowNumber INTEGER;
-UPDATE `Arrow` SET maxArrowNumber=12;
diff --git a/app/src/main/assets/migrations/database/25.sql b/app/src/main/assets/migrations/database/25.sql
deleted file mode 100644
index ec1f66642..000000000
--- a/app/src/main/assets/migrations/database/25.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-UPDATE Training SET weather = "" WHERE weather = NULL;
-UPDATE Training SET location = "" WHERE location = NULL;
-DELETE FROM StandardRound WHERE (SELECT COUNT(r._id) FROM RoundTemplate r WHERE r.standardRound=StandardRound._id)=0
diff --git a/app/src/main/assets/migrations/database/5.sql b/app/src/main/assets/migrations/database/5.sql
deleted file mode 100644
index 42bcfde90..000000000
--- a/app/src/main/assets/migrations/database/5.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-DROP TABLE IF EXISTS ARROW;
-CREATE TABLE IF NOT EXISTS ARROW (
-  _id INTEGER PRIMARY KEY AUTOINCREMENT,
-  name TEXT,
-  length TEXT,
-  material TEXT,
-  spine TEXT,
-  weight TEXT,
-  tip_wight TEXT,
-  vanes TEXT,
-  nock TEXT,
-  comment TEXT,
-  thumbnail BLOB,
-  image TEXT);
-ALTER TABLE ROUND ADD COLUMN arrow INTEGER REFERENCES ARROW ON DELETE SET NULL;
-ALTER TABLE ROUND ADD COLUMN comment TEXT DEFAULT '';
-ALTER TABLE SHOOT ADD COLUMN comment TEXT DEFAULT '';
-UPDATE ROUND SET target=0 WHERE target=1 OR target=2 OR target=3;
-UPDATE ROUND SET target=2 WHERE target=5 OR target=6 OR target=7;
-UPDATE ROUND SET target=3 WHERE target=4;
-UPDATE ROUND SET target=4 WHERE target=8;
-UPDATE ROUND SET target=5 WHERE target=9;
-UPDATE ROUND SET target=6 WHERE target=10;
-UPDATE SHOOT SET points=2 WHERE _id IN (SELECT s._id
-  FROM ROUND r, PASSE p, SHOOT s LEFT JOIN BOW b ON b._id=r.bow
-  WHERE r._id=p.round AND s.passe=p._id
-  AND (r.bow=-2 OR b.type=1) AND s.points=1 AND r.target=3);
diff --git a/app/src/main/assets/migrations/database/7.sql b/app/src/main/assets/migrations/database/7.sql
deleted file mode 100644
index 8f7d2df42..000000000
--- a/app/src/main/assets/migrations/database/7.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM ROUND WHERE _id IN (SELECT r._id FROM ROUND r LEFT JOIN TRAINING t ON t._id=r.training WHERE t._id IS NULL);
-DELETE FROM PASSE WHERE _id IN (SELECT p._id FROM PASSE p LEFT JOIN ROUND r ON r._id=p.round WHERE r._id IS NULL);
-DELETE FROM SHOOT WHERE _id IN (SELECT s._id FROM SHOOT s LEFT JOIN PASSE p ON p._id=s.passe WHERE p._id IS NULL);
diff --git a/app/src/main/assets/migrations/database/8.sql b/app/src/main/assets/migrations/database/8.sql
deleted file mode 100644
index 981f861c6..000000000
--- a/app/src/main/assets/migrations/database/8.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-UPDATE ROUND SET target=4 WHERE target=8;
-UPDATE ROUND SET target=5 WHERE target=9;
-UPDATE ROUND SET target=6 WHERE target=10;
diff --git a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
index 6cecb5255..c5f2ab0e0 100644
--- a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
+++ b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
@@ -15,6 +15,7 @@
 
 package de.dreier.mytargets.app
 
+import android.arch.persistence.room.Room
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.res.Configuration
@@ -22,9 +23,8 @@ import android.support.multidex.MultiDex
 import android.util.Log
 import com.crashlytics.android.Crashlytics
 import com.evernote.android.state.StateSaver
-import com.raizlabs.android.dbflow.config.FlowConfig
-import com.raizlabs.android.dbflow.config.FlowManager
 import de.dreier.mytargets.BuildConfig
+import de.dreier.mytargets.base.db.migrations.*
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.SharedApplicationInstance
@@ -79,7 +79,7 @@ class ApplicationInstance : SharedApplicationInstance() {
     }
 
     override fun onTerminate() {
-        FlowManager.destroy()
+        db.close()
         wearableClient.disconnect()
         super.onTerminate()
     }
@@ -107,12 +107,26 @@ class ApplicationInstance : SharedApplicationInstance() {
         lateinit var instance: ApplicationInstance
 
         lateinit var wearableClient: MobileWearableClient
+        lateinit var db: AppDatabase
 
         val lastSharedPreferences: SharedPreferences
             get() = SharedApplicationInstance.Companion.context.getSharedPreferences(MyBackupAgent.PREFS, 0)
 
         fun initFlowManager(context: Context) {
-            FlowManager.init(FlowConfig.Builder(context).build())
+            db = Room.databaseBuilder(context,
+                    AppDatabase::class.java, AppDatabase.DATABASE_FILE_NAME)
+                    .allowMainThreadQueries()
+                    .addCallback(RoomCreationCallback)
+                    .addMigrations(Migration2, Migration3, Migration4,
+                            Migration5, Migration6, Migration7,
+                            Migration8, Migration9, Migration10,
+                            Migration11, Migration12, Migration13,
+                            Migration14, Migration15, Migration16,
+                            Migration17, Migration18, Migration19,
+                            Migration20, Migration21, Migration22,
+                            Migration23, Migration24, Migration25,
+                            Migration26)
+                    .build()
         }
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
index acce40cca..e621c5b5d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
@@ -60,7 +60,8 @@ internal class BowAdapter(
             if (!item.size!!.trim { it <= ' ' }.isEmpty()) {
                 info.addLine(R.string.size, item.size!!)
             }
-            for ((_, _, distance, value) in BowDAO.loadSightMarks(item.id)) {
+            val sightMarks = BowDAO.loadSightMarks(item.id).sortedBy { it.distance }
+            for ((_, _, distance, value) in sightMarks) {
                 info.addLine(distance.toString(), value!!)
             }
             binding.details.text = Utils.fromHtml(info.toString())
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
index a40b5f315..c4996e4c4 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
@@ -72,7 +72,7 @@ class EditBowFragment : EditWithImageFragmentBase<BowImage>(R.drawable.recurve_b
             if (bundle != null && bundle.containsKey(BOW_ID)) {
                 // Load data from database
                 bow = bowDAO.loadBow(bundle.getLong(BOW_ID))
-                sightMarks = bowDAO.loadSightMarks(bow.id)
+                sightMarks = bowDAO.loadSightMarks(bow.id).sortedBy { it.distance }
                 imageFiles = bowDAO.loadBowImages(bow.id)
             } else {
                 // Set to default values
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
index 2a0122638..e936cbe20 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
@@ -33,6 +33,7 @@ import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Dimension.Unit
 import de.dreier.mytargets.utils.SlideInItemAnimator
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
+import java.util.HashSet
 
 class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapterBase<Dimension>>(), DistanceInputDialog.OnClickListener {
     private lateinit var binding: FragmentListBinding
@@ -72,7 +73,16 @@ class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapter
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        val distances = DimensionDAO.getAll(distance!!, unit!!)
+        val distancesDb = DimensionDAO.getAll(unit!!)
+        val distances = HashSet<Dimension>()
+
+        distances.add(Dimension.UNKNOWN)
+
+        // Add currently selected distance to list
+        if (this.distance!!.unit == unit) {
+            distances.add(this.distance!!)
+        }
+        distances.addAll(distancesDb)
         return {
             adapter!!.setList(distances.toMutableList())
             selectItem(binding.recyclerView, distance!!)
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
index 2796e190a..c939a40e4 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
@@ -83,7 +83,8 @@ class StandardRoundListFragment : SelectItemFragmentBase<AugmentedStandardRound,
     override fun onLoad(args: Bundle?): LoaderUICallback {
         val data = if (args != null && args.containsKey(KEY_QUERY)) {
             val query = args.getString(KEY_QUERY)
-            StandardRoundDAO.getAllSearch(query!!)
+            val queryString = "%${query!!.replace(' ', '%')}%"
+            StandardRoundDAO.getAllSearch(queryString)
         } else {
             StandardRoundDAO.loadStandardRounds()
         }.map { AugmentedStandardRound(it, StandardRoundDAO.loadRoundTemplates(it.id)) }.toMutableList()
diff --git a/dependencies.gradle b/dependencies.gradle
index e2d8dd6ab..a5d943bb6 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -80,6 +80,9 @@ ext {
 
             archLifecycleExtensions       : "android.arch.lifecycle:extensions:$libraryVersion.architectureComponents",
             archLifecycleCompiler         : "android.arch.lifecycle:compiler:$libraryVersion.architectureComponents",
+            archRoomRuntime               : "android.arch.persistence.room:runtime:$libraryVersion.architectureComponents",
+            archRoomCompiler              : "android.arch.persistence.room:compiler:$libraryVersion.architectureComponents",
+            archRoomTesting               : "android.arch.persistence.room:testing:$libraryVersion.architectureComponents",
 
             playServicesDrive             : "com.google.android.gms:play-services-drive:$libraryVersion.playService",
             playServicesWearable          : "com.google.android.gms:play-services-wearable:$libraryVersion.playService",
diff --git a/shared/build.gradle b/shared/build.gradle
index 2b2bf0aeb..25bba05cf 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -55,10 +55,8 @@ dependencies {
     api dependencies.supportAnnotations
     api dependencies.threeTenABP
 
-    kapt dependencies.dbFlowProcessor
-    implementation dependencies.dbFlowCore
-    implementation dependencies.dbFlow
-    implementation dependencies.dbFlowKotlinExtensions
+    implementation dependencies.archRoomRuntime
+    kapt dependencies.archRoomCompiler
 
     implementation dependencies.androidState
     kapt dependencies.androidStateProcessor
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration0.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration0.kt
deleted file mode 100644
index d03b5ee8c..000000000
--- a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration0.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2018 Florian Dreier
- *
- * This file is part of MyTargets.
- *
- * MyTargets is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * MyTargets is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-package de.dreier.mytargets.base.db.migrations
-
-import com.raizlabs.android.dbflow.annotation.Migration
-import com.raizlabs.android.dbflow.sql.migration.BaseMigration
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
-import de.dreier.mytargets.base.db.dao.StandardRoundDAO
-import de.dreier.mytargets.shared.AppDatabase
-import de.dreier.mytargets.shared.utils.StandardRoundFactory
-
-@Migration(version = 0, database = AppDatabase::class)
-class Migration0 : BaseMigration() {
-
-    override fun migrate(database: DatabaseWrapper) {
-        fillStandardRound(database)
-        createScoreTriggers(database)
-    }
-
-    companion object {
-        fun fillStandardRound(db: DatabaseWrapper) {
-            val standardRounds = StandardRoundFactory.initTable()
-            for (standardRound in standardRounds) {
-                StandardRoundDAO.saveStandardRound(db, standardRound.standardRound, standardRound.roundTemplates)
-            }
-        }
-
-        fun createScoreTriggers(database: DatabaseWrapper) {
-            database.execSQL("CREATE TRIGGER round_sum_score " +
-                    "AFTER UPDATE ON `End` " +
-                    "BEGIN " +
-                    "UPDATE `Round` SET " +
-                    "scoreReachedPoints = (SELECT SUM(scoreReachedPoints) FROM `End` WHERE round = NEW.round), " +
-                    "scoreTotalPoints = (SELECT SUM(scoreTotalPoints) FROM `End` WHERE round = NEW.round), " +
-                    "scoreShotCount = (SELECT SUM(scoreShotCount) FROM `End` WHERE round = NEW.round) " +
-                    "WHERE _id = NEW.round;" +
-                    "END;")
-
-            database.execSQL("CREATE TRIGGER training_sum_score " +
-                    "AFTER UPDATE ON `Round` " +
-                    "BEGIN " +
-                    "UPDATE `Training` SET " +
-                    "scoreReachedPoints = (SELECT SUM(scoreReachedPoints) FROM `Round` WHERE training = NEW.training), " +
-                    "scoreTotalPoints = (SELECT SUM(scoreTotalPoints) FROM `Round` WHERE training = NEW.training), " +
-                    "scoreShotCount = (SELECT SUM(scoreShotCount) FROM `Round` WHERE training = NEW.training) " +
-                    "WHERE _id = NEW.training;" +
-                    "END;")
-        }
-    }
-}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration10.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration10.kt
new file mode 100644
index 000000000..97730b711
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration10.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
+
+object Migration10 : Migration(9, 10) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE BOW ADD COLUMN limbs TEXT DEFAULT ''")
+        database.execSQL("ALTER TABLE BOW ADD COLUMN sight TEXT DEFAULT ''")
+        database.execSQL("ALTER TABLE BOW ADD COLUMN draw_weight TEXT DEFAULT ''")
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration11.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration11.kt
new file mode 100644
index 000000000..3855b9788
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration11.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
+
+object Migration11 : Migration(10, 11) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE ARROW ADD COLUMN tip_weight TEXT DEFAULT ''")
+        database.execSQL("ALTER TABLE PASSE ADD COLUMN exact INTEGER DEFAULT 0")
+        database.execSQL("UPDATE PASSE SET exact=1 WHERE _id IN (SELECT DISTINCT p._id FROM PASSE p, SHOOT s WHERE p._id=s.passe AND s.x!=0)")
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration12.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration12.kt
new file mode 100644
index 000000000..3366a3382
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration12.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
+
+object Migration12 : Migration(11, 12) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE BOW ADD COLUMN stabilizer TEXT DEFAULT ''")
+        database.execSQL("ALTER TABLE BOW ADD COLUMN clicker TEXT DEFAULT ''")
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration13.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration13.kt
new file mode 100644
index 000000000..08ab326a9
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration13.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
+
+object Migration13 : Migration(12, 13) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("UPDATE PASSE SET exact=1 " +
+                "WHERE _id IN (SELECT DISTINCT p._id " +
+                "FROM PASSE p, SHOOT s " +
+                "WHERE p._id=s.passe " +
+                "AND s.x!=0)")
+        database.execSQL("ALTER TABLE TRAINING ADD COLUMN exact INTEGER DEFAULT 0")
+        database.execSQL("UPDATE TRAINING SET exact=1 " +
+                "WHERE _id IN (SELECT DISTINCT t._id " +
+                "FROM TRAINING t, ROUND r, PASSE p " +
+                "WHERE t._id=r.training " +
+                "AND r._id=p.round " +
+                "AND p.exact=1)")
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration14.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration14.kt
new file mode 100644
index 000000000..4105164fd
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration14.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
+
+object Migration14 : Migration(13, 14) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("UPDATE PASSE SET exact=1 WHERE _id IN (SELECT DISTINCT p._id " +
+                "FROM PASSE p, ROUND r, TRAINING t " +
+                "WHERE p.round=r._id " +
+                "AND r.training=t._id " +
+                "AND t.exact=1)")
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration15.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration15.kt
new file mode 100644
index 000000000..687005db2
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration15.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
+
+object Migration15 : Migration(14, 15) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("UPDATE SHOOT SET arrow = NULL WHERE arrow = '-1'")
+        database.execSQL("UPDATE PASSE SET exact = 1 WHERE _id IN (SELECT DISTINCT p._id " +
+                "FROM PASSE p, SHOOT s " +
+                "WHERE p._id = s.passe " +
+                "AND s.x != 0)")
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration16.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration16.kt
new file mode 100644
index 000000000..7bb6e7222
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration16.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
+
+object Migration16 : Migration(15, 16) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE ARROW ADD COLUMN diameter TEXT DEFAULT '5.0'")
+        database.execSQL("ALTER TABLE ARROW ADD COLUMN diameter_unit TEXT DEFAULT 'mm'")
+        database.execSQL("ALTER TABLE PASSE ADD COLUMN save_time INTEGER")
+        database.execSQL("UPDATE PASSE " +
+                "SET save_time=(" +
+                "SELECT t.datum + 43200000 + COUNT(p2._id) * 300000 " +
+                "FROM TRAINING t " +
+                "JOIN  ROUND r1 ON r1.training = t._id AND r1._id = PASSE.round " +
+                "LEFT OUTER JOIN ROUND r2 ON r2.training = t._id " +
+                "LEFT OUTER JOIN PASSE p2 ON r2._id = p2.round AND p2._id < PASSE._id " +
+                "GROUP BY t._id, t.datum " +
+                ")")
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration17.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration17.kt
new file mode 100644
index 000000000..4fd90cd15
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration17.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
+
+object Migration17 : Migration(16, 17) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("CREATE TEMP TABLE IF NOT EXISTS DAIR_TRANSLATION AS " +
+                "SELECT  sr._id " +
+                "FROM STANDARD_ROUND_TEMPLATE sr " +
+                "WHERE sr._id>198 " +
+                "AND sr.club<256 " +
+                "AND sr.name='DAIR 380'")
+        database.execSQL("CREATE TEMP TABLE IF NOT EXISTS SR_TRANSLATION AS " +
+                "SELECT  sr._id AS fromSR, (4+sr._id-(SELECT MAX(tr._id) FROM DAIR_TRANSLATION tr WHERE tr._id-4<sr._id)) AS toSR " +
+                "FROM STANDARD_ROUND_TEMPLATE sr " +
+                "WHERE sr._id>198 " +
+                "AND sr.club<256")
+        database.execSQL("CREATE TEMP TABLE IF NOT EXISTS R_TRANSLATION AS " +
+                "SELECT  r1._id AS fromR, r2._id AS toR " +
+                "FROM ROUND_TEMPLATE r1, ROUND_TEMPLATE r2, SR_TRANSLATION sr " +
+                "WHERE r1.sid=sr.fromSR " +
+                "AND r2.sid=sr.toSR " +
+                "AND r1.r_index=r2.r_index")
+        database.execSQL("UPDATE ROUND " +
+                "SET template = (SELECT toR " +
+                "FROM R_TRANSLATION " +
+                "WHERE fromR=template) " +
+                "WHERE template IN (SELECT fromR FROM R_TRANSLATION)")
+        database.execSQL("UPDATE TRAINING " +
+                "SET standard_round = (SELECT toSR " +
+                "FROM SR_TRANSLATION " +
+                "WHERE fromSR=standard_round) " +
+                "WHERE standard_round IN (SELECT fromSR FROM SR_TRANSLATION)")
+        database.execSQL("DELETE FROM STANDARD_ROUND_TEMPLATE " +
+                "WHERE _id IN (SELECT fromSR FROM SR_TRANSLATION)")
+        database.execSQL("DELETE FROM ROUND_TEMPLATE " +
+                "WHERE _id IN (SELECT fromR FROM R_TRANSLATION)")
+        database.execSQL("DROP TABLE DAIR_TRANSLATION")
+        database.execSQL("DROP TABLE SR_TRANSLATION")
+        database.execSQL("DROP TABLE R_TRANSLATION")
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration18.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration18.kt
new file mode 100644
index 000000000..e5b3f810d
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration18.kt
@@ -0,0 +1,269 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
+
+object Migration18 : Migration(17, 18) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        // Rename existing tables
+        database.execSQL("DROP TABLE IF EXISTS ROUND_OLD")
+        database.execSQL("DROP TABLE IF EXISTS `End`")
+        database.execSQL("DROP TABLE IF EXISTS `StandardRound`")
+        database.execSQL("DROP TABLE IF EXISTS `RoundTemplate`")
+        database.execSQL("DROP TABLE IF EXISTS `Shot`")
+        database.execSQL("DROP TABLE IF EXISTS `SightMark`")
+        database.execSQL("ALTER TABLE ARROW RENAME TO ARROW_OLD")
+        database.execSQL("ALTER TABLE BOW RENAME TO BOW_OLD")
+        database.execSQL("ALTER TABLE PASSE RENAME TO PASSE_OLD")
+        database.execSQL("ALTER TABLE ROUND RENAME TO ROUND_OLD")
+        database.execSQL("ALTER TABLE ROUND_TEMPLATE RENAME TO ROUND_TEMPLATE_OLD")
+        database.execSQL("ALTER TABLE SHOOT RENAME TO SHOOT_OLD")
+        database.execSQL("ALTER TABLE STANDARD_ROUND_TEMPLATE RENAME TO STANDARD_ROUND_TEMPLATE_OLD")
+        database.execSQL("ALTER TABLE TRAINING RENAME TO TRAINING_OLD")
+        database.execSQL("ALTER TABLE VISIER RENAME TO VISIER_OLD")
+
+        // Arrow migration
+        database.execSQL("CREATE TABLE IF NOT EXISTS `Arrow`( " +
+                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                "`name` TEXT," +
+                "`length` TEXT," +
+                "`material` TEXT," +
+                "`spine` TEXT," +
+                "`weight` TEXT," +
+                "`tipWeight` TEXT," +
+                "`vanes` TEXT," +
+                "`nock` TEXT," +
+                "`comment` TEXT," +
+                "`diameter` TEXT," +
+                "`thumbnail` BLOB " +
+                ")")
+        database.execSQL("INSERT INTO `Arrow` " +
+                "SELECT `_id`,`name`,`length`,`material`,`spine`," +
+                "`weight`,`tip_weight`,`vanes`,`nock`," +
+                "`comment`,`diameter` || ' ' || `diameter_unit`," +
+                "`thumbnail` " +
+                "FROM ARROW_OLD")
+
+        // Arrow image migration
+        database.execSQL("CREATE TABLE IF NOT EXISTS `ArrowImage`( " +
+                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                "`fileName` TEXT," +
+                "`arrow` INTEGER," +
+                "FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
+                ")")
+        database.execSQL("INSERT INTO `ArrowImage`(`fileName`,`arrow`) " +
+                "SELECT `image`, `_id` " +
+                "FROM ARROW_OLD " +
+                "WHERE `image` <> ''")
+
+        // Bow migration
+        database.execSQL("CREATE TABLE IF NOT EXISTS `Bow`( " +
+                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                "`name` TEXT," +
+                "`type` INTEGER," +
+                "`brand` TEXT," +
+                "`size` TEXT," +
+                "`braceHeight` TEXT," +
+                "`tiller` TEXT," +
+                "`limbs` TEXT," +
+                "`sight` TEXT," +
+                "`drawWeight` TEXT," +
+                "`stabilizer` TEXT," +
+                "`clicker` TEXT," +
+                "`button` TEXT," +
+                "`string` TEXT," +
+                "`nockingPoint` TEXT," +
+                "`letoffWeight` TEXT," +
+                "`arrowRest` TEXT," +
+                "`restHorizontalPosition` TEXT," +
+                "`restVerticalPosition` TEXT," +
+                "`restStiffness` TEXT," +
+                "`camSetting` TEXT," +
+                "`scopeMagnification` TEXT," +
+                "`description` TEXT," +
+                "`thumbnail` BLOB " +
+                ")")
+        database.execSQL("INSERT INTO `Bow` " +
+                "SELECT `_id`,`name`,`type`,`brand`,`size`," +
+                "`height`,`tiller`,`limbs`,`sight`," +
+                "`draw_weight`,`stabilizer`,`clicker`," +
+                "'', '', '', '', ''," +
+                "'', '', '', '', ''," +
+                "`description`,`thumbnail` " +
+                "FROM BOW_OLD")
+        // Bow image migration
+        database.execSQL("CREATE TABLE IF NOT EXISTS `BowImage`(" +
+                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                "`fileName` TEXT," +
+                "`bow` INTEGER," +
+                "FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
+                ")")
+        database.execSQL("INSERT INTO `BowImage`(`fileName`,`bow`) " +
+                "SELECT `image`, `_id` " +
+                "FROM BOW_OLD " +
+                "WHERE `image` <> ''")
+        // StandardRound migration
+        database.execSQL("CREATE TABLE IF NOT EXISTS `StandardRound`(" +
+                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                "`club` INTEGER," +
+                "`name` TEXT " +
+                ")")
+        database.execSQL("INSERT INTO `StandardRound` " +
+                "SELECT `_id`,`club`,`name` " +
+                "FROM STANDARD_ROUND_TEMPLATE_OLD " +
+                "WHERE `club` < 512")
+        // RoundTemplate migration
+        database.execSQL("CREATE TABLE IF NOT EXISTS `RoundTemplate`( " +
+                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                "`standardRound` INTEGER," +
+                "`index` INTEGER," +
+                "`shotsPerEnd` INTEGER," +
+                "`endCount` INTEGER," +
+                "`distance` TEXT," +
+                "`targetId` INTEGER," +
+                "`targetScoringStyle` INTEGER," +
+                "`targetDiameter` TEXT," +
+                "FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
+                ")")
+        database.execSQL("INSERT INTO `RoundTemplate` " +
+                "SELECT `_id`,`sid`,`r_index`,`arrows`,`passes`," +
+                "`distance` || ' ' || `unit`," +
+                "`target`,`scoring_style`,`size` || ' ' || `target_unit` " +
+                "FROM ROUND_TEMPLATE_OLD")
+        // Training migration
+        database.execSQL("CREATE TABLE IF NOT EXISTS `Training`( " +
+                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                "`title` TEXT," +
+                "`date` INTEGER," +
+                "`standardRound` INTEGER," +
+                "`bow` INTEGER," +
+                "`arrow` INTEGER," +
+                "`arrowNumbering` INTEGER," +
+                "`indoor` INTEGER," +
+                "`weather` INTEGER," +
+                "`windDirection` INTEGER," +
+                "`windSpeed` INTEGER," +
+                "`location` TEXT," +
+                "FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE NO ACTION," +
+                "FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL," +
+                "FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL " +
+                ")")
+        database.execSQL("UPDATE TRAINING_OLD SET bow = null WHERE bow < 1")
+        database.execSQL("UPDATE TRAINING_OLD SET arrow = null WHERE arrow < 1")
+
+        database.execSQL("INSERT INTO `Training` " +
+                "SELECT t.`_id`,t.`title`,t.`datum`," +
+                "CASE WHEN s.club < 512 THEN t.`standard_round` ELSE NULL END," +
+                "t.`bow`,t.`arrow`, t.`arrow_numbering`," +
+                "s.`indoor`,t.`weather`,t.`wind_direction`,t.`wind_speed`,t.`location` " +
+                "FROM TRAINING_OLD t, STANDARD_ROUND_TEMPLATE_OLD s " +
+                "WHERE t.standard_round=s._id")
+
+        // Round migration
+        database.execSQL("CREATE TABLE IF NOT EXISTS `Round`( " +
+                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                "`training` INTEGER," +
+                "`index` INTEGER," +
+                "`shotsPerEnd` INTEGER," +
+                "`maxEndCount` INTEGER," +
+                "`distance` TEXT," +
+                "`comment` TEXT," +
+                "`targetId` INTEGER," +
+                "`targetScoringStyle` INTEGER," +
+                "`targetDiameter` TEXT," +
+                "FOREIGN KEY(`training`) REFERENCES Training(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
+                ")")
+        database.execSQL("INSERT INTO `Round` " +
+                "SELECT r.`_id`,r.`training`,t.`r_index`,t.`arrows`," +
+                "CASE WHEN s.club = 512 THEN NULL ELSE t.`passes` END," +
+                "t.`distance` || ' ' || t.`unit`, r.`comment`,r.`target`,r.`scoring_style`," +
+                "t.`size` || ' ' || t.`target_unit` " +
+                "FROM ROUND_OLD r, ROUND_TEMPLATE_OLD t, STANDARD_ROUND_TEMPLATE_OLD s " +
+                "WHERE r.template=t._id " +
+                "AND s._id=t.sid")
+
+        // End migration
+        database.execSQL("CREATE TABLE IF NOT EXISTS `End`( " +
+                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                "`index` INTEGER," +
+                "`round` INTEGER," +
+                "`exact` INTEGER," +
+                "`saveTime` INTEGER," +
+                "FOREIGN KEY(`round`) REFERENCES Round(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
+                ")")
+        database.execSQL("INSERT INTO `End` " +
+                "SELECT `_id`, (SELECT COUNT(*) " +
+                "     FROM PASSE_OLD p " +
+                "     WHERE PASSE_OLD.round = p.round " +
+                "     AND PASSE_OLD._id > p._id)," +
+                "     `round`,`exact`,`save_time` " +
+                "FROM PASSE_OLD")
+
+        // End image migration
+        database.execSQL("CREATE TABLE IF NOT EXISTS `EndImage`( " +
+                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                "`fileName` TEXT," +
+                "`end` INTEGER," +
+                "FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE" +
+                ")")
+        database.execSQL("INSERT INTO `EndImage`(`fileName`,`end`) " +
+                "SELECT `image`, `_id` " +
+                "FROM PASSE_OLD " +
+                "WHERE `image` <> ''")
+
+        // Shot migration
+        database.execSQL("CREATE TABLE IF NOT EXISTS `Shot`( " +
+                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                "`index` INTEGER," +
+                "`end` INTEGER," +
+                "`x` REAL," +
+                "`y` REAL," +
+                "`scoringRing` INTEGER," +
+                "`comment` TEXT," +
+                "`arrowNumber` TEXT," +
+                "FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
+                ")")
+        database.execSQL("INSERT INTO `Shot` " +
+                "SELECT `_id`,`arrow_index`,`passe`,`x`,`y`,`points`,`comment`,`arrow` " +
+                "FROM SHOOT_OLD")
+
+        // SightMark migration
+        database.execSQL("CREATE TABLE IF NOT EXISTS `SightMark`( " +
+                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                "`bow` INTEGER," +
+                "`distance` TEXT," +
+                "`value` TEXT," +
+                "FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
+                ")")
+        database.execSQL("INSERT INTO `SightMark` " +
+                "SELECT `_id`,`bow`,`distance` || ' ' || `unit`,`setting` " +
+                "FROM VISIER_OLD")
+
+        // Remove old tables
+        database.execSQL("DROP TABLE ARROW_OLD")
+        database.execSQL("DROP TABLE BOW_OLD")
+        database.execSQL("DROP TABLE IF EXISTS NUMBER")
+        database.execSQL("DROP TABLE PASSE_OLD")
+        database.execSQL("DROP TABLE ROUND_OLD")
+        database.execSQL("DROP TABLE ROUND_TEMPLATE_OLD")
+        database.execSQL("DROP TABLE SHOOT_OLD")
+        database.execSQL("DROP TABLE STANDARD_ROUND_TEMPLATE_OLD")
+        database.execSQL("DROP TABLE TRAINING_OLD")
+        database.execSQL("DROP TABLE VISIER_OLD")
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration19.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration19.kt
new file mode 100644
index 000000000..a16488b1a
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration19.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
+
+object Migration19 : Migration(18, 19) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("UPDATE Round SET distance=\"-1 m\" WHERE distance IS NULL")
+        database.execSQL("UPDATE Round SET targetDiameter=\"-1 cm\" WHERE targetDiameter IS NULL")
+        database.execSQL("UPDATE RoundTemplate SET distance=\"-1 m\" WHERE distance IS NULL")
+        database.execSQL("UPDATE RoundTemplate SET targetDiameter=\"-1 cm\" WHERE targetDiameter IS NULL")
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration2.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration2.kt
new file mode 100644
index 000000000..08f72d8fc
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration2.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
+
+object Migration2 : Migration(1, 2) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.query("DROP TABLE IF EXISTS BOW_IMAGE")
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration20.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration20.kt
new file mode 100644
index 000000000..dbe0bb0f9
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration20.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
+
+object Migration20 : Migration(19, 20) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("UPDATE Round SET targetScoringStyle = targetScoringStyle+1 "+
+                "WHERE targetScoringStyle > 0 "+
+                "AND (targetId < 7 OR targetId = 26 OR targetId = 27)")
+        database.execSQL("UPDATE RoundTemplate SET targetScoringStyle = targetScoringStyle+1 "+
+                "WHERE targetScoringStyle > 0 "+
+                "AND (targetId < 7 OR targetId = 26 OR targetId = 27)")
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration21.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration21.kt
new file mode 100644
index 000000000..e7914d7d6
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration21.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
+
+object Migration21 : Migration(20, 21) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
index a3c72d4ca..813296842 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
@@ -15,15 +15,11 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import com.raizlabs.android.dbflow.annotation.Migration
-import com.raizlabs.android.dbflow.sql.migration.BaseMigration
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
-import de.dreier.mytargets.shared.AppDatabase
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
 
-@Migration(version = 22, database = AppDatabase::class)
-class Migration22 : BaseMigration() {
-
-    override fun migrate(database: DatabaseWrapper) {
-        Migration0.fillStandardRound(database)
+object Migration22 : Migration(21, 22) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        RoomCreationCallback.fillStandardRound(database)
     }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
index bcb707c96..af1c4f68e 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
@@ -15,53 +15,35 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import com.raizlabs.android.dbflow.annotation.Migration
-import com.raizlabs.android.dbflow.kotlinextensions.delete
-import com.raizlabs.android.dbflow.kotlinextensions.save
-import com.raizlabs.android.dbflow.sql.language.SQLite
-import com.raizlabs.android.dbflow.sql.migration.BaseMigration
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
-import de.dreier.mytargets.shared.AppDatabase
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
 import de.dreier.mytargets.shared.SharedApplicationInstance
-import de.dreier.mytargets.shared.models.Image
-import de.dreier.mytargets.shared.models.db.ArrowImage
-import de.dreier.mytargets.shared.models.db.BowImage
-import de.dreier.mytargets.shared.models.db.EndImage
 import de.dreier.mytargets.shared.utils.moveTo
 import java.io.File
 import java.io.IOException
 
-@Migration(version = 23, database = AppDatabase::class)
-class Migration23 : BaseMigration() {
-
-    override fun migrate(database: DatabaseWrapper) {
-        removeFilePath(database, EndImage::class.java,
-                { endImage, db -> endImage.save(db) },
-                { endImage, db -> endImage.delete(db) })
-        removeFilePath(database, BowImage::class.java,
-                { bowImage, db -> bowImage.save(db) },
-                { bowImage, db -> bowImage.delete(db) })
-        removeFilePath(database, ArrowImage::class.java,
-                { arrowImage, db -> arrowImage.save(db) },
-                { arrowImage, db -> arrowImage.delete(db) })
+object Migration23 : Migration(22, 23) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        removeFilePath(database, "EndImage")
+        removeFilePath(database, "BowImage")
+        removeFilePath(database, "ArrowImage")
     }
 
-    private fun <T> removeFilePath(database: DatabaseWrapper, clazz: Class<out T>,
-                                   save: (T, DatabaseWrapper) -> Boolean,
-                                   delete: (T, DatabaseWrapper) -> Boolean) where T : Image {
-        val images = SQLite.select().from(clazz).queryList(database)
-        for (image in images) {
+    private fun removeFilePath(database: SupportSQLiteDatabase, tableName: String) {
+        val cursor = database.query("SELECT _id, fileName FROM $tableName")
+        while (cursor.moveToNext()) {
+            val imageId = cursor.getLong(0)
+            val fileName = cursor.getString(1)
             val filesDir = SharedApplicationInstance.context.filesDir
-            var imageFile = File(filesDir, image.fileName)
+            var imageFile = File(filesDir, fileName)
 
-            val imageFromSomewhere = File(image.fileName)
+            val imageFromSomewhere = File(fileName)
             val imageFileFromSomewhere = File(filesDir, imageFromSomewhere.name)
 
             // If imagePath is just the name and is placed inside files directory or
             // In case the image was already copied to the files, but does still contain the wrong path
             if (imageFile.exists() || imageFileFromSomewhere.exists()) {
-                image.fileName = imageFile.name
-                save(image, database)
+                database.execSQL("UPDATE $tableName SET fileName = ${imageFile.name} WHERE _id = $imageId")
                 continue
             }
 
@@ -70,14 +52,13 @@ class Migration23 : BaseMigration() {
                 try {
                     imageFile = File.createTempFile("img", imageFromSomewhere.name, filesDir)
                     imageFromSomewhere.moveTo(imageFile)
-                    image.fileName = imageFile.name
-                    save(image, database)
+                    database.execSQL("UPDATE $tableName SET fileName = ${imageFile.name} WHERE _id = $imageId")
                 } catch (e: IOException) {
                     e.printStackTrace()
                 }
 
             } else {
-                delete(image, database)
+                database.execSQL("DELETE FROM $tableName WHERE _id = $imageId")
             }
         }
     }
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration24.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration24.kt
new file mode 100644
index 000000000..a9e011b27
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration24.kt
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
+
+object Migration24 : Migration(23, 24) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        // Add signature table
+        database.execSQL("CREATE TABLE IF NOT EXISTS `Signature`( " +
+                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT, " +
+                "`name` TEXT, " +
+                "`bitmap` BLOB" +
+                ")")
+
+        // Rename existing tables
+        database.execSQL("ALTER TABLE `Shot` RENAME TO SHOT_OLD")
+        database.execSQL("ALTER TABLE `End` RENAME TO END_OLD")
+        database.execSQL("ALTER TABLE `Training` RENAME TO TRAINING_OLD")
+
+        // Training migration
+        database.execSQL("CREATE TABLE IF NOT EXISTS `Training`( " +
+                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT, " +
+                "`title` TEXT, " +
+                "`date` TEXT, " +
+                "`standardRound` INTEGER, " +
+                "`bow` INTEGER, " +
+                "`arrow` INTEGER, " +
+                "`arrowNumbering` INTEGER, " +
+                "`indoor` INTEGER, " +
+                "`weather` INTEGER, " +
+                "`windDirection` INTEGER, " +
+                "`windSpeed` INTEGER, " +
+                "`location` TEXT, " +
+                "`comment` TEXT, " +
+                "`archerSignature` INTEGER, " +
+                "`witnessSignature` INTEGER, " +
+                "FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, " +
+                "FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, " +
+                "FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, " +
+                "FOREIGN KEY(`archerSignature`) REFERENCES Signature(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, " +
+                "FOREIGN KEY(`witnessSignature`) REFERENCES Signature(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL " +
+                ")")
+        database.execSQL("INSERT INTO `Training` " +
+                "SELECT `_id`, `title`, date(`date`/1000, 'unixepoch', 'localtime'), " +
+                "`standardRound`, `bow`, `arrow`, " +
+                "`arrowNumbering`, `indoor`, " +
+                "`weather`, `windDirection`, `windSpeed`, `location`, '', NULL, NULL " +
+                "FROM TRAINING_OLD")
+        database.execSQL("UPDATE Round SET comment = \"\" WHERE comment = NULL")
+        database.execSQL("UPDATE Round SET targetDiameter = \"-1 m\" WHERE targetDiameter = NULL")
+        database.execSQL("UPDATE RoundTemplate SET targetDiameter = \"-1 m\" WHERE targetDiameter = NULL")
+
+        // End migration
+        database.execSQL("CREATE TABLE IF NOT EXISTS `End`( " +
+                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT, " +
+                "`index` INTEGER, " +
+                "`round` INTEGER, " +
+                "`exact` INTEGER, " +
+                "`saveTime` TEXT, " +
+                "`comment` TEXT, " +
+                "FOREIGN KEY(`round`) REFERENCES Round(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
+                ")")
+        database.execSQL("INSERT INTO `End` " +
+                "SELECT e.`_id`, e.`index`, e.`round`, e.`exact`, time(e.`saveTime`/1000, 'unixepoch', 'localtime'), " +
+                "TRIM(GROUP_CONCAT(s.`comment`, x'0a'), x'0a' || \" \") " +
+                "FROM END_OLD e LEFT OUTER JOIN SHOT_OLD s ON s.`end`=e._id " +
+                "GROUP BY e._id")
+        database.execSQL("CREATE TABLE IF NOT EXISTS `Shot`( " +
+                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT, " +
+                "`index` INTEGER, " +
+                "`end` INTEGER, " +
+                "`x` REAL, " +
+                "`y` REAL, " +
+                "`scoringRing` INTEGER, " +
+                "`arrowNumber` TEXT, " +
+                "FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
+                ")")
+        database.execSQL("INSERT INTO `Shot` " +
+                "SELECT `_id`,`index`,`end`,`x`,`y`,`scoringRing`,`arrowNumber` " +
+                "FROM SHOT_OLD")
+
+        // Remove old tables
+        database.execSQL("DROP TABLE SHOT_OLD")
+        database.execSQL("DROP TABLE END_OLD")
+        database.execSQL("DROP TABLE TRAINING_OLD")
+
+        // Add max arrow number
+        database.execSQL("ALTER TABLE `Arrow` ADD COLUMN maxArrowNumber INTEGER")
+        database.execSQL("UPDATE `Arrow` SET maxArrowNumber = 12")
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration25.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration25.kt
new file mode 100644
index 000000000..ea41c8a00
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration25.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
+
+object Migration25 : Migration(24, 25) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("UPDATE Training SET weather = \"\" WHERE weather = NULL")
+        database.execSQL("UPDATE Training SET location = \"\" WHERE location = NULL")
+        database.execSQL("DELETE FROM StandardRound WHERE (SELECT COUNT(r._id) FROM RoundTemplate r WHERE r.standardRound=StandardRound._id)=0")
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
index 6a9d5ee71..5fa44f9dc 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
@@ -15,44 +15,57 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import com.raizlabs.android.dbflow.annotation.Migration
-import com.raizlabs.android.dbflow.kotlinextensions.save
-import com.raizlabs.android.dbflow.sql.language.SQLite
-import com.raizlabs.android.dbflow.sql.migration.BaseMigration
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
-import de.dreier.mytargets.shared.AppDatabase
-import de.dreier.mytargets.shared.models.db.*
-
-@Migration(version = 26, database = AppDatabase::class)
-class Migration26 : BaseMigration() {
-
-    override fun migrate(database: DatabaseWrapper) {
-        database.execSQL("ALTER TABLE `Training` ADD COLUMN scoreReachedPoints INTEGER;")
-        database.execSQL("ALTER TABLE `Training` ADD COLUMN scoreTotalPoints INTEGER;")
-        database.execSQL("ALTER TABLE `Training` ADD COLUMN scoreShotCount INTEGER;")
-
-        database.execSQL("ALTER TABLE `Round` ADD COLUMN scoreReachedPoints INTEGER;")
-        database.execSQL("ALTER TABLE `Round` ADD COLUMN scoreTotalPoints INTEGER;")
-        database.execSQL("ALTER TABLE `Round` ADD COLUMN scoreShotCount INTEGER;")
-
-        database.execSQL("ALTER TABLE `End` ADD COLUMN scoreReachedPoints INTEGER;")
-        database.execSQL("ALTER TABLE `End` ADD COLUMN scoreTotalPoints INTEGER;")
-        database.execSQL("ALTER TABLE `End` ADD COLUMN scoreShotCount INTEGER;")
-
-        Migration0.createScoreTriggers(database)
-
-        val rounds = SQLite.select().from(Round::class.java).queryList(database)
-        for (round in rounds) {
-            val target = round.target
-            val ends = SQLite.select().from(End::class.java).where(End_Table.round.eq(round.id))
-                    .queryList(database)
-            for (end in ends) {
-                val shots = SQLite.select().from(Shot::class.java)
-                        .where(Shot_Table.end.eq(end.id))
-                        .orderBy(Shot_Table.index, true)
-                        .queryList(database)
-                end.score = target.getReachedScore(shots)
-                end.save(database)
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
+import de.dreier.mytargets.shared.models.Dimension
+import de.dreier.mytargets.shared.models.Target
+import de.dreier.mytargets.shared.models.db.Shot
+
+object Migration26 : Migration(25, 26) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE `Training` ADD COLUMN reachedPoints INTEGER;")
+        database.execSQL("ALTER TABLE `Training` ADD COLUMN totalPoints INTEGER;")
+        database.execSQL("ALTER TABLE `Training` ADD COLUMN shotCount INTEGER;")
+
+        database.execSQL("ALTER TABLE `Round` ADD COLUMN reachedPoints INTEGER;")
+        database.execSQL("ALTER TABLE `Round` ADD COLUMN totalPoints INTEGER;")
+        database.execSQL("ALTER TABLE `Round` ADD COLUMN shotCount INTEGER;")
+
+        database.execSQL("ALTER TABLE `End` ADD COLUMN reachedPoints INTEGER;")
+        database.execSQL("ALTER TABLE `End` ADD COLUMN totalPoints INTEGER;")
+        database.execSQL("ALTER TABLE `End` ADD COLUMN shotCount INTEGER;")
+
+        RoomCreationCallback.createScoreTriggers(database)
+
+        val rounds = database.query("SELECT _id, targetId, targetScoringStyle, targetDiameter " +
+                "FROM Round")
+
+        while (rounds.moveToNext()) {
+            val diameterData = rounds.getString(3)
+            val index = diameterData.indexOf(' ')
+            val value = diameterData.substring(0, index)
+            val unit = diameterData.substring(index + 1)
+            val diameter = Dimension.from(value.toFloat(), unit)
+            val target = Target(rounds.getLong(1), rounds.getInt(2), diameter)
+            val roundId = rounds.getLong(0)
+
+            val ends = database.query("SELECT _id, FROM `End` WHERE round = $roundId")
+            while (ends.moveToNext()) {
+                val endId = ends.getLong(0)
+
+                val shotsCursor = database.query("SELECT index, scoringRing FROM Shot WHERE end = $endId ORDER BY `index`")
+                val shots = mutableListOf<Shot>()
+                while(shotsCursor.moveToNext()) {
+                    val shot = Shot(index = shotsCursor.getInt(0), scoringRing = shotsCursor.getInt(1))
+                    shots.add(shot)
+                }
+
+                val score = target.getReachedScore(shots)
+                database.execSQL("UPDATE `End` SET " +
+                        "scoreReachedPoints = ${score.reachedPoints}, " +
+                        "scoreTotalPoints = ${score.totalPoints}, " +
+                        "scoreShotCount = ${score.shotCount} " +
+                        "WHERE _id = $endId")
             }
         }
     }
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt
index 56646df43..8255e3849 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt
@@ -15,21 +15,17 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import com.raizlabs.android.dbflow.annotation.Migration
-import com.raizlabs.android.dbflow.sql.migration.BaseMigration
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
-import de.dreier.mytargets.shared.AppDatabase
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
 
-@Migration(version = 3, database = AppDatabase::class)
-class Migration3 : BaseMigration() {
-
-    override fun migrate(database: DatabaseWrapper) {
+object Migration3 : Migration(2, 3) {
+    override fun migrate(database: SupportSQLiteDatabase) {
         database.execSQL("ALTER TABLE SHOOT ADD COLUMN x REAL")
         database.execSQL("ALTER TABLE SHOOT ADD COLUMN y REAL")
-        val cur = database.rawQuery("SELECT s._id, s.points, r.target " +
+        val cur = database.query("SELECT s._id, s.points, r.target " +
                 "FROM SHOOT s, PASSE p, ROUND r " +
                 "WHERE s.passe=p._id " +
-                "AND p.round=r._id", null)
+                "AND p.round=r._id")
         if (cur.moveToFirst()) {
             do {
                 val shoot = cur.getInt(0)
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt
index bcc76f98b..077054340 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt
@@ -15,15 +15,11 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import com.raizlabs.android.dbflow.annotation.Migration
-import com.raizlabs.android.dbflow.sql.migration.BaseMigration
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
-import de.dreier.mytargets.shared.AppDatabase
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
 
-@Migration(version = 4, database = AppDatabase::class)
-class Migration4 : BaseMigration() {
-
-    override fun migrate(database: DatabaseWrapper) {
+object Migration4 : Migration(3, 4) {
+    override fun migrate(database: SupportSQLiteDatabase) {
         database.execSQL(
                 "CREATE TABLE IF NOT EXISTS VISIER ( _id INTEGER PRIMARY KEY AUTOINCREMENT," +
                         "bow REFERENCES BOW ON DELETE CASCADE," +
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration5.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration5.kt
new file mode 100644
index 000000000..638545ef2
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration5.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
+
+object Migration5 : Migration(4, 5) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS ARROW")
+        database.execSQL("CREATE TABLE IF NOT EXISTS ARROW (" +
+                "_id INTEGER PRIMARY KEY AUTOINCREMENT,"+
+                "name TEXT,"+
+                "length TEXT,"+
+                "material TEXT,"+
+                "spine TEXT,"+
+                "weight TEXT,"+
+                "tip_wight TEXT,"+
+                "vanes TEXT,"+
+                "nock TEXT,"+
+                "comment TEXT,"+
+                "thumbnail BLOB,"+
+                "image TEXT)")
+        database.execSQL("ALTER TABLE ROUND ADD COLUMN arrow INTEGER REFERENCES ARROW ON DELETE SET NULL")
+        database.execSQL("ALTER TABLE ROUND ADD COLUMN comment TEXT DEFAULT ''")
+        database.execSQL("ALTER TABLE SHOOT ADD COLUMN comment TEXT DEFAULT ''")
+        database.execSQL("UPDATE ROUND SET target=0 WHERE target=1 OR target=2 OR target=3")
+        database.execSQL("UPDATE ROUND SET target=2 WHERE target=5 OR target=6 OR target=7")
+        database.execSQL("UPDATE ROUND SET target=3 WHERE target=4")
+        database.execSQL("UPDATE ROUND SET target=4 WHERE target=8")
+        database.execSQL("UPDATE ROUND SET target=5 WHERE target=9")
+        database.execSQL("UPDATE ROUND SET target=6 WHERE target=10")
+        database.execSQL("UPDATE SHOOT SET points=2 WHERE _id IN (SELECT s._id "+
+                "FROM ROUND r, PASSE p, SHOOT s LEFT JOIN BOW b ON b._id=r.bow "+
+                "WHERE r._id=p.round AND s.passe=p._id "+
+                "AND (r.bow=-2 OR b.type=1) AND s.points=1 AND r.target=3)")
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt
index 1039de631..eb04fc7bb 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt
@@ -15,27 +15,23 @@
 
 package de.dreier.mytargets.base.db.migrations
 
-import com.raizlabs.android.dbflow.annotation.Migration
-import com.raizlabs.android.dbflow.sql.migration.BaseMigration
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
-import de.dreier.mytargets.shared.AppDatabase
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
 import de.dreier.mytargets.shared.SharedApplicationInstance
 import java.io.File
 import java.io.IOException
 
-@Migration(version = 6, database = AppDatabase::class)
-class Migration6 : BaseMigration() {
-
-    override fun migrate(database: DatabaseWrapper) {
+object Migration6 : Migration(5, 6) {
+    override fun migrate(database: SupportSQLiteDatabase) {
         val filesDir = SharedApplicationInstance.context.filesDir
 
         // Migrate all bow images
-        var cur = database.rawQuery("SELECT image FROM BOW WHERE image IS NOT NULL", null)
+        var cur = database.query("SELECT image FROM BOW WHERE image IS NOT NULL")
         if (cur.moveToFirst()) {
             val fileName = cur.getString(0)
             try {
                 val file = File.createTempFile("img_", ".png", filesDir)
-                File(fileName).copyTo(file)
+                File(fileName).copyTo(file, overwrite = true)
                 database.execSQL(
                         "UPDATE BOW SET image=\"" + file.name + "\" WHERE image=\"" +
                                 fileName + "\"")
@@ -47,7 +43,7 @@ class Migration6 : BaseMigration() {
         cur.close()
 
         // Migrate all arrows images
-        cur = database.rawQuery("SELECT image FROM ARROW WHERE image IS NOT NULL", null)
+        cur = database.query("SELECT image FROM ARROW WHERE image IS NOT NULL")
         if (cur.moveToFirst()) {
             val fileName = cur.getString(0)
             try {
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration7.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration7.kt
new file mode 100644
index 000000000..d67b500eb
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration7.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
+
+object Migration7 : Migration(6, 7) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("DELETE FROM ROUND WHERE _id IN (SELECT r._id FROM ROUND r LEFT JOIN TRAINING t ON t._id=r.training WHERE t._id IS NULL)")
+        database.execSQL("DELETE FROM PASSE WHERE _id IN (SELECT p._id FROM PASSE p LEFT JOIN ROUND r ON r._id=p.round WHERE r._id IS NULL)")
+        database.execSQL("DELETE FROM SHOOT WHERE _id IN (SELECT s._id FROM SHOOT s LEFT JOIN PASSE p ON p._id=s.passe WHERE p._id IS NULL)")
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration8.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration8.kt
new file mode 100644
index 000000000..bec0bcca8
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration8.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
+
+object Migration8 : Migration(7, 8) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("UPDATE ROUND SET target=4 WHERE target=8")
+        database.execSQL("UPDATE ROUND SET target=5 WHERE target=9")
+        database.execSQL("UPDATE ROUND SET target=6 WHERE target=10")
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
index 0ea826ebf..4b3cb8a12 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
@@ -15,15 +15,12 @@
 
 package de.dreier.mytargets.base.db.migrations
 
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.migration.Migration
 import android.content.ContentValues
 import android.database.Cursor
-import android.database.sqlite.SQLiteDatabase
-import android.database.sqlite.SQLiteDatabase.CONFLICT_IGNORE
-import com.raizlabs.android.dbflow.annotation.Migration
-import com.raizlabs.android.dbflow.sql.migration.BaseMigration
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
+import android.database.sqlite.SQLiteDatabase.*
 import de.dreier.mytargets.base.db.dao.StandardRoundDAO
-import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
@@ -31,10 +28,8 @@ import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.StandardRound
 import de.dreier.mytargets.shared.utils.StandardRoundFactory
 
-@Migration(version = 9, database = AppDatabase::class)
-class Migration9 : BaseMigration() {
-
-    override fun migrate(database: DatabaseWrapper) {
+object Migration9 : Migration(8, 9) {
+    override fun migrate(database: SupportSQLiteDatabase) {
         database.execSQL("DROP TABLE IF EXISTS ZONE_MATRIX")
         database.execSQL("ALTER TABLE VISIER ADD COLUMN unit TEXT DEFAULT 'm'")
         database.execSQL("ALTER TABLE PASSE ADD COLUMN image TEXT DEFAULT ''")
@@ -107,7 +102,7 @@ class Migration9 : BaseMigration() {
                 "target INTEGER," +
                 "scoring_style INTEGER);")
 
-        val trainings = database.rawQuery("SELECT _id FROM TRAINING", null)
+        val trainings = database.query("SELECT _id FROM TRAINING")
         if (trainings.moveToFirst()) {
             do {
                 val training = trainings.getLong(0)
@@ -119,12 +114,12 @@ class Migration9 : BaseMigration() {
                             "UPDATE TRAINING SET standard_round=$sid WHERE _id=$training")
                 }
 
-                val res = database.rawQuery(
+                val res = database.query(
                         "SELECT r._id, r.comment, r.target, r.bow, r.arrow " +
                                 "FROM ROUND_OLD r " +
                                 "WHERE r.training=" + training + " " +
                                 "GROUP BY r._id " +
-                                "ORDER BY r._id ASC", null)
+                                "ORDER BY r._id ASC")
                 var index = 0
                 if (res.moveToFirst()) {
                     val bow = res.getLong(3)
@@ -144,7 +139,7 @@ class Migration9 : BaseMigration() {
                                 .put("target", if (target == 4) 5 else target)
                         contentValues.put("scoring_style",
                                 if (target == 5) 1 else 0)
-                        database.insertWithOnConflict("ROUND", null, contentValues, CONFLICT_IGNORE)
+                        database.insert("ROUND", CONFLICT_IGNORE, contentValues)
                         index++
                     } while (res.moveToNext())
                 }
@@ -154,14 +149,14 @@ class Migration9 : BaseMigration() {
         trainings.close()
     }
 
-    private fun getOrCreateStandardRound(db: DatabaseWrapper, training: Long): Long? {
-        val res = db.rawQuery(
+    private fun getOrCreateStandardRound(db: SupportSQLiteDatabase, training: Long): Long? {
+        val res = db.query(
                 "SELECT r.ppp, r.target, r.distance, r.unit, COUNT(p._id), r.indoor " +
                         "FROM ROUND_OLD r " +
                         "LEFT JOIN PASSE p ON r._id = p.round " +
                         "WHERE r.training=" + training + " " +
                         "GROUP BY r._id " +
-                        "ORDER BY r._id ASC", null)
+                        "ORDER BY r._id ASC")
         val sr = StandardRound()
         sr.name = "Practice"
         sr.club = 512
@@ -188,78 +183,75 @@ class Migration9 : BaseMigration() {
         return sr.id
     }
 
-    companion object {
-
-        private fun insertStandardRound(database: DatabaseWrapper, item: AugmentedStandardRound) {
-            val values = ContentValues()
-            values.put("name", item.standardRound.name)
-            values.put("club", item.standardRound.club)
-            values.put("indoor", 0)
-            if (item.id == 0L) {
-                item.standardRound.id = database
-                        .insertWithOnConflict("STANDARD_ROUND_TEMPLATE", null, values, SQLiteDatabase.CONFLICT_NONE)
-                for (r in item.roundTemplates) {
-                    r.standardRound = item.id
-                }
-            } else {
-                values.put("_id", item.id)
-                database.insertWithOnConflict("STANDARD_ROUND_TEMPLATE", null, values, SQLiteDatabase.CONFLICT_REPLACE)
-            }
-            for (template in item.roundTemplates) {
-                template.standardRound = item.id
-                insertRoundTemplate(database, template)
+    private fun insertStandardRound(database: SupportSQLiteDatabase, item: AugmentedStandardRound) {
+        val values = ContentValues()
+        values.put("name", item.standardRound.name)
+        values.put("club", item.standardRound.club)
+        values.put("indoor", 0)
+        if (item.id == 0L) {
+            item.standardRound.id = database
+                    .insert("STANDARD_ROUND_TEMPLATE", CONFLICT_NONE, values)
+            for (r in item.roundTemplates) {
+                r.standardRound = item.id
             }
+        } else {
+            values.put("_id", item.id)
+            database.insert("STANDARD_ROUND_TEMPLATE", CONFLICT_REPLACE, values)
         }
-
-        private fun insertRoundTemplate(database: DatabaseWrapper, item: RoundTemplate) {
-            val values = ContentValues()
-            values.put("sid", item.standardRound)
-            values.put("r_index", item.index)
-            values.put("distance", item.distance.value)
-            values.put("unit", Dimension.Unit.toStringHandleNull(item.distance.unit))
-            values.put("passes", item.endCount)
-            values.put("arrows", item.shotsPerEnd)
-            values.put("target", item.targetTemplate.id.toInt())
-            values.put("size", item.targetTemplate.diameter.value)
-            values.put("target_unit", Dimension.Unit
-                    .toStringHandleNull(item.targetTemplate.diameter.unit))
-            values.put("scoring_style", item.targetTemplate.scoringStyleIndex)
-            if (item.id == 0L) {
-                item.id = database
-                        .insertWithOnConflict("ROUND_TEMPLATE", null, values, SQLiteDatabase.CONFLICT_NONE)
-            } else {
-                values.put("_id", item.id)
-                database.insertWithOnConflict("ROUND_TEMPLATE", null, values, SQLiteDatabase.CONFLICT_REPLACE)
-            }
+        for (template in item.roundTemplates) {
+            template.standardRound = item.id
+            insertRoundTemplate(database, template)
         }
+    }
 
-        private fun getRoundTemplate(database: DatabaseWrapper, sid: Long, index: Int): RoundTemplate? {
-            val cursor = database.rawQuery("SELECT _id, r_index, arrows, target, scoring_style, " +
-                    "target, scoring_style, distance, unit, size, target_unit, passes, sid " +
-                    "FROM ROUND_TEMPLATE WHERE sid=? AND r_index=?",
-                    arrayOf(sid.toString(), index.toString()))
-            var r: RoundTemplate? = null
-            if (cursor.moveToFirst()) {
-                r = cursorToRoundTemplate(cursor, 0)
-            }
-            cursor.close()
-            return r
+    private fun insertRoundTemplate(database: SupportSQLiteDatabase, item: RoundTemplate) {
+        val values = ContentValues()
+        values.put("sid", item.standardRound)
+        values.put("r_index", item.index)
+        values.put("distance", item.distance.value)
+        values.put("unit", Dimension.Unit.toStringHandleNull(item.distance.unit))
+        values.put("passes", item.endCount)
+        values.put("arrows", item.shotsPerEnd)
+        values.put("target", item.targetTemplate.id.toInt())
+        values.put("size", item.targetTemplate.diameter.value)
+        values.put("target_unit", Dimension.Unit
+                .toStringHandleNull(item.targetTemplate.diameter.unit))
+        values.put("scoring_style", item.targetTemplate.scoringStyleIndex)
+        if (item.id == 0L) {
+            item.id = database
+                    .insert("ROUND_TEMPLATE", CONFLICT_NONE, values)
+        } else {
+            values.put("_id", item.id)
+            database.insert("ROUND_TEMPLATE", CONFLICT_REPLACE, values)
         }
+    }
 
-        private fun cursorToRoundTemplate(cursor: Cursor, startColumnIndex: Int): RoundTemplate {
-            val roundTemplate = RoundTemplate()
-            roundTemplate.id = cursor.getLong(startColumnIndex)
-            roundTemplate.index = cursor.getInt(startColumnIndex + 1)
-            roundTemplate.shotsPerEnd = cursor.getInt(startColumnIndex + 2)
-            val diameter = Dimension.from(
-                    cursor.getInt(startColumnIndex + 9).toFloat(), cursor.getString(startColumnIndex + 10))
-            roundTemplate.targetTemplate = Target(cursor.getLong(startColumnIndex + 3),
-                    cursor.getInt(startColumnIndex + 4), diameter)
-            roundTemplate.distance = Dimension.from(cursor.getInt(startColumnIndex + 7).toFloat(),
-                    cursor.getString(startColumnIndex + 8))
-            roundTemplate.endCount = cursor.getInt(startColumnIndex + 11)
-            roundTemplate.standardRound = cursor.getLong(startColumnIndex + 12)
-            return roundTemplate
+    private fun getRoundTemplate(database: SupportSQLiteDatabase, sid: Long, index: Int): RoundTemplate? {
+        val cursor = database.query("SELECT _id, r_index, arrows, target, scoring_style, " +
+                "target, scoring_style, distance, unit, size, target_unit, passes, sid " +
+                "FROM ROUND_TEMPLATE WHERE sid=? AND r_index=?",
+                arrayOf(sid.toString(), index.toString()))
+        var r: RoundTemplate? = null
+        if (cursor.moveToFirst()) {
+            r = cursorToRoundTemplate(cursor, 0)
         }
+        cursor.close()
+        return r
+    }
+
+    private fun cursorToRoundTemplate(cursor: Cursor, startColumnIndex: Int): RoundTemplate {
+        val roundTemplate = RoundTemplate()
+        roundTemplate.id = cursor.getLong(startColumnIndex)
+        roundTemplate.index = cursor.getInt(startColumnIndex + 1)
+        roundTemplate.shotsPerEnd = cursor.getInt(startColumnIndex + 2)
+        val diameter = Dimension.from(
+                cursor.getInt(startColumnIndex + 9).toFloat(), cursor.getString(startColumnIndex + 10))
+        roundTemplate.targetTemplate = Target(cursor.getLong(startColumnIndex + 3),
+                cursor.getInt(startColumnIndex + 4), diameter)
+        roundTemplate.distance = Dimension.from(cursor.getInt(startColumnIndex + 7).toFloat(),
+                cursor.getString(startColumnIndex + 8))
+        roundTemplate.endCount = cursor.getInt(startColumnIndex + 11)
+        roundTemplate.standardRound = cursor.getLong(startColumnIndex + 12)
+        return roundTemplate
     }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
new file mode 100644
index 000000000..834c3ee88
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db.migrations
+
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.RoomDatabase
+import de.dreier.mytargets.base.db.dao.StandardRoundDAO
+import de.dreier.mytargets.shared.utils.StandardRoundFactory
+
+object RoomCreationCallback : RoomDatabase.Callback() {
+
+    override fun onCreate(db: SupportSQLiteDatabase) {
+        fillStandardRound(db)
+        createScoreTriggers(db)
+    }
+
+    fun fillStandardRound(db: SupportSQLiteDatabase) {
+        val standardRounds = StandardRoundFactory.initTable()
+        for (standardRound in standardRounds) {
+            StandardRoundDAO.saveStandardRound(db, standardRound.standardRound, standardRound.roundTemplates)
+        }
+    }
+
+    fun createScoreTriggers(database: SupportSQLiteDatabase) {
+        database.execSQL("CREATE TRIGGER round_sum_score " +
+                "AFTER UPDATE ON `End` " +
+                "BEGIN " +
+                "UPDATE `Round` SET " +
+                "reachedPoints = (SELECT SUM(reachedPoints) FROM `End` WHERE round = NEW.round), " +
+                "totalPoints = (SELECT SUM(totalPoints) FROM `End` WHERE round = NEW.round), " +
+                "shotCount = (SELECT SUM(shotCount) FROM `End` WHERE round = NEW.round) " +
+                "WHERE _id = NEW.round;" +
+                "END;")
+
+        database.execSQL("CREATE TRIGGER training_sum_score " +
+                "AFTER UPDATE ON `Round` " +
+                "BEGIN " +
+                "UPDATE `Training` SET " +
+                "reachedPoints = (SELECT SUM(reachedPoints) FROM `Round` WHERE training = NEW.training), " +
+                "totalPoints = (SELECT SUM(totalPoints) FROM `Round` WHERE training = NEW.training), " +
+                "shotCount = (SELECT SUM(shotCount) FROM `Round` WHERE training = NEW.training) " +
+                "WHERE _id = NEW.training;" +
+                "END;")
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
index 042dad78f..ec02764c6 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
@@ -15,13 +15,44 @@
 
 package de.dreier.mytargets.shared
 
-import com.raizlabs.android.dbflow.annotation.Database
+import android.arch.persistence.room.Database
+import android.arch.persistence.room.RoomDatabase
+import android.arch.persistence.room.TypeConverters
+import de.dreier.mytargets.base.db.dao.TrainingDAO
+import de.dreier.mytargets.shared.models.db.*
+import de.dreier.mytargets.shared.utils.typeconverters.*
 
-@Database(name = AppDatabase.NAME, version = AppDatabase.VERSION, foreignKeyConstraintsEnforced = true)
-object AppDatabase {
+@Database(entities = [
+    Arrow::class,
+    ArrowImage::class,
+    Bow::class,
+    BowImage::class,
+    End::class,
+    EndImage::class,
+    Round::class,
+    RoundTemplate::class,
+    Shot::class,
+    SightMark::class,
+    Signature::class,
+    StandardRound::class,
+    Training::class
+], version = AppDatabase.VERSION)
+@TypeConverters(
+        DimensionConverters::class,
+        ThumbnailConverters::class,
+        LocalDateConverters::class,
+        EWeatherConverters::class,
+        BitmapConverters::class,
+        LocalTimeConverters::class,
+        EBowTypeConverters::class
+)
+abstract class AppDatabase : RoomDatabase() {
+    companion object {
+        const val NAME = "database"
+        const val DATABASE_FILE_NAME = "$NAME.db"
+        const val DATABASE_IMPORT_FILE_NAME = "database"
+        const val VERSION = 26
+    }
 
-    const val NAME = "database"
-    const val DATABASE_FILE_NAME = "$NAME.db"
-    const val DATABASE_IMPORT_FILE_NAME = "database"
-    const val VERSION = 26
+    abstract fun trainingDAO(): TrainingDAO
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt b/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt
index 8827b1fd2..fbc3af399 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt
@@ -18,6 +18,7 @@ package de.dreier.mytargets.shared
 import android.app.Application
 import android.content.Context
 import android.content.SharedPreferences
+import android.os.StrictMode
 import android.preference.PreferenceManager
 import android.support.annotation.StringRes
 import com.jakewharton.threetenabp.AndroidThreeTen
@@ -32,10 +33,12 @@ open class SharedApplicationInstance : Application() {
     }
 
     protected fun enableDebugLogging() {
-//        StrictMode.setThreadPolicy(StrictMode.ThreadPolicy.Builder()
+        StrictMode.setThreadPolicy(StrictMode.ThreadPolicy.Builder()
+                .detectDiskReads()
+                .detectDiskWrites()
 //                .detectAll()
-//                .penaltyLog()
-//                .build())
+                .penaltyLog()
+                .build())
 //        StrictMode.setVmPolicy(StrictMode.VmPolicy.Builder()
 //                .detectLeakedSqlLiteObjects()
 //                .detectLeakedClosableObjects()
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
index 739fd61c2..dc2a606fa 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
@@ -16,6 +16,7 @@
 package de.dreier.mytargets.shared.models
 
 import android.annotation.SuppressLint
+import android.arch.persistence.room.ColumnInfo
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.targets.TargetFactory
@@ -32,8 +33,11 @@ import kotlinx.android.parcel.Parcelize
 @SuppressLint("ParcelCreator")
 @Parcelize
 data class Target(
+        @ColumnInfo(name = "targetId")
         override var id: Long = 0,
+        @ColumnInfo(name = "targetScoringStyle")
         var scoringStyleIndex: Int = 0,
+        @ColumnInfo(name = "targetDiameter")
         var diameter: Dimension = Dimension.UNKNOWN
 ) : IIdProvider, Comparable<Target>, Parcelable {
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
index 31d80e974..bf30b7f02 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
@@ -16,58 +16,35 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
+import android.arch.persistence.room.ColumnInfo
+import android.arch.persistence.room.Entity
+import android.arch.persistence.room.PrimaryKey
 import android.os.Parcelable
-import com.raizlabs.android.dbflow.annotation.Column
-import com.raizlabs.android.dbflow.annotation.PrimaryKey
-import com.raizlabs.android.dbflow.annotation.Table
-import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.IIdSettable
 import de.dreier.mytargets.shared.models.Thumbnail
-import de.dreier.mytargets.shared.utils.typeconverters.DimensionConverter
-import de.dreier.mytargets.shared.utils.typeconverters.ThumbnailConverter
 import kotlinx.android.parcel.Parcelize
 
 @SuppressLint("ParcelCreator")
 @Parcelize
-@Table(database = AppDatabase::class)
+@Entity
 data class Arrow(
-        @Column(name = "_id")
-        @PrimaryKey(autoincrement = true)
+        @ColumnInfo(name = "_id")
+        @PrimaryKey(autoGenerate = true)
         override var id: Long = 0,
 
-        @Column
         var name: String = "",
-
-        @Column
         var maxArrowNumber: Int = 12,
-
-        @Column
         var length: String? = "",
-
-        @Column
         var material: String? = "",
-
-        @Column
         var spine: String? = "",
-
-        @Column
         var weight: String? = "",
-
-        @Column
         var tipWeight: String? = "",
-
-        @Column
         var vanes: String? = "",
-
-        @Column
         var nock: String? = "",
-
-        @Column
         var comment: String? = "",
-
-        @Column(typeConverter = DimensionConverter::class)
         var diameter: Dimension = Dimension(5f, Dimension.Unit.MILLIMETER),
 
-        @Column(typeConverter = ThumbnailConverter::class)
-        var thumbnail: Thumbnail? = null) : IIdSettable, Parcelable
+        @ColumnInfo(typeAffinity = ColumnInfo.BLOB)
+        var thumbnail: Thumbnail? = null
+) : IIdSettable, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
index 36d4c3356..186c885dd 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
@@ -16,23 +16,30 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
+import android.arch.persistence.room.ColumnInfo
+import android.arch.persistence.room.Entity
+import android.arch.persistence.room.ForeignKey
+import android.arch.persistence.room.ForeignKey.CASCADE
+import android.arch.persistence.room.PrimaryKey
 import android.os.Parcelable
-import com.raizlabs.android.dbflow.annotation.*
-import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.Image
 import kotlinx.android.parcel.Parcelize
 
 @SuppressLint("ParcelCreator")
 @Parcelize
-@Table(database = AppDatabase::class)
+@Entity(foreignKeys = [
+    ForeignKey(entity = Arrow::class,
+            parentColumns = ["_id"],
+            childColumns = ["arrow"],
+            onDelete = CASCADE)
+])
 data class ArrowImage(
-        @Column(name = "_id")
-        @PrimaryKey(autoincrement = true)
+        @ColumnInfo(name = "_id")
+        @PrimaryKey(autoGenerate = true)
         var id: Long = 0,
 
-        @Column
         override var fileName: String = "",
 
-        @ForeignKey(tableClass = Arrow::class, references = [(ForeignKeyReference(columnName = "arrow", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.CASCADE)
+        @ColumnInfo(name = "arrow")
         var arrowId: Long? = null
 ) : Image, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
index 3c578605d..d110d9bad 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
@@ -16,93 +16,46 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
+import android.arch.persistence.room.ColumnInfo
+import android.arch.persistence.room.Entity
+import android.arch.persistence.room.PrimaryKey
 import android.os.Parcelable
-import com.raizlabs.android.dbflow.annotation.Column
-import com.raizlabs.android.dbflow.annotation.PrimaryKey
-import com.raizlabs.android.dbflow.annotation.Table
-import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.EBowType
 import de.dreier.mytargets.shared.models.IIdSettable
 import de.dreier.mytargets.shared.models.Thumbnail
-import de.dreier.mytargets.shared.utils.typeconverters.EBowTypeConverter
-import de.dreier.mytargets.shared.utils.typeconverters.ThumbnailConverter
 import kotlinx.android.parcel.Parcelize
 
 @SuppressLint("ParcelCreator")
 @Parcelize
-@Table(database = AppDatabase::class)
+@Entity
 data class Bow(
-        @Column(name = "_id")
-        @PrimaryKey(autoincrement = true)
+        @ColumnInfo(name = "_id")
+        @PrimaryKey(autoGenerate = true)
         override var id: Long = 0,
 
-        @Column
         var name: String = "",
-
-        @Column(typeConverter = EBowTypeConverter::class)
         var type: EBowType? = EBowType.RECURVE_BOW,
-
-        @Column
         var brand: String? = "",
-
-        @Column
         var size: String? = "",
-
-        @Column
         var braceHeight: String? = "",
-
-        @Column
         var tiller: String? = "",
-
-        @Column
         var limbs: String? = "",
-
-        @Column
         var sight: String? = "",
-
-        @Column
         var drawWeight: String? = "",
-
-        @Column
         var stabilizer: String? = "",
-
-        @Column
         var clicker: String? = "",
-
-        @Column
         var button: String? = "",
-
-        @Column
         var string: String? = "",
-
-        @Column
         var nockingPoint: String? = "",
-
-        @Column
         var letoffWeight: String? = "",
-
-        @Column
         var arrowRest: String? = "",
-
-        @Column
         var restHorizontalPosition: String? = "",
-
-        @Column
         var restVerticalPosition: String? = "",
-
-        @Column
         var restStiffness: String? = "",
-
-        @Column
         var camSetting: String? = "",
-
-        @Column
         var scopeMagnification: String? = "",
-
-        @Column
         var description: String? = "",
-
-        @Column(typeConverter = ThumbnailConverter::class)
+        @ColumnInfo(typeAffinity = ColumnInfo.BLOB)
         var thumbnail: Thumbnail? = null
 ) : IIdSettable, Parcelable {
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
index 011e401b4..8e7084d83 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
@@ -16,23 +16,30 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
+import android.arch.persistence.room.ColumnInfo
+import android.arch.persistence.room.Entity
+import android.arch.persistence.room.ForeignKey
+import android.arch.persistence.room.ForeignKey.CASCADE
+import android.arch.persistence.room.PrimaryKey
 import android.os.Parcelable
-import com.raizlabs.android.dbflow.annotation.*
-import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.Image
 import kotlinx.android.parcel.Parcelize
 
 @SuppressLint("ParcelCreator")
 @Parcelize
-@Table(database = AppDatabase::class)
+@Entity(foreignKeys = [
+    ForeignKey(entity = Bow::class,
+            parentColumns = ["_id"],
+            childColumns = ["bow"],
+            onDelete = CASCADE)
+])
 data class BowImage(
-        @Column(name = "_id")
-        @PrimaryKey(autoincrement = true)
+        @ColumnInfo(name = "_id")
+        @PrimaryKey(autoGenerate = true)
         var id: Long = 0,
 
-        @Column
         override var fileName: String = "",
 
-        @ForeignKey(tableClass = Bow::class, references = [(ForeignKeyReference(columnName = "bow", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.CASCADE)
+        @ColumnInfo(name = "bow")
         var bowId: Long? = null
 ) : Image, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
index 224d05b30..89c42fa98 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
@@ -16,55 +16,39 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
+import android.arch.persistence.room.*
+import android.arch.persistence.room.ForeignKey.CASCADE
 import android.os.Parcelable
-import com.raizlabs.android.dbflow.annotation.*
-import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.IIdSettable
 import de.dreier.mytargets.shared.models.Score
-import de.dreier.mytargets.shared.utils.typeconverters.LocalTimeConverter
 import kotlinx.android.parcel.Parcelize
 import org.threeten.bp.LocalTime
 
 @SuppressLint("ParcelCreator")
 @Parcelize
-@Table(database = AppDatabase::class)
+@Entity(foreignKeys = [
+    ForeignKey(entity = Round::class,
+            parentColumns = ["_id"],
+            childColumns = ["round"],
+            onDelete = CASCADE)
+])
 data class End(
 
-        @Column(name = "_id")
-        @PrimaryKey(autoincrement = true)
+        @ColumnInfo(name = "_id")
+        @PrimaryKey(autoGenerate = true)
         override var id: Long = 0,
 
-        @Column
         var index: Int = 0,
 
-        @ForeignKey(tableClass = Round::class, references = [(ForeignKeyReference(columnName = "round", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.CASCADE)
+        @ColumnInfo(name = "round")
         var roundId: Long? = null,
 
-        @Column(getterName = "getExact", setterName = "setExact")
         var exact: Boolean = false,
 
-        @Column(typeConverter = LocalTimeConverter::class)
         var saveTime: LocalTime? = null,
 
-        @Column
         var comment: String = "",
 
-        @Column
-        var scoreReachedPoints: Int = 0,
-
-        @Column
-        var scoreTotalPoints: Int = 0,
-
-        @Column
-        var scoreShotCount: Int = 0
-) : IIdSettable, Parcelable {
-
-    var score: Score
-        get() = Score(scoreReachedPoints, scoreTotalPoints, scoreShotCount)
-        set(value) {
-            scoreReachedPoints = value.reachedPoints
-            scoreTotalPoints = value.totalPoints
-            scoreShotCount = value.shotCount
-        }
-
-}
+        @Embedded
+        var score: Score = Score()
+) : IIdSettable, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
index 5d1483100..b21856aee 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
@@ -15,22 +15,29 @@
 
 package de.dreier.mytargets.shared.models.db
 
+import android.arch.persistence.room.ColumnInfo
+import android.arch.persistence.room.Entity
+import android.arch.persistence.room.ForeignKey
+import android.arch.persistence.room.ForeignKey.CASCADE
+import android.arch.persistence.room.PrimaryKey
 import android.os.Parcel
 import android.os.Parcelable
-import com.raizlabs.android.dbflow.annotation.*
-import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.Image
 
-@Table(database = AppDatabase::class)
+@Entity(foreignKeys = [
+    ForeignKey(entity = End::class,
+            parentColumns = ["_id"],
+            childColumns = ["end"],
+            onDelete = CASCADE)
+])
 data class EndImage(
-        @Column(name = "_id")
-        @PrimaryKey(autoincrement = true)
+        @ColumnInfo(name = "_id")
+        @PrimaryKey(autoGenerate = true)
         var _id: Long = 0,
 
-        @Column
         override var fileName: String = "",
 
-        @ForeignKey(tableClass = End::class, references = [(ForeignKeyReference(columnName = "end", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.CASCADE)
+        @ColumnInfo(name = "end")
         var endId: Long? = null
 ) : Image, Parcelable {
     constructor(imageFile: String) : this(fileName = imageFile)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
index c72a71c1c..0ad6b0126 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
@@ -16,59 +16,46 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
+import android.arch.persistence.room.*
+import android.arch.persistence.room.ForeignKey.CASCADE
 import android.os.Parcelable
-import com.raizlabs.android.dbflow.annotation.*
-import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.IIdSettable
 import de.dreier.mytargets.shared.models.Score
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.shared.utils.typeconverters.DimensionConverter
 import kotlinx.android.parcel.Parcelize
 
 @SuppressLint("ParcelCreator")
 @Parcelize
-@Table(database = AppDatabase::class)
+@Entity(foreignKeys = [
+    ForeignKey(entity = Training::class,
+            parentColumns = ["_id"],
+            childColumns = ["training"],
+            onDelete = CASCADE)
+])
 data class Round(
-        @Column(name = "_id")
-        @PrimaryKey(autoincrement = true)
+        @ColumnInfo(name = "_id")
+        @PrimaryKey(autoGenerate = true)
         override var id: Long = 0,
 
-        @ForeignKey(tableClass = Training::class, references = [(ForeignKeyReference(columnName = "training", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.CASCADE)
+        @ColumnInfo(name = "training")
         var trainingId: Long? = null,
 
-        @Column
         var index: Int = 0,
 
-        @Column
         var shotsPerEnd: Int = 0,
 
-        @Column
         var maxEndCount: Int? = null,
 
-        @Column(typeConverter = DimensionConverter::class)
         var distance: Dimension = Dimension.UNKNOWN,
 
-        @Column
         var comment: String = "",
 
-        @Column
-        var targetId: Int = 0,
+        @Embedded
+        var target: Target = Target(),
 
-        @Column
-        var targetScoringStyle: Int = 0,
-
-        @Column(typeConverter = DimensionConverter::class)
-        var targetDiameter: Dimension = Dimension.UNKNOWN,
-
-        @Column
-        var scoreReachedPoints: Int = 0,
-
-        @Column
-        var scoreTotalPoints: Int = 0,
-
-        @Column
-        var scoreShotCount: Int = 0
+        @Embedded
+        var score: Score = Score()
 ) : IIdSettable, Parcelable {
 
     constructor(info: RoundTemplate) : this(
@@ -76,19 +63,6 @@ data class Round(
             shotsPerEnd = info.shotsPerEnd,
             maxEndCount = info.endCount,
             index = info.index,
-            targetId = info.targetId,
-            targetScoringStyle = info.targetScoringStyle,
-            targetDiameter = info.targetDiameter
+            target = info.targetTemplate.copy()
     )
-
-    var target: Target
-        get() = Target(targetId.toLong(), targetScoringStyle, targetDiameter)
-        set(targetTemplate) {
-            targetId = targetTemplate.id.toInt()
-            targetScoringStyle = targetTemplate.scoringStyleIndex
-            targetDiameter = targetTemplate.diameter
-        }
-
-    val score: Score
-        get() = Score(scoreReachedPoints, scoreTotalPoints, scoreShotCount)
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
index ef543d457..39be5467e 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
@@ -15,53 +15,37 @@
 
 package de.dreier.mytargets.shared.models.db
 
+import android.arch.persistence.room.*
+import android.arch.persistence.room.ForeignKey.CASCADE
 import android.os.Parcel
 import android.os.Parcelable
-import com.raizlabs.android.dbflow.annotation.*
-import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.IIdSettable
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.shared.utils.typeconverters.DimensionConverter
 
-@Table(database = AppDatabase::class)
+@Entity(foreignKeys = [(ForeignKey(entity = StandardRound::class,
+        parentColumns = ["_id"],
+        childColumns = ["standardRound"],
+        onDelete = CASCADE))])
 data class RoundTemplate(
-        @Column(name = "_id")
-        @PrimaryKey(autoincrement = true)
+        @ColumnInfo(name = "_id")
+        @PrimaryKey(autoGenerate = true)
         override var id: Long = 0,
 
-        @ForeignKey(tableClass = StandardRound::class, references = [(ForeignKeyReference(columnName = "standardRound", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.CASCADE)
+        @ColumnInfo(name = "standardRound")
         var standardRound: Long? = null,
 
-        @Column
         var index: Int = 0,
 
-        @Column
         var shotsPerEnd: Int = 0,
 
-        @Column
         var endCount: Int = 0,
 
-        @Column(typeConverter = DimensionConverter::class)
         var distance: Dimension = Dimension.UNKNOWN,
 
-        @Column
-        var targetId: Int = 0,
-
-        @Column
-        var targetScoringStyle: Int = 0,
-
-        @Column(typeConverter = DimensionConverter::class)
-        var targetDiameter: Dimension = Dimension.UNKNOWN
+        @Embedded
+        var targetTemplate: Target = Target()
 ) : IIdSettable, Parcelable {
-    var targetTemplate: Target
-        get() = Target(targetId.toLong(), targetScoringStyle, targetDiameter)
-        set(targetTemplate) {
-            targetId = targetTemplate.id.toInt()
-            targetScoringStyle = targetTemplate.scoringStyleIndex
-            targetDiameter = targetTemplate.diameter
-        }
-
     constructor(source: Parcel) : this(
             source.readLong(),
             source.readValue(Long::class.java.classLoader) as Long?,
@@ -69,9 +53,7 @@ data class RoundTemplate(
             source.readInt(),
             source.readInt(),
             source.readParcelable<Dimension>(Dimension::class.java.classLoader),
-            source.readInt(),
-            source.readInt(),
-            source.readParcelable<Dimension>(Dimension::class.java.classLoader)
+            source.readParcelable<Target>(Target::class.java.classLoader)
     )
 
     override fun describeContents() = 0
@@ -83,9 +65,7 @@ data class RoundTemplate(
         writeInt(shotsPerEnd)
         writeInt(endCount)
         writeParcelable(distance, 0)
-        writeInt(targetId)
-        writeInt(targetScoringStyle)
-        writeParcelable(targetDiameter, 0)
+        writeParcelable(targetTemplate, 0)
     }
 
     companion object {
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
index a85f29b51..fb2d775d7 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
@@ -15,36 +15,37 @@
 
 package de.dreier.mytargets.shared.models.db
 
+import android.arch.persistence.room.ColumnInfo
+import android.arch.persistence.room.Entity
+import android.arch.persistence.room.ForeignKey
+import android.arch.persistence.room.ForeignKey.CASCADE
+import android.arch.persistence.room.PrimaryKey
 import android.os.Parcel
 import android.os.Parcelable
-import com.raizlabs.android.dbflow.annotation.*
-import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.IIdSettable
 
-@Table(database = AppDatabase::class)
+@Entity(foreignKeys = [(ForeignKey(entity = End::class,
+                parentColumns = ["_id"],
+                childColumns = ["end"],
+                onDelete = CASCADE))])
 data class Shot(
-        @Column(name = "_id")
-        @PrimaryKey(autoincrement = true)
+        @ColumnInfo(name = "_id")
+        @PrimaryKey(autoGenerate = true)
         override var id: Long = 0,
 
         // The index of the shot in the containing end
-        @Column
         var index: Int = 0,
 
-        @ForeignKey(tableClass = End::class, references = [(ForeignKeyReference(columnName = "end", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.CASCADE)
+        @ColumnInfo(name = "end")
         var endId: Long? = null,
 
-        @Column
         var x: Float = 0f,
 
-        @Column
         var y: Float = 0f,
 
-        @Column
         var scoringRing: Int = NOTHING_SELECTED,
 
         // Is the actual number of the arrow not its index, arrow id or something else
-        @Column
         var arrowNumber: String? = null
 ) : IIdSettable, Comparable<Shot>, Parcelable {
     constructor(i: Int) : this(index = i)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
index 84cada3ed..5a9c5adec 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
@@ -15,29 +15,32 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
+import android.arch.persistence.room.ColumnInfo
+import android.arch.persistence.room.Entity
+import android.arch.persistence.room.ForeignKey
+import android.arch.persistence.room.ForeignKey.CASCADE
+import android.arch.persistence.room.PrimaryKey
 import android.os.Parcelable
-import com.raizlabs.android.dbflow.annotation.*
-import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Dimension.Unit.METER
 import de.dreier.mytargets.shared.models.IIdSettable
-import de.dreier.mytargets.shared.utils.typeconverters.DimensionConverter
 import kotlinx.android.parcel.Parcelize
 
 @SuppressLint("ParcelCreator")
 @Parcelize
-@Table(database = AppDatabase::class)
+@Entity(foreignKeys = [(ForeignKey(entity = Bow::class,
+                parentColumns = ["_id"],
+                childColumns = ["bow"],
+                onDelete = CASCADE))])
 data class SightMark(
-        @Column(name = "_id")
-        @PrimaryKey(autoincrement = true)
+        @ColumnInfo(name = "_id")
+        @PrimaryKey(autoGenerate = true)
         override var id: Long = 0,
 
-        @ForeignKey(tableClass = Bow::class, references = [(ForeignKeyReference(columnName = "bow", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.CASCADE)
+        @ColumnInfo(name = "bow")
         var bowId: Long? = null,
 
-        @Column(typeConverter = DimensionConverter::class)
         var distance: Dimension = Dimension(18f, METER),
 
-        @Column
         var value: String? = ""
 ) : IIdSettable, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt
index e90be5767..9aedeb35f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt
@@ -15,29 +15,25 @@
 
 package de.dreier.mytargets.shared.models.db
 
+import android.arch.persistence.room.ColumnInfo
+import android.arch.persistence.room.Entity
+import android.arch.persistence.room.PrimaryKey
 import android.graphics.Bitmap
 import android.os.Parcel
 import android.os.Parcelable
-import com.raizlabs.android.dbflow.annotation.Column
-import com.raizlabs.android.dbflow.annotation.PrimaryKey
-import com.raizlabs.android.dbflow.annotation.Table
-import com.raizlabs.android.dbflow.sql.language.SQLite
-import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.utils.readBitmap
-import de.dreier.mytargets.shared.utils.typeconverters.BitmapConverter
 import de.dreier.mytargets.shared.utils.writeBitmap
 
-@Table(database = AppDatabase::class)
+@Entity
 data class Signature(
-        @Column(name = "_id")
-        @PrimaryKey(autoincrement = true)
+        @ColumnInfo(name = "_id")
+        @PrimaryKey(autoGenerate = true)
         var id: Long = 0,
 
-        @Column
         var name: String = "",
 
         /** A bitmap of the signature or null if no signature has been set. */
-        @Column(typeConverter = BitmapConverter::class)
+        @ColumnInfo(typeAffinity = ColumnInfo.BLOB)
         var bitmap: Bitmap? = null
 ) : Parcelable {
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
index 4bae15344..3fd768279 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
@@ -15,25 +15,20 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
+import android.arch.persistence.room.ColumnInfo
+import android.arch.persistence.room.Entity
+import android.arch.persistence.room.PrimaryKey
 import android.os.Parcelable
-import com.raizlabs.android.dbflow.annotation.Column
-import com.raizlabs.android.dbflow.annotation.PrimaryKey
-import com.raizlabs.android.dbflow.annotation.Table
-import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.IIdSettable
 import kotlinx.android.parcel.Parcelize
 
 @SuppressLint("ParcelCreator")
 @Parcelize
-@Table(database = AppDatabase::class)
+@Entity
 data class StandardRound(
-        @Column(name = "_id")
-        @PrimaryKey(autoincrement = true)
+        @ColumnInfo(name = "_id")
+        @PrimaryKey(autoGenerate = true)
         override var id: Long = 0,
-
-        @Column
         var club: Int = 0,
-
-        @Column
         var name: String = ""
 ) : IIdSettable, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
index 22b03603d..d02ace083 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
@@ -16,15 +16,12 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
+import android.arch.persistence.room.*
+import android.arch.persistence.room.ForeignKey.SET_NULL
 import android.os.Parcelable
-import com.raizlabs.android.dbflow.annotation.*
-import de.dreier.mytargets.shared.AppDatabase
-import de.dreier.mytargets.shared.models.EWeather
 import de.dreier.mytargets.shared.models.Environment
 import de.dreier.mytargets.shared.models.IIdSettable
 import de.dreier.mytargets.shared.models.Score
-import de.dreier.mytargets.shared.utils.typeconverters.EWeatherConverter
-import de.dreier.mytargets.shared.utils.typeconverters.LocalDateConverter
 import kotlinx.android.parcel.Parcelize
 import org.threeten.bp.LocalDate
 import org.threeten.bp.format.DateTimeFormatter
@@ -32,79 +29,64 @@ import org.threeten.bp.format.FormatStyle
 
 @SuppressLint("ParcelCreator")
 @Parcelize
-@Table(database = AppDatabase::class)
+@Entity(foreignKeys = [
+    ForeignKey(entity = Arrow::class,
+            parentColumns = ["_id"],
+            childColumns = ["arrow"],
+            onDelete = SET_NULL),
+    ForeignKey(entity = Bow::class,
+            parentColumns = ["_id"],
+            childColumns = ["bow"],
+            onDelete = SET_NULL),
+    ForeignKey(entity = StandardRound::class,
+            parentColumns = ["_id"],
+            childColumns = ["standardRound"],
+            onDelete = SET_NULL),
+    ForeignKey(entity = Signature::class,
+            parentColumns = ["_id"],
+            childColumns = ["archerSignature"],
+            onDelete = SET_NULL),
+    ForeignKey(entity = Signature::class,
+            parentColumns = ["_id"],
+            childColumns = ["witnessSignature"],
+            onDelete = SET_NULL)
+])
 data class Training(
 
-        @Column(name = "_id")
-        @PrimaryKey(autoincrement = true)
+        @ColumnInfo(name = "_id")
+        @PrimaryKey(autoGenerate = true)
         override var id: Long = 0L,
 
-        @Column
         var title: String = "",
-
-        @Column(typeConverter = LocalDateConverter::class)
         var date: LocalDate = LocalDate.now(),
 
-        @ForeignKey(tableClass = StandardRound::class, references = [(ForeignKeyReference(columnName = "standardRound", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.SET_NULL)
+        @ColumnInfo(name = "standardRound")
         var standardRoundId: Long? = null,
 
-        @ForeignKey(tableClass = Bow::class, references = [(ForeignKeyReference(columnName = "bow", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.SET_NULL)
+        @ColumnInfo(name = "bow")
         var bowId: Long? = null,
 
-        @ForeignKey(tableClass = Arrow::class, references = [(ForeignKeyReference(columnName = "arrow", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.SET_NULL)
+        @ColumnInfo(name = "arrow")
         var arrowId: Long? = null,
 
-        @Column(getterName = "getArrowNumbering", setterName = "setArrowNumbering")
         var arrowNumbering: Boolean = false,
 
-        @Column(getterName = "getIndoor", setterName = "setIndoor")
-        var indoor: Boolean = false,
-
-        @Column(typeConverter = EWeatherConverter::class)
-        var weather: EWeather = EWeather.SUNNY,
-
-        @Column
-        var windDirection: Int = 0,
-
-        @Column
-        var windSpeed: Int = 0,
-
-        @Column
-        var location: String = "",
+        @Embedded
+        var environment: Environment = Environment(),
 
-        @Column
         var comment: String = "",
 
-        @ForeignKey(tableClass = Signature::class, references = [(ForeignKeyReference(columnName = "archerSignature", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.SET_NULL)
+        @ColumnInfo(name = "archerSignature")
         var archerSignatureId: Long? = null,
 
-        @ForeignKey(tableClass = Signature::class, references = [(ForeignKeyReference(columnName = "witnessSignature", foreignKeyColumnName = "_id"))], onDelete = ForeignKeyAction.SET_NULL)
+        @ColumnInfo(name = "witnessSignature")
         var witnessSignatureId: Long? = null,
 
-        @Column
-        var scoreReachedPoints: Int = 0,
-
-        @Column
-        var scoreTotalPoints: Int = 0,
-
-        @Column
-        var scoreShotCount: Int = 0
+        @Embedded
+        var score: Score = Score()
 
 ) : IIdSettable, Parcelable {
 
-    var environment: Environment
-        get() = Environment(indoor, weather, windSpeed, windDirection, location)
-        set(env) {
-            indoor = env.indoor
-            weather = env.weather
-            windDirection = env.windDirection
-            windSpeed = env.windSpeed
-            location = env.location
-        }
-
     val formattedDate: String
         get() = date.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM))
-
-    val score: Score
-        get() = Score(scoreReachedPoints, scoreTotalPoints, scoreShotCount)
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt
index 1b0109e09..22d95d562 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt
@@ -89,7 +89,7 @@ open class ScoringStyle private constructor(
         return Score(reachedScore, maxScore)
     }
 
-    open fun getReachedScore(shots: MutableList<Shot>): Score {
+    open fun getReachedScore(shots: List<Shot>): Score {
         return shots.map { getReachedScore(it) }.sum()
     }
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/BitmapConverter.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/BitmapConverters.kt
similarity index 65%
rename from shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/BitmapConverter.kt
rename to shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/BitmapConverters.kt
index 162c11b18..ba85fcc1a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/BitmapConverter.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/BitmapConverters.kt
@@ -15,21 +15,22 @@
 
 package de.dreier.mytargets.shared.utils.typeconverters
 
+import android.arch.persistence.room.TypeConverter
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import com.raizlabs.android.dbflow.converter.TypeConverter
-import com.raizlabs.android.dbflow.data.Blob
 import de.dreier.mytargets.shared.utils.toByteArray
 
-class BitmapConverter : TypeConverter<Blob, Bitmap>() {
+class BitmapConverters {
 
-    override fun getDBValue(model: Bitmap?): Blob? {
-        return if (model != null) Blob(model.toByteArray()) else null
+    @TypeConverter
+    fun getDBValue(model: Bitmap?): ByteArray? {
+        return model?.toByteArray()
     }
 
-    override fun getModelValue(data: Blob?): Bitmap? {
+    @TypeConverter
+    fun getModelValue(data: ByteArray?): Bitmap? {
         return if (data != null) {
-            BitmapFactory.decodeByteArray(data.blob, 0, data.blob.size)
+            BitmapFactory.decodeByteArray(data, 0, data.size)
         } else null
     }
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/DimensionConverter.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/DimensionConverter.kt
index 3435d2f2b..6ca9e044e 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/DimensionConverter.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/DimensionConverter.kt
@@ -15,17 +15,18 @@
 
 package de.dreier.mytargets.shared.utils.typeconverters
 
-import com.raizlabs.android.dbflow.converter.TypeConverter
-
+import android.arch.persistence.room.TypeConverter
 import de.dreier.mytargets.shared.models.Dimension
 
-class DimensionConverter : TypeConverter<String, Dimension>() {
+class DimensionConverters {
 
-    override fun getDBValue(model: Dimension): String {
+    @TypeConverter
+    fun getDBValue(model: Dimension): String {
         return "${model.value} ${model.unit}"
     }
 
-    override fun getModelValue(data: String): Dimension {
+    @TypeConverter
+    fun getModelValue(data: String): Dimension {
         val index = data.indexOf(' ')
         val value = data.substring(0, index)
         val unit = data.substring(index + 1)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EBowTypeConverter.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EBowTypeConverters.kt
similarity index 76%
rename from shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EBowTypeConverter.kt
rename to shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EBowTypeConverters.kt
index 5b8d57f05..ee37f4781 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EBowTypeConverter.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EBowTypeConverters.kt
@@ -15,17 +15,18 @@
 
 package de.dreier.mytargets.shared.utils.typeconverters
 
-import com.raizlabs.android.dbflow.converter.TypeConverter
-
+import android.arch.persistence.room.TypeConverter
 import de.dreier.mytargets.shared.models.EBowType
 
-class EBowTypeConverter : TypeConverter<Int, EBowType>() {
+class EBowTypeConverters {
 
-    override fun getDBValue(model: EBowType?): Int? {
+    @TypeConverter
+    fun getDBValue(model: EBowType?): Int? {
         return model?.ordinal
     }
 
-    override fun getModelValue(data: Int?): EBowType? {
+    @TypeConverter
+    fun getModelValue(data: Int?): EBowType? {
         return if (data != null) EBowType.fromId(data) else null
     }
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EWeatherConverter.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EWeatherConverters.kt
similarity index 77%
rename from shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EWeatherConverter.kt
rename to shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EWeatherConverters.kt
index 51878bd7d..df71b9a9e 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EWeatherConverter.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EWeatherConverters.kt
@@ -15,17 +15,18 @@
 
 package de.dreier.mytargets.shared.utils.typeconverters
 
-import com.raizlabs.android.dbflow.converter.TypeConverter
-
+import android.arch.persistence.room.TypeConverter
 import de.dreier.mytargets.shared.models.EWeather
 
-class EWeatherConverter : TypeConverter<Int, EWeather>() {
+class EWeatherConverters {
 
-    override fun getDBValue(model: EWeather?): Int? {
+    @TypeConverter
+    fun getDBValue(model: EWeather?): Int? {
         return model?.ordinal //TODO migrate to save name instead of ordinal
     }
 
-    override fun getModelValue(data: Int?): EWeather? {
+    @TypeConverter
+    fun getModelValue(data: Int?): EWeather? {
         return if (data != null) EWeather.getOfValue(data) else null
     }
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalDateConverter.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalDateConverters.kt
similarity index 76%
rename from shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalDateConverter.kt
rename to shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalDateConverters.kt
index 8483cbd86..c093eb197 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalDateConverter.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalDateConverters.kt
@@ -15,18 +15,19 @@
 
 package de.dreier.mytargets.shared.utils.typeconverters
 
-import com.raizlabs.android.dbflow.converter.TypeConverter
-
+import android.arch.persistence.room.TypeConverter
 import org.threeten.bp.LocalDate
 import org.threeten.bp.format.DateTimeFormatter
 
-class LocalDateConverter : TypeConverter<String, LocalDate>() {
+class LocalDateConverters {
 
-    override fun getDBValue(model: LocalDate?): String? {
+    @TypeConverter
+    fun getDBValue(model: LocalDate?): String? {
         return model?.format(DateTimeFormatter.ISO_LOCAL_DATE)
     }
 
-    override fun getModelValue(data: String?): LocalDate? {
+    @TypeConverter
+    fun getModelValue(data: String?): LocalDate? {
         return if (data != null) LocalDate.parse(data) else null
     }
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalTimeConverter.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalTimeConverters.kt
similarity index 76%
rename from shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalTimeConverter.kt
rename to shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalTimeConverters.kt
index 223131364..e73c1dd82 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalTimeConverter.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalTimeConverters.kt
@@ -15,18 +15,19 @@
 
 package de.dreier.mytargets.shared.utils.typeconverters
 
-import com.raizlabs.android.dbflow.converter.TypeConverter
-
+import android.arch.persistence.room.TypeConverter
 import org.threeten.bp.LocalTime
 import org.threeten.bp.format.DateTimeFormatter
 
-class LocalTimeConverter : TypeConverter<String, LocalTime>() {
+class LocalTimeConverters {
 
-    override fun getDBValue(model: LocalTime?): String? {
+    @TypeConverter
+    fun getDBValue(model: LocalTime?): String? {
         return model?.format(DateTimeFormatter.ISO_LOCAL_TIME)
     }
 
-    override fun getModelValue(data: String?): LocalTime? {
+    @TypeConverter
+    fun getModelValue(data: String?): LocalTime? {
         return if (data != null) LocalTime.parse(data) else null
     }
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/ThumbnailConverter.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/ThumbnailConverters.kt
similarity index 61%
rename from shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/ThumbnailConverter.kt
rename to shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/ThumbnailConverters.kt
index b38f6572e..71b1f4628 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/ThumbnailConverter.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/ThumbnailConverters.kt
@@ -15,19 +15,19 @@
 
 package de.dreier.mytargets.shared.utils.typeconverters
 
-import com.raizlabs.android.dbflow.converter.TypeConverter
-import com.raizlabs.android.dbflow.data.Blob
-
+import android.arch.persistence.room.TypeConverter
 import de.dreier.mytargets.shared.models.Thumbnail
 
-class ThumbnailConverter : TypeConverter<Blob, Thumbnail>() {
+class ThumbnailConverters {
 
-    override fun getDBValue(model: Thumbnail?): Blob? {
-        return if(model == null) null else Blob(model.data)
+    @TypeConverter
+    fun getDBValue(model: Thumbnail?): ByteArray? {
+        return model?.data
     }
 
-    override fun getModelValue(data: Blob?): Thumbnail? {
-        return if (data != null) Thumbnail(data.blob) else null
+    @TypeConverter
+    fun getModelValue(data: ByteArray?): Thumbnail? {
+        return if (data != null) Thumbnail(data) else null
     }
 
 }

From 7dd6652ccac75308f9b5602974b97f9c59b09302 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier@cqse.eu>
Date: Sun, 28 Jan 2018 16:06:11 +0100
Subject: [PATCH 062/102] Finished DAO migration to Room (compiles)

---
 .../features/statistics/ExportTest.kt         |   8 +-
 .../features/arrows/ArrowListFragment.kt      |   8 +-
 .../features/arrows/EditArrowListFragment.kt  |   4 +-
 .../features/arrows/EditArrowViewModel.kt     |   3 +-
 .../mytargets/features/bows/BowAdapter.kt     |   6 +-
 .../features/bows/BowListFragment.kt          |   8 +-
 .../features/bows/EditBowFragment.kt          |   6 +-
 .../features/bows/EditBowListFragment.kt      |  14 +-
 .../features/distance/DistanceGridFragment.kt |  12 +-
 .../features/rounds/EditRoundFragment.kt      |  22 ++--
 .../features/scoreboard/ScoreboardFragment.kt |  43 ++++--
 .../features/scoreboard/ScoreboardUtils.kt    |  15 +--
 .../scoreboard/SignatureDialogFragment.kt     |   8 +-
 .../layout/DefaultScoreboardLayout.kt         |  35 +++--
 .../settings/backup/provider/BackupUtils.kt   |  19 +--
 .../backup/provider/ExternalStorageBackup.kt  |   3 +-
 .../backup/provider/GoogleDriveBackup.kt      |   3 +-
 .../backup/provider/InternalStorageBackup.kt  |   3 +-
 .../features/statistics/ArrowStatistic.kt     |  14 +-
 .../features/statistics/CsvExporter.kt        |  28 ++--
 .../features/statistics/StatisticsActivity.kt |  20 +--
 .../features/statistics/StatisticsFragment.kt |  31 +++--
 .../features/training/RoundFragment.kt        |  20 +--
 .../features/training/details/HtmlUtils.kt    |  12 +-
 .../training/details/TrainingFragment.kt      |  26 ++--
 .../training/edit/EditTrainingFragment.kt     |  17 ++-
 .../features/training/input/InputActivity.kt  |  38 ++++--
 .../training/overview/TrainingsFragment.kt    |  31 +++--
 .../EditStandardRoundFragment.kt              |   8 +-
 .../StandardRoundListFragment.kt              |  13 +-
 .../mytargets/utils/AugmentedRoundUtils.kt    |   4 +-
 .../mytargets/utils/MobileWearableListener.kt |  31 +++--
 .../de/dreier/mytargets/utils/ScoreUtils.kt   |  10 +-
 .../mytargets/utils/backup/MyBackupAgent.kt   |   4 +-
 .../mytargets/views/selector/ArrowSelector.kt |   8 +-
 .../mytargets/views/selector/BowSelector.kt   |   9 +-
 .../views/selector/StandardRoundSelector.kt   |  12 +-
 .../dreier/mytargets/base/db/EndRepository.kt |  29 +++++
 .../mytargets/base/db/RoundRepository.kt      |  49 +++++++
 .../mytargets/base/db/TrainingRepository.kt   |  75 +++++++++++
 .../dreier/mytargets/base/db/dao/ArrowDAO.kt  |  68 +++++-----
 .../de/dreier/mytargets/base/db/dao/BowDAO.kt | 103 +++++++--------
 .../mytargets/base/db/dao/DimensionDAO.kt     |  50 ++-----
 .../de/dreier/mytargets/base/db/dao/EndDAO.kt | 122 ++++++++----------
 .../dreier/mytargets/base/db/dao/ImageDAO.kt  |  32 ++---
 .../dreier/mytargets/base/db/dao/RoundDAO.kt  | 107 ++++++---------
 .../mytargets/base/db/dao/SignatureDAO.kt     |  30 ++---
 .../mytargets/base/db/dao/StandardRoundDAO.kt |  82 +++++-------
 .../mytargets/base/db/dao/TrainingDAO.kt      | 107 +++------------
 .../base/db/migrations/Migration9.kt          |  16 ++-
 .../db/migrations/RoomCreationCallback.kt     |  30 ++++-
 .../de/dreier/mytargets/shared/AppDatabase.kt |  10 +-
 .../dreier/mytargets/shared/models/Target.kt  |   6 +-
 .../mytargets/shared/models/db/Signature.kt   |   7 -
 .../targets/scoringstyle/ColorScoringStyle.kt |   2 +-
 .../typeconverters/DimensionConverter.kt      |   5 +
 56 files changed, 796 insertions(+), 690 deletions(-)
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/EndRepository.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/RoundRepository.kt
 create mode 100644 shared/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt

diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt
index 0e6d12e1a..a005487be 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/ExportTest.kt
@@ -18,7 +18,7 @@ package de.dreier.mytargets.features.statistics
 import android.support.test.InstrumentationRegistry.getInstrumentation
 import android.support.test.filters.SmallTest
 import android.support.test.runner.AndroidJUnit4
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.test.base.InstrumentedTestBase
 import de.dreier.mytargets.test.utils.rules.MiniDbTestRule
 import org.junit.Assert
@@ -38,13 +38,13 @@ class ExportTest : InstrumentedTestBase() {
     @Throws(IOException::class)
     fun testDataExport() {
         val writer = StringWriter()
-        val roundIds = TrainingDAO.loadTrainings()
-                .flatMap { TrainingDAO.loadRounds(it.id) }
+        val roundIds = ApplicationInstance.db.trainingDAO().loadTrainings()
+                .flatMap { ApplicationInstance.db.roundDAO().loadRounds(it.id) }
                 .map { it.id }
                 .sorted()
                 .toMutableList()
         roundIds.removeAt(0)
-        CsvExporter(getInstrumentation().targetContext)
+        CsvExporter(getInstrumentation().targetContext, ApplicationInstance.db)
                 .writeExportData(writer, roundIds)
         Assert.assertEquals(EXPECTED, writer.toString())
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
index 8e571c2e4..d915d35c5 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
@@ -16,7 +16,7 @@
 package de.dreier.mytargets.features.arrows
 
 import android.os.Bundle
-import de.dreier.mytargets.base.db.dao.ArrowDAO
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.base.fragments.SelectPureListItemFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
@@ -24,10 +24,12 @@ import de.dreier.mytargets.shared.models.db.Arrow
 
 class ArrowListFragment : SelectPureListItemFragmentBase<Arrow>(compareBy(Arrow::name, Arrow::id)) {
 
+    private val arrowDAO = ApplicationInstance.db.arrowDAO()
+
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        val arrows = ArrowDAO.loadArrows()
+        val arrows = arrowDAO.loadArrows().toMutableList()
         return {
-            adapter!!.setList(arrows.toMutableList())
+            adapter!!.setList(arrows)
             val arrow = arguments!!.getParcelable<Arrow>(ITEM)
             selectItem(binding.recyclerView, arrow!!)
         }
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
index 755128112..c7eaa9472 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
@@ -22,8 +22,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
-import de.dreier.mytargets.base.db.dao.ArrowDAO
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase
 import de.dreier.mytargets.base.fragments.ItemActionModeCallback
 import de.dreier.mytargets.base.fragments.LoaderUICallback
@@ -37,7 +37,7 @@ import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 class EditArrowListFragment : EditableListFragmentBase<Arrow, SimpleListAdapterBase<Arrow>>() {
 
     private lateinit var binding: FragmentArrowsBinding
-    private val arrowDAO = ArrowDAO
+    private val arrowDAO = ApplicationInstance.db.arrowDAO()
 
     init {
         itemTypeDelRes = R.plurals.arrow_deleted
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
index 6294b5466..1996eeabe 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
@@ -26,7 +26,6 @@ import android.databinding.ObservableInt
 import android.text.TextUtils
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
-import de.dreier.mytargets.base.db.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Dimension.Unit.MILLIMETER
 import de.dreier.mytargets.shared.models.Thumbnail
@@ -56,7 +55,7 @@ class EditArrowViewModel(app: ApplicationInstance) : AndroidViewModel(app) {
     var showAll = ObservableBoolean(false)
     var diameterErrorText = ObservableField<String>("")
 
-    private val arrowDAO = ArrowDAO
+    private val arrowDAO = ApplicationInstance.db.arrowDAO()
 
     init {
         arrow = Transformations.map(arrowId) { id ->
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
index e621c5b5d..e72536c96 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
@@ -20,8 +20,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
-import de.dreier.mytargets.base.db.dao.BowDAO
 import de.dreier.mytargets.databinding.ItemImageDetailsBinding
 import de.dreier.mytargets.features.training.details.HtmlInfoBuilder
 import de.dreier.mytargets.shared.models.db.Bow
@@ -37,6 +37,8 @@ internal class BowAdapter(
         private val longClickListener: OnItemLongClickListener<Bow>
 ) : SimpleListAdapterBase<Bow>(compareBy(Bow::name, Bow::id)) {
 
+    val bowDAO = ApplicationInstance.db.bowDAO()
+
     public override fun onCreateViewHolder(parent: ViewGroup): ViewHolder {
         val itemView = LayoutInflater.from(parent.context)
                 .inflate(R.layout.item_image_details, parent, false)
@@ -60,7 +62,7 @@ internal class BowAdapter(
             if (!item.size!!.trim { it <= ' ' }.isEmpty()) {
                 info.addLine(R.string.size, item.size!!)
             }
-            val sightMarks = BowDAO.loadSightMarks(item.id).sortedBy { it.distance }
+            val sightMarks = bowDAO.loadSightMarks(item.id).sortedBy { it.distance }
             for ((_, _, distance, value) in sightMarks) {
                 info.addLine(distance.toString(), value!!)
             }
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
index 5d9c4d0a7..f63c78e03 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
@@ -16,7 +16,7 @@
 package de.dreier.mytargets.features.bows
 
 import android.os.Bundle
-import de.dreier.mytargets.base.db.dao.BowDAO
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.base.fragments.SelectPureListItemFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
@@ -24,10 +24,12 @@ import de.dreier.mytargets.shared.models.db.Bow
 
 class BowListFragment : SelectPureListItemFragmentBase<Bow>(compareBy(Bow::name, Bow::id)) {
 
+    private val bowDAO = ApplicationInstance.db.bowDAO()
+
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        val bows = BowDAO.loadBows()
+        val bows = bowDAO.loadBows().toMutableList()
         return {
-            adapter!!.setList(bows.toMutableList())
+            adapter!!.setList(bows)
             val bow = arguments!!.getParcelable<Bow>(ITEM)
             selectItem(binding.recyclerView, bow!!)
         }
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
index c4996e4c4..f244190ac 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
@@ -27,9 +27,9 @@ import android.view.View
 import android.view.ViewGroup
 import com.evernote.android.state.State
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.adapters.dynamicitem.DynamicItemAdapter
 import de.dreier.mytargets.base.adapters.dynamicitem.DynamicItemHolder
-import de.dreier.mytargets.base.db.dao.BowDAO
 import de.dreier.mytargets.base.fragments.EditWithImageFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.INTENT
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
@@ -55,7 +55,7 @@ class EditBowFragment : EditWithImageFragmentBase<BowImage>(R.drawable.recurve_b
     private lateinit var contentBinding: FragmentEditBowBinding
     private lateinit var adapter: SightMarksAdapter
 
-    private val bowDAO = BowDAO
+    private val bowDAO = ApplicationInstance.db.bowDAO()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val rootView = super.onCreateView(inflater, container, savedInstanceState)
@@ -72,7 +72,7 @@ class EditBowFragment : EditWithImageFragmentBase<BowImage>(R.drawable.recurve_b
             if (bundle != null && bundle.containsKey(BOW_ID)) {
                 // Load data from database
                 bow = bowDAO.loadBow(bundle.getLong(BOW_ID))
-                sightMarks = bowDAO.loadSightMarks(bow.id).sortedBy { it.distance }
+                sightMarks = ArrayList(bowDAO.loadSightMarks(bow.id).sortedBy { it.distance })
                 imageFiles = bowDAO.loadBowImages(bow.id)
             } else {
                 // Set to default values
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
index e00ffc5dd..ef862f29e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
@@ -23,8 +23,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
-import de.dreier.mytargets.base.db.dao.BowDAO
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase
 import de.dreier.mytargets.base.fragments.ItemActionModeCallback
 import de.dreier.mytargets.base.fragments.LoaderUICallback
@@ -39,6 +39,8 @@ class EditBowListFragment : EditableListFragmentBase<Bow, SimpleListAdapterBase<
 
     private lateinit var binding: FragmentBowsBinding
 
+    private val bowDAO = ApplicationInstance.db.bowDAO()
+
     init {
         itemTypeDelRes = R.plurals.bow_deleted
         actionModeCallback = ItemActionModeCallback(this, selector,
@@ -76,7 +78,7 @@ class EditBowListFragment : EditableListFragmentBase<Bow, SimpleListAdapterBase<
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        val bows = BowDAO.loadBows()
+        val bows = bowDAO.loadBows()
         return {
             adapter!!.setList(bows.toMutableList())
             binding.emptyState!!.root.visibility = if (bows.isEmpty()) View.VISIBLE else View.GONE
@@ -92,11 +94,11 @@ class EditBowListFragment : EditableListFragmentBase<Bow, SimpleListAdapterBase<
     }
 
     override fun deleteItem(item: Bow): () -> Bow {
-        val images = BowDAO.loadBowImages(item.id)
-        val sightMarks = BowDAO.loadSightMarks(item.id)
-        BowDAO.deleteBow(item)
+        val images = bowDAO.loadBowImages(item.id)
+        val sightMarks = bowDAO.loadSightMarks(item.id)
+        bowDAO.deleteBow(item)
         return {
-            BowDAO.saveBow(item, images, sightMarks)
+            bowDAO.saveBow(item, images, sightMarks)
             item
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
index e936cbe20..6e68a1fbc 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
@@ -22,8 +22,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
-import de.dreier.mytargets.base.db.dao.DimensionDAO
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.base.fragments.SelectItemFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
@@ -33,13 +33,14 @@ import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Dimension.Unit
 import de.dreier.mytargets.utils.SlideInItemAnimator
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
-import java.util.HashSet
 
 class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapterBase<Dimension>>(), DistanceInputDialog.OnClickListener {
     private lateinit var binding: FragmentListBinding
     private var distance: Dimension? = null
     private var unit: Unit? = null
 
+    private val dimensionDAO = ApplicationInstance.db.dimensionDAO()
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_list, container, false)
         binding.recyclerView.setHasFixedSize(true)
@@ -73,16 +74,13 @@ class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapter
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        val distancesDb = DimensionDAO.getAll(unit!!)
-        val distances = HashSet<Dimension>()
-
-        distances.add(Dimension.UNKNOWN)
+        val distances = mutableSetOf(Dimension.UNKNOWN)
 
         // Add currently selected distance to list
         if (this.distance!!.unit == unit) {
             distances.add(this.distance!!)
         }
-        distances.addAll(distancesDb)
+        distances.addAll(dimensionDAO.getAll(unit!!))
         return {
             adapter!!.setList(distances.toMutableList())
             selectItem(binding.recyclerView, distance!!)
diff --git a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
index a5e620bc4..f82b8d1ba 100644
--- a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
@@ -21,8 +21,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.db.dao.RoundDAO
-import de.dreier.mytargets.base.db.dao.TrainingDAO
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.fragments.EditFragmentBase
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase.Companion.ITEM_ID
 import de.dreier.mytargets.databinding.FragmentEditRoundBinding
@@ -40,6 +39,9 @@ class EditRoundFragment : EditFragmentBase() {
     private var roundId: Long? = null
     private lateinit var binding: FragmentEditRoundBinding
 
+    private val trainingDAO = ApplicationInstance.db.trainingDAO()
+    private val roundDAO = ApplicationInstance.db.roundDAO()
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         binding = DataBindingUtil
                 .inflate(inflater, R.layout.fragment_edit_round, container, false)
@@ -77,11 +79,11 @@ class EditRoundFragment : EditFragmentBase() {
             loadRoundDefaultValues()
         } else {
             ToolbarUtils.setTitle(this, R.string.edit_round)
-            val round = RoundDAO.loadRound(roundId!!)
+            val round = roundDAO.loadRound(roundId!!)
             binding.distance.setItem(round.distance)
             binding.target.setItem(round.target)
             binding.notEditable.visibility = View.GONE
-            if (TrainingDAO.loadTraining(round.trainingId!!).standardRoundId != null) {
+            if (trainingDAO.loadTraining(round.trainingId!!).standardRoundId != null) {
                 binding.distanceLayout.visibility = View.GONE
             }
         }
@@ -108,7 +110,7 @@ class EditRoundFragment : EditFragmentBase() {
     }
 
     private fun onSaveRound(): Round? {
-        val training = TrainingDAO.loadTraining(trainingId)
+        val training = trainingDAO.loadTraining(trainingId)
 
         val round: Round
         if (roundId == null) {
@@ -116,13 +118,17 @@ class EditRoundFragment : EditFragmentBase() {
             round.trainingId = trainingId
             round.shotsPerEnd = binding.arrows.progress
             round.maxEndCount = null
-            round.index = TrainingDAO.loadRounds(training.id).size
+            round.index = roundDAO.loadRounds(training.id).size
         } else {
-            round = RoundDAO.loadRound(roundId!!)
+            round = roundDAO.loadRound(roundId!!)
         }
         round.distance = binding.distance.selectedItem!!
         round.target = binding.target.selectedItem!!
-        RoundDAO.saveRound(round)
+        if (roundId == null) {
+            round.id = roundDAO.insertRound(round)
+        } else {
+            roundDAO.updateRound(round)
+        }
         return round
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
index fe9b94411..66b489ee1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
@@ -37,7 +37,10 @@ import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.LinearLayout
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.db.dao.TrainingDAO
+import de.dreier.mytargets.app.ApplicationInstance
+import de.dreier.mytargets.base.db.EndRepository
+import de.dreier.mytargets.base.db.RoundRepository
+import de.dreier.mytargets.base.db.TrainingRepository
 import de.dreier.mytargets.base.fragments.FragmentBase
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.databinding.FragmentScoreboardBinding
@@ -45,6 +48,7 @@ import de.dreier.mytargets.databinding.PartialScoreboardSignaturesBinding
 import de.dreier.mytargets.features.settings.ESettingsScreens
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.db.End
+import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Signature
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.utils.toUri
@@ -64,6 +68,15 @@ class ScoreboardFragment : FragmentBase() {
     private var roundId: Long = 0
     private var binding: FragmentScoreboardBinding? = null
     private var training: Training? = null
+    private lateinit var rounds: List<Round>
+
+    private val database = ApplicationInstance.db
+    private val trainingDAO = database.trainingDAO()
+    private val roundDAO = database.roundDAO()
+    private val endDAO = database.endDAO()
+    private val endRepository = EndRepository(endDAO)
+    private val roundRepository = RoundRepository(database, roundDAO, endDAO, endRepository)
+    private val trainingRepository = TrainingRepository(database, trainingDAO, roundDAO,roundRepository, database.signatureDAO())
 
     private val updateReceiver = object : MobileWearableClient.EndUpdateReceiver() {
 
@@ -98,13 +111,18 @@ class ScoreboardFragment : FragmentBase() {
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        training = TrainingDAO.loadTraining(trainingId)
-        val archerSignature = TrainingDAO.getOrCreateArcherSignature(training!!)
-        val witnessSignature = TrainingDAO.getOrCreateWitnessSignature(training!!)
-
+        training = trainingDAO.loadTraining(trainingId)
+        val archerSignature = trainingRepository.getOrCreateArcherSignature(training!!)
+        val witnessSignature = trainingRepository.getOrCreateWitnessSignature(training!!)
+
+        rounds = if (roundId == -1L) {
+            roundDAO.loadRounds(training!!.id)
+        } else {
+            listOf(roundDAO.loadRound(roundId))
+        }
         val scoreboard = ScoreboardUtils
-                .getScoreboardView(context!!, Utils.getCurrentLocale(context!!),
-                        training!!, roundId, SettingsManager.scoreboardConfiguration)
+                .getScoreboardView(context!!, ApplicationInstance.db,
+                        Utils.getCurrentLocale(context!!), training!!, rounds, SettingsManager.scoreboardConfiguration)
         return {
             binding!!.progressBar.visibility = GONE
             scoreboard.layoutParams = LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)
@@ -186,9 +204,8 @@ class ScoreboardFragment : FragmentBase() {
                 try {
                     val scoreboardFile = File(context!!.cacheDir, getDefaultFileName(fileType))
                     val content = ScoreboardUtils
-                            .getScoreboardView(context!!, Utils
-                                    .getCurrentLocale(context!!), training!!, roundId, SettingsManager
-                                    .scoreboardConfiguration)
+                            .getScoreboardView(context!!, ApplicationInstance.db,
+                                    Utils.getCurrentLocale(context!!), training!!, rounds, SettingsManager.scoreboardConfiguration)
                     if (fileType === EFileType.PDF && Utils.isKitKat) {
                         ScoreboardUtils.generatePdf(content, scoreboardFile)
                     } else {
@@ -224,9 +241,9 @@ class ScoreboardFragment : FragmentBase() {
     private fun print() {
         val fileName = getDefaultFileName(EFileType.PDF)
 
-        val content = ScoreboardUtils.getScoreboardView(context!!, Utils
-                .getCurrentLocale(context!!), training!!, roundId, SettingsManager
-                .scoreboardConfiguration)
+        val content = ScoreboardUtils.getScoreboardView(context!!, ApplicationInstance.db, Utils
+                .getCurrentLocale(context!!), training!!, rounds, SettingsManager
+        .scoreboardConfiguration)
 
         val jobName = getString(R.string.scoreboard) + " Document"
         val pda = CustomPrintDocumentAdapter(ViewToPdfWriter(content), fileName)
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
index d18977698..9dec7a90b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
@@ -25,10 +25,9 @@ import android.print.PageRange
 import android.support.annotation.RequiresApi
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.LinearLayout
-import de.dreier.mytargets.base.db.dao.RoundDAO
-import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.features.scoreboard.builder.ViewBuilder
 import de.dreier.mytargets.features.scoreboard.layout.DefaultScoreboardLayout
+import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.utils.print.CustomPrintDocumentAdapter
@@ -44,14 +43,10 @@ object ScoreboardUtils {
     private const val PAGE_WIDTH = 600
     private const val MARGIN = 50
 
-    fun getScoreboardView(context: Context, locale: Locale, training: Training, roundId: Long, configuration: ScoreboardConfiguration): LinearLayout {
-        val rounds: List<Round>? = if (roundId == -1L) {
-            TrainingDAO.loadRounds(training.id)
-        } else {
-            listOf(RoundDAO.loadRound(roundId))
-        }
-
-        val scoreboardLayout = DefaultScoreboardLayout(context, locale, configuration)
+    fun getScoreboardView(context: Context, database: AppDatabase, locale: Locale,
+                          training: Training, rounds: List<Round>?,
+                          configuration: ScoreboardConfiguration): LinearLayout {
+        val scoreboardLayout = DefaultScoreboardLayout(context, database, locale, configuration)
         val viewBuilder = ViewBuilder(context)
         scoreboardLayout.generateWithBuilder(viewBuilder, training, rounds!!)
         return viewBuilder.build()
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
index d14fe2ea0..655a028ca 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
@@ -25,12 +25,14 @@ import android.view.View
 import android.view.ViewGroup
 import com.afollestad.materialdialogs.MaterialDialog
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.db.dao.SignatureDAO
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.databinding.FragmentSignatureBinding
 import de.dreier.mytargets.shared.models.db.Signature
 
 class SignatureDialogFragment : DialogFragment() {
 
+    private val signatureDAO = ApplicationInstance.db.signatureDAO()
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val binding = FragmentSignatureBinding.inflate(inflater, container, false)
         val args = arguments
@@ -46,7 +48,7 @@ class SignatureDialogFragment : DialogFragment() {
                     .inputType(InputType.TYPE_CLASS_TEXT)
                     .input(defaultName, signature.name) { _, input ->
                         signature.name = input.toString()
-                        SignatureDAO.saveSignature(signature)
+                        signatureDAO.saveSignature(signature)
                         binding.signer.text = signature.name
                     }
                     .negativeText(android.R.string.cancel)
@@ -59,7 +61,7 @@ class SignatureDialogFragment : DialogFragment() {
                 bitmap = binding.signatureView.transparentSignatureBitmap
             }
             signature.bitmap = bitmap
-            SignatureDAO.saveSignature(signature)
+            signatureDAO.saveSignature(signature)
             dismiss()
         }
         binding.clear.setOnClickListener { binding.signatureView.clear() }
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
index cc309a3a3..6cd12a31f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
@@ -18,12 +18,15 @@ package de.dreier.mytargets.features.scoreboard.layout
 import android.content.Context
 import android.text.TextUtils
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.db.dao.*
+import de.dreier.mytargets.base.db.EndRepository
+import de.dreier.mytargets.base.db.RoundRepository
+import de.dreier.mytargets.base.db.TrainingRepository
 import de.dreier.mytargets.features.scoreboard.ScoreboardBuilder
 import de.dreier.mytargets.features.scoreboard.ScoreboardConfiguration
 import de.dreier.mytargets.features.scoreboard.builder.model.Table
 import de.dreier.mytargets.features.scoreboard.builder.model.TextCell
 import de.dreier.mytargets.features.settings.SettingsManager
+import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.SelectableZone
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.db.Round
@@ -33,9 +36,19 @@ import de.dreier.mytargets.shared.targets.scoringstyle.ScoringStyle
 import de.dreier.mytargets.utils.ScoreUtils
 import java.util.*
 
-class DefaultScoreboardLayout(private val context: Context, private val locale: Locale, private val configuration: ScoreboardConfiguration) {
+class DefaultScoreboardLayout(private val context: Context, database: AppDatabase, private val locale: Locale, private val configuration: ScoreboardConfiguration) {
     private lateinit var builder: ScoreboardBuilder
 
+    private val trainingDAO = database.trainingDAO()
+    private val roundDAO = database.roundDAO()
+    private val endDAO = database.endDAO()
+    private val bowDAO = database.bowDAO()
+    private val arrowDAO = database.arrowDAO()
+    private val standardRoundDAO = database.standardRoundDAO()
+    private val endRepository = EndRepository(endDAO)
+    private val roundRepository = RoundRepository(database, roundDAO, endDAO, endRepository)
+    private val trainingRepository = TrainingRepository(database, trainingDAO, roundDAO,roundRepository, database.signatureDAO())
+
     fun generateWithBuilder(builder: ScoreboardBuilder, training: Training, rounds: List<Round>) {
         this.builder = builder
 
@@ -84,7 +97,7 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
     private fun addStaticTrainingHeaderInfo(info: InfoTableBuilder, training: Training, rounds: List<Round>) {
         getScoreboardOnlyHeaderInfo(info, training, rounds)
 
-        if (training.indoor) {
+        if (training.environment.indoor) {
             info.addLine(R.string.environment, context.getString(R.string.indoor))
         } else {
             info.addLine(R.string.weather, training.environment.weather.getName())
@@ -96,18 +109,18 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
         }
 
         if (training.bowId != null) {
-            val bow = BowDAO.loadBow(training.bowId!!)
+            val bow = bowDAO.loadBow(training.bowId!!)
             info.addLine(R.string.bow, bow.name)
             info.addLine(R.string.bow_type, bow.type!!)
         }
 
         if (training.arrowId != null) {
-            val arrow = ArrowDAO.loadArrow(training.arrowId!!)
+            val arrow = arrowDAO.loadArrow(training.arrowId!!)
             info.addLine(R.string.arrow, arrow.name)
         }
 
         if (training.standardRoundId != null) {
-            val standardRound = StandardRoundDAO.loadStandardRound(training.standardRoundId!!)
+            val standardRound = standardRoundDAO.loadStandardRound(training.standardRoundId!!)
             info.addLine(R.string.standard_round, standardRound.name)
         }
         if (!training.comment.isEmpty() && configuration.showComments) {
@@ -172,7 +185,7 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
     }
 
     private fun getStatisticsForRound(rounds: List<Round>): Table {
-        val scoreDistribution = ScoreUtils.getSortedScoreDistribution(rounds)
+        val scoreDistribution = ScoreUtils.getSortedScoreDistribution(roundDAO, endDAO, rounds)
         var hits = 0
         var total = 0
         for ((key, value) in scoreDistribution) {
@@ -219,11 +232,11 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
         val table = Table(false)
         appendTableHeader(table, round.shotsPerEnd)
         var carry = 0
-        for (end in RoundDAO.loadEnds(round.id)) {
+        for (end in roundDAO.loadEnds(round.id)) {
             val row = table.startRow()
             row.addCell(end.index + 1)
             var sum = 0
-            val shots = ArrayList(EndDAO.loadShots(end.id))
+            val shots = ArrayList(endDAO.loadShots(end.id))
             if (SettingsManager.shouldSortTarget(round.target)) {
                 shots.sort()
             }
@@ -277,7 +290,7 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
 
         var commentsCount = 0
         for (round in rounds) {
-            val ends = RoundDAO.loadEnds(round.id)
+            val ends = roundDAO.loadEnds(round.id)
             for ((_, index, _, _, _, comment) in ends) {
                 if (!TextUtils.isEmpty(comment)) {
                     comments.startRow()
@@ -320,6 +333,6 @@ class DefaultScoreboardLayout(private val context: Context, private val locale:
     }
 
     private fun appendSignature(training: Training) {
-        builder.signature(TrainingDAO.getOrCreateArcherSignature(training), TrainingDAO.getOrCreateWitnessSignature(training))
+        builder.signature(trainingRepository.getOrCreateArcherSignature(training), trainingRepository.getOrCreateWitnessSignature(training))
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt
index 06b43b6cf..06351b7a9 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt
@@ -16,7 +16,6 @@
 package de.dreier.mytargets.features.settings.backup.provider
 
 import android.content.Context
-import de.dreier.mytargets.base.db.dao.ImageDAO
 import de.dreier.mytargets.shared.AppDatabase
 import java.io.*
 import java.text.SimpleDateFormat
@@ -43,19 +42,23 @@ object BackupUtils {
     }
 
     @Throws(IOException::class)
-    fun zip(context: Context, dest: OutputStream) {
+    fun zip(context: Context, database: AppDatabase, dest: OutputStream) {
+        val imageFiles = database.imageDAO().loadAllFileNames().map { File(context.filesDir, it) }
+        zip(context, dest, imageFiles)
+    }
+
+    @Throws(IOException::class)
+    private fun zip(context: Context, dest: OutputStream, imageFiles: List<File>) {
         ZipOutputStream(BufferedOutputStream(dest)).use { out ->
             val db = context.getDatabasePath(AppDatabase.DATABASE_FILE_NAME)
 
-            var entry = ZipEntry("/data.db")
-            out.putNextEntry(entry)
+            out.putNextEntry(ZipEntry("/data.db"))
             FileInputStream(db).use { it.copyTo(out) }
 
-            for (file in ImageDAO.loadAllFileNames()) {
+            for (file in imageFiles) {
                 try {
-                    entry = ZipEntry("/" + file)
-                    out.putNextEntry(entry)
-                    FileInputStream(File(context.filesDir, file)).use {
+                    out.putNextEntry(ZipEntry("/" + file.name))
+                    FileInputStream(file).use {
                         it.copyTo(out)
                     }
                 } catch (e: FileNotFoundException) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/ExternalStorageBackup.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/ExternalStorageBackup.kt
index b929989b0..24d645f20 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/ExternalStorageBackup.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/ExternalStorageBackup.kt
@@ -18,6 +18,7 @@ package de.dreier.mytargets.features.settings.backup.provider
 import android.app.Activity
 import android.content.Context
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.features.settings.backup.BackupEntry
 import de.dreier.mytargets.features.settings.backup.BackupException
 import de.dreier.mytargets.shared.SharedApplicationInstance.Companion
@@ -124,7 +125,7 @@ object ExternalStorageBackup {
                 val backupDir = File(microSdCardPath, FOLDER_NAME)
                 createDirectory(backupDir)
                 val zipFile = File(backupDir, BackupUtils.backupName)
-                BackupUtils.zip(context, FileOutputStream(zipFile))
+                BackupUtils.zip(context, ApplicationInstance.db, FileOutputStream(zipFile))
             } catch (e: IOException) {
                 throw BackupException(e.localizedMessage, e)
             }
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt
index 3d7a4db78..07f2fd94b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt
@@ -24,6 +24,7 @@ import com.google.android.gms.common.api.GoogleApiClient
 import com.google.android.gms.common.api.ResultCallback
 import com.google.android.gms.drive.*
 import com.google.android.gms.drive.query.*
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.features.settings.backup.BackupEntry
 import de.dreier.mytargets.features.settings.backup.BackupException
 import timber.log.Timber
@@ -178,7 +179,7 @@ object GoogleDriveBackup {
             val outputStream = driveContents.outputStream
 
             try {
-                BackupUtils.zip(context, outputStream)
+                BackupUtils.zip(context, ApplicationInstance.db, outputStream)
             } catch (e: IOException) {
                 throw BackupException(e.localizedMessage, e)
             }
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/InternalStorageBackup.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/InternalStorageBackup.kt
index 5321fa40d..5a6cffff9 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/InternalStorageBackup.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/InternalStorageBackup.kt
@@ -19,6 +19,7 @@ import android.app.Activity
 import android.content.Context
 import android.os.Environment
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.features.settings.backup.BackupEntry
 import de.dreier.mytargets.features.settings.backup.BackupException
 import de.dreier.mytargets.shared.SharedApplicationInstance.Companion
@@ -103,7 +104,7 @@ object InternalStorageBackup {
                         FOLDER_NAME)
                 createDirectory(backupDir)
                 val zipFile = File(backupDir, BackupUtils.backupName)
-                BackupUtils.zip(context, FileOutputStream(zipFile))
+                BackupUtils.zip(context, ApplicationInstance.db, FileOutputStream(zipFile))
             } catch (e: IOException) {
                 throw BackupException(e.localizedMessage, e)
             }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
index 1b562c41f..e377e59e5 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
@@ -18,10 +18,7 @@ package de.dreier.mytargets.features.statistics
 import android.annotation.SuppressLint
 import android.os.Parcelable
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.db.dao.ArrowDAO
-import de.dreier.mytargets.base.db.dao.EndDAO
-import de.dreier.mytargets.base.db.dao.RoundDAO
-import de.dreier.mytargets.base.db.dao.TrainingDAO
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.shared.SharedApplicationInstance
 import de.dreier.mytargets.shared.analysis.aggregation.average.Average
 import de.dreier.mytargets.shared.models.Dimension
@@ -72,13 +69,14 @@ data class ArrowStatistic(
         private val TEXT_COLORS = intArrayOf(-0x1, -0x1, -0xfffffe, -0xfffffe, -0xfffffe, -0xfffffe, -0xfffffe, -0xfffffe)
 
         fun getAll(target: Target, rounds: List<Round>): List<ArrowStatistic> {
+            val db = ApplicationInstance.db
             return rounds
-                    .groupBy { r -> TrainingDAO.loadTraining(r.trainingId!!).arrowId ?: 0 }
+                    .groupBy { r -> db.trainingDAO().loadTraining(r.trainingId!!).arrowId ?: 0 }
                     .flatMap { t ->
-                        val arrow = ArrowDAO.loadArrowOrNull(t.key)
+                        val arrow = db.arrowDAO().loadArrowOrNull(t.key)
                         val name = arrow?.name ?: SharedApplicationInstance.getStr(R.string.unknown)
-                        t.value.flatMap { RoundDAO.loadEnds(it.id) }
-                                .flatMap { EndDAO.loadShots(it.id) }
+                        t.value.flatMap { db.roundDAO().loadEnds(it.id) }
+                                .flatMap { db.endDAO().loadShots(it.id) }
                                 .filter { it.arrowNumber != null }
                                 .groupBy {it.arrowNumber!! }
                                 .filter { it.value.size > 1 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
index 301b821d9..3ed0f9e79 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
@@ -17,7 +17,7 @@ package de.dreier.mytargets.features.statistics
 
 import android.content.Context
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.db.dao.*
+import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import org.threeten.bp.format.DateTimeFormatter
@@ -27,7 +27,14 @@ import java.io.IOException
 import java.io.Writer
 import java.util.*
 
-class CsvExporter(private val context: Context) {
+class CsvExporter(private val context: Context, database: AppDatabase) {
+
+    private val trainingDAO = database.trainingDAO()
+    private val roundDAO = database.roundDAO()
+    private val endDAO = database.endDAO()
+    private val bowDAO = database.bowDAO()
+    private val arrowDAO = database.arrowDAO()
+    private val standardRoundDAO = database.standardRoundDAO()
 
     @Throws(IOException::class)
     fun exportAll(file: File, roundIds: List<Long>) {
@@ -55,7 +62,7 @@ class CsvExporter(private val context: Context) {
         csv.add("y")
         csv.newLine()
         csv.exitScope()
-        for (t in TrainingDAO.loadTrainings()) {
+        for (t in trainingDAO.loadTrainings()) {
             addTraining(csv, t, roundIds)
         }
 
@@ -71,14 +78,15 @@ class CsvExporter(private val context: Context) {
         // Date
         csv.add(t.date.format(DateTimeFormatter.ISO_LOCAL_DATE))
         // StandardRound
-        csv.add(StandardRoundDAO.loadStandardRoundOrNull(t.standardRoundId!!)?.name ?: context.getString(R.string.practice))
+        csv.add(standardRoundDAO.loadStandardRoundOrNull(t.standardRoundId!!)?.name
+                ?: context.getString(R.string.practice))
         // Indoor
-        csv.add(if (t.indoor) context.getString(R.string.indoor) else context.getString(R.string.outdoor))
+        csv.add(if (t.environment.indoor) context.getString(R.string.indoor) else context.getString(R.string.outdoor))
         // Bow
-        csv.add(if (t.bowId == null) "" else BowDAO.loadBow(t.bowId!!).name)
+        csv.add(if (t.bowId == null) "" else bowDAO.loadBow(t.bowId!!).name)
         // Arrow
-        csv.add(if (t.arrowId == null) "" else ArrowDAO.loadArrow(t.arrowId!!).name)
-        TrainingDAO.loadRounds(t.id)
+        csv.add(if (t.arrowId == null) "" else arrowDAO.loadArrow(t.arrowId!!).name)
+        roundDAO.loadRounds(t.id)
                 .filter { roundIds.contains(it.id) }
                 .forEach { addRound(csv, it) }
         csv.exitScope()
@@ -94,13 +102,13 @@ class CsvExporter(private val context: Context) {
         // Target
         val target = r.target
         csv.add("${target.model} (${target.diameter})")
-        for (e in RoundDAO.loadEnds(r.id)) {
+        for (e in roundDAO.loadEnds(r.id)) {
             csv.enterScope()
             // End
             csv.add((e.index + 1).toString())
             // Timestamp
             csv.add(e.saveTime!!.format(DateTimeFormatter.ISO_LOCAL_TIME))
-            for ((_, index, _, x, y, scoringRing) in EndDAO.loadShots(e.id)) {
+            for ((_, index, _, x, y, scoringRing) in endDAO.loadShots(e.id)) {
                 csv.enterScope()
                 // Score
                 csv.add(target.zoneToString(scoringRing, index))
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
index 9e1388c70..bcdbffad6 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
@@ -35,11 +35,8 @@ import com.afollestad.materialdialogs.MaterialDialog
 import com.evernote.android.state.State
 import com.evernote.android.state.StateSaver
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.activities.ChildActivityBase
-import de.dreier.mytargets.base.db.dao.ArrowDAO
-import de.dreier.mytargets.base.db.dao.BowDAO
-import de.dreier.mytargets.base.db.dao.RoundDAO
-import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.databinding.ActivityStatisticsBinding
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.db.Round
@@ -70,6 +67,11 @@ class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<Li
     @State
     var bowTags: HashSet<Long?>? = null
 
+    private val trainingDAO = ApplicationInstance.db.trainingDAO()
+    private val roundDAO = ApplicationInstance.db.roundDAO()
+    private val bowDAO = ApplicationInstance.db.bowDAO()
+    private val arrowDAO = ApplicationInstance.db.arrowDAO()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = DataBindingUtil.setContentView(this, R.layout.activity_statistics)
@@ -89,10 +91,10 @@ class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<Li
         val roundIds = intent.getLongArrayExtra(ROUND_IDS)
         return object : AsyncTaskLoader<List<Pair<Training, Round>>>(this) {
             override fun loadInBackground(): List<Pair<Training, Round>> {
-                val rounds = RoundDAO.loadRounds(roundIds)
+                val rounds = roundDAO.loadRounds(roundIds)
                 val trainingsMap = rounds.map { (_, trainingId) -> trainingId!! }
                         .distinct()
-                        .map { id -> Pair(id, TrainingDAO.loadTraining(id)) }
+                        .map { id -> Pair(id, trainingDAO.loadTraining(id)) }
                         .toSparseArray()
                 return rounds.map { round -> Pair(trainingsMap.get(round.trainingId!!), round) }
             }
@@ -207,7 +209,7 @@ class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<Li
                 .distinct()
                 .map { bid ->
                     if (bid != null) {
-                        val bow = BowDAO.loadBowOrNull(bid) ?: return@map Tag(bid, "Deleted " + bid)
+                        val bow = bowDAO.loadBowOrNull(bid) ?: return@map Tag(bid, "Deleted " + bid)
                         Tag(bow.id, bow.name, bow.thumbnail, true)
                     } else {
                         Tag(null, getString(R.string.unknown))
@@ -221,7 +223,7 @@ class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<Li
                 .distinct()
                 .map { aid ->
                     if (aid != null) {
-                        val arrow = ArrowDAO.loadArrowOrNull(aid) ?: return@map Tag(aid, "Deleted " + aid)
+                        val arrow = arrowDAO.loadArrowOrNull(aid) ?: return@map Tag(aid, "Deleted " + aid)
                         Tag(arrow.id, arrow.name, arrow.thumbnail, true)
                     } else {
                         Tag(null, getString(R.string.unknown))
@@ -260,7 +262,7 @@ class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<Li
             override fun doInBackground(vararg params: Void): Uri? {
                 return try {
                     val f = File(cacheDir, exportFileName)
-                    CsvExporter(applicationContext)
+                    CsvExporter(applicationContext, ApplicationInstance.db)
                             .exportAll(f, filteredRounds!!.flatMap { it.second }.map { it.id })
                     f.toUri(this@StatisticsActivity)
                 } catch (e: IOException) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
index 5d64b0eb0..8f482e3db 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
@@ -34,9 +34,7 @@ import com.github.mikephil.charting.listener.OnChartValueSelectedListener
 import com.github.mikephil.charting.renderer.LineChartRenderer
 import com.github.mikephil.charting.utils.ColorTemplate
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.db.dao.EndDAO
-import de.dreier.mytargets.base.db.dao.RoundDAO
-import de.dreier.mytargets.base.db.dao.TrainingDAO
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.fragments.FragmentBase
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.databinding.FragmentStatisticsBinding
@@ -66,6 +64,11 @@ class StatisticsFragment : FragmentBase() {
     private var target: Target? = null
     private var animate: Boolean = false
 
+    private val database = ApplicationInstance.db
+    private val trainingDAO = database.trainingDAO()
+    private val roundDAO = database.roundDAO()
+    private val endDAO = database.endDAO()
+
     private val updateReceiver = object : MobileWearableClient.EndUpdateReceiver() {
 
         override fun onUpdate(trainingId: Long, roundId: Long, end: End) {
@@ -78,8 +81,8 @@ class StatisticsFragment : FragmentBase() {
     private val hitMissText: String
         get() {
             val shots = rounds!!
-                    .flatMap { r -> RoundDAO.loadEnds(r.id) }
-                    .flatMap { EndDAO.loadShots(it.id) }
+                    .flatMap { r -> roundDAO.loadEnds(r.id) }
+                    .flatMap { endDAO.loadShots(it.id) }
                     .filter { (_, _, _, _, _, scoringRing) -> scoringRing != Shot.NOTHING_SELECTED }
             val missCount = shots.filter { (_, _, _, _, _, scoringRing) -> scoringRing == Shot.MISS }.count().toLong()
             val hitCount = shots.size - missCount
@@ -117,14 +120,14 @@ class StatisticsFragment : FragmentBase() {
         val trainingsMap = rounds!!
                 .map { it.trainingId!! }
                 .distinct()
-                .map { TrainingDAO.loadTraining(it) }
+                .map { trainingDAO.loadTraining(it) }
                 .map { Pair(it.id, it) }
                 .toMap()
 
         val values: List<Pair<Float, LocalDateTime>>
         if (isSingleTraining) {
             val trainingDate = trainingsMap.values.toList()[0].date
-            val ends = rounds!!.sortedBy { it.index }.map { RoundDAO.loadEnds(it.id) }
+            val ends = rounds!!.sortedBy { it.index }.map { roundDAO.loadEnds(it.id) }
             val firstRound = ends[0]
             if (firstRound.isEmpty()) {
                 return null
@@ -145,7 +148,7 @@ class StatisticsFragment : FragmentBase() {
             values = rounds!!
                     .map { r -> Pair(trainingsMap[r.trainingId]!!.date, r) }
                     .flatMap { (date, round) ->
-                        RoundDAO.loadEnds(round.id).map { end -> Pair(end, date) }
+                        roundDAO.loadEnds(round.id).map { end -> Pair(end, date) }
                     }
                     .map { (end, date) -> Pair(end.score.shotAverage, LocalDateTime.of(date, end.saveTime!!)) }
                     .sortedBy { (_, date) -> date }
@@ -186,7 +189,7 @@ class StatisticsFragment : FragmentBase() {
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        rounds = RoundDAO.loadRounds(roundIds!!)
+        rounds = roundDAO.loadRounds(roundIds!!)
         val data = ArrowStatistic.getAll(target!!, rounds!!)
                 .sortedWith(compareByDescending { it.totalScore.shotAverage })
 
@@ -204,9 +207,9 @@ class StatisticsFragment : FragmentBase() {
 
     private fun showDispersionView() {
         val exactShots = rounds!!
-                .flatMap { RoundDAO.loadEnds(it.id) }
-                .filter { (_, _, _, exact) -> exact }
-                .flatMap { EndDAO.loadShots(it.id) }
+                .flatMap { roundDAO.loadEnds(it.id) }
+                .filter { it.exact }
+                .flatMap { endDAO.loadShots(it.id) }
                 .filter { (_, _, _, _, _, scoringRing) -> scoringRing != Shot.NOTHING_SELECTED }
                 .toList()
         if (exactShots.isEmpty()) {
@@ -220,7 +223,7 @@ class StatisticsFragment : FragmentBase() {
                 .map { it.trainingId!! }
                 .distinct()
         if (trainingsIds.size == 1) {
-            val training = TrainingDAO.loadTraining(trainingsIds[0])
+            val training = trainingDAO.loadTraining(trainingsIds[0])
             val date = training.date.format(DateTimeFormatter.ISO_LOCAL_DATE)
             val round = if (rounds!!.size == 1) {
                 val index = rounds!![0].index + 1
@@ -308,7 +311,7 @@ class StatisticsFragment : FragmentBase() {
     }
 
     private fun addPieData() {
-        val scores = ScoreUtils.getSortedScoreDistribution(rounds!!)
+        val scores = ScoreUtils.getSortedScoreDistribution(roundDAO, endDAO, rounds!!)
 
         val yValues = ArrayList<PieEntry>()
         val colors = ArrayList<Int>()
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
index c8c2d94d9..6f05964cb 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
@@ -23,9 +23,9 @@ import android.text.InputType
 import android.view.*
 import com.afollestad.materialdialogs.MaterialDialog
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
-import de.dreier.mytargets.base.db.dao.EndDAO
-import de.dreier.mytargets.base.db.dao.RoundDAO
+import de.dreier.mytargets.base.db.EndRepository
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase
 import de.dreier.mytargets.base.fragments.ItemActionModeCallback
 import de.dreier.mytargets.base.fragments.LoaderUICallback
@@ -49,6 +49,10 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
     private lateinit var binding: FragmentListBinding
     private var round: Round? = null
 
+    private val roundDAO = ApplicationInstance.db.roundDAO()
+    private val endDAO = ApplicationInstance.db.endDAO()
+    private val endRepository = EndRepository(endDAO)
+
     private val updateReceiver = object : MobileWearableClient.EndUpdateReceiver() {
 
         override fun onUpdate(trainingId: Long, roundId: Long, end: End) {
@@ -103,12 +107,12 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        round = RoundDAO.loadRound(roundId)
-        val ends = EndDAO.loadAugmentedEnds(round!!.id)
+        round = roundDAO.loadRound(roundId)
+        val ends = endRepository.loadAugmentedEnds(round!!.id)
         val showFab = round!!.maxEndCount == null || ends.size < round!!.maxEndCount!!
 
         return {
-            adapter!!.setList(ends)
+            adapter!!.setList(ends.toMutableList())
             binding.fab.visibility = if (showFab) View.VISIBLE else View.GONE
 
             ToolbarUtils.setTitle(this@RoundFragment,
@@ -133,7 +137,7 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
                         .inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE)
                         .input("", round!!.comment) { _, input ->
                             round!!.comment = input.toString()
-                            RoundDAO.saveRound(round!!)
+                            roundDAO.updateRound(round!!)
                         }
                         .negativeText(android.R.string.cancel)
                         .show()
@@ -158,9 +162,9 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
     }
 
     override fun deleteItem(item: AugmentedEnd): () -> AugmentedEnd {
-        EndDAO.deleteEnd(item.end)
+        endDAO.deleteEnd(item.end)
         return {
-            EndDAO.insertEnd(item.end, item.images, item.shots)
+            endDAO.insertEnd(item.end, item.images, item.shots)
             item
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
index 85865f4e1..b5695d864 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
@@ -19,9 +19,7 @@ import android.content.Context
 import android.text.Spanned
 import android.text.TextUtils
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.db.dao.ArrowDAO
-import de.dreier.mytargets.base.db.dao.BowDAO
-import de.dreier.mytargets.base.db.dao.StandardRoundDAO
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.utils.Utils
@@ -36,7 +34,7 @@ object HtmlUtils {
     }
 
     private fun addStaticTrainingHeaderInfo(context: Context, info: HtmlInfoBuilder, training: Training) {
-        if (training.indoor) {
+        if (training.environment.indoor) {
             info.addLine(R.string.environment, context.getString(R.string.indoor))
         } else {
             info.addLine(R.string.weather, training.environment.weather.getName())
@@ -48,17 +46,17 @@ object HtmlUtils {
         }
 
         if (training.bowId != null) {
-            val bow = BowDAO.loadBow(training.bowId!!)
+            val bow = ApplicationInstance.db.bowDAO().loadBow(training.bowId!!)
             info.addLine(R.string.bow, bow.name)
         }
 
         if (training.arrowId != null) {
-            val arrow = ArrowDAO.loadArrow(training.arrowId!!)
+            val arrow = ApplicationInstance.db.arrowDAO().loadArrow(training.arrowId!!)
             info.addLine(R.string.arrow, arrow.name)
         }
 
         if (training.standardRoundId != null) {
-            val standardRound = StandardRoundDAO.loadStandardRound(training.standardRoundId!!)
+            val standardRound = ApplicationInstance.db.standardRoundDAO().loadStandardRound(training.standardRoundId!!)
             info.addLine(R.string.standard_round, standardRound.name)
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index 9cc61d982..b42338304 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -24,9 +24,10 @@ import android.text.InputType
 import android.view.*
 import com.afollestad.materialdialogs.MaterialDialog
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
-import de.dreier.mytargets.base.db.dao.TrainingDAO
-import de.dreier.mytargets.base.db.dao.RoundDAO
+import de.dreier.mytargets.base.db.EndRepository
+import de.dreier.mytargets.base.db.RoundRepository
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase
 import de.dreier.mytargets.base.fragments.ItemActionModeCallback
 import de.dreier.mytargets.base.fragments.LoaderUICallback
@@ -50,6 +51,13 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
     private var trainingId: Long = 0
     private var training: Training? = null
 
+    private val database = ApplicationInstance.db
+    private val trainingDAO = database.trainingDAO()
+    private val roundDAO = database.roundDAO()
+    private val endDAO = database.endDAO()
+    private val endRepository = EndRepository(endDAO)
+    private val roundRepository = RoundRepository(database, roundDAO, endDAO, endRepository)
+
     private val updateReceiver = object : MobileWearableClient.EndUpdateReceiver() {
 
         override fun onUpdate(trainingId: Long, roundId: Long, end: End) {
@@ -108,8 +116,8 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        training = TrainingDAO.loadTraining(trainingId)
-        val rounds = TrainingDAO.loadRounds(trainingId)
+        training = trainingDAO.loadTraining(trainingId)
+        val rounds = roundDAO.loadRounds(trainingId).toMutableList()
         return {
             // Hide fab for standard rounds
             val supportsDeletion = training!!.standardRoundId == null
@@ -154,7 +162,7 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
                 return true
             }
             R.id.action_statistics -> {
-                navigationController.navigateToStatistics(TrainingDAO.loadRounds(training!!.id).map { it.id })
+                navigationController.navigateToStatistics(roundDAO.loadRounds(training!!.id).map { it.id })
                 return true
             }
             R.id.action_comment -> {
@@ -163,7 +171,7 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
                         .inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE)
                         .input("", training!!.comment) { _, input ->
                             training!!.comment = input.toString()
-                            TrainingDAO.saveTraining(training!!)
+                            trainingDAO.updateTraining(training!!)
                         }
                         .negativeText(android.R.string.cancel)
                         .show()
@@ -187,10 +195,10 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
     }
 
     override fun deleteItem(item: Round): () -> Round {
-        val round = RoundDAO.loadAugmentedRound(item)
-        RoundDAO.deleteRound(item)
+        val round = roundRepository.loadAugmentedRound(item)
+        roundDAO.deleteRound(item)
         return {
-            RoundDAO.insertRound(round)
+            roundRepository.insertRound(round)
             item
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
index 3cb240b88..5c6e0db53 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
@@ -26,7 +26,7 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.widget.DatePicker
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.db.dao.TrainingDAO
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.fragments.EditFragmentBase
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase.Companion.ITEM_ID
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
@@ -43,8 +43,8 @@ import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.targets.models.WA3Ring3Spot
 import de.dreier.mytargets.utils.ToolbarUtils
-import de.dreier.mytargets.utils.getLongOrNull
 import de.dreier.mytargets.utils.Utils
+import de.dreier.mytargets.utils.getLongOrNull
 import de.dreier.mytargets.views.selector.ArrowSelector
 import de.dreier.mytargets.views.selector.BowSelector
 import org.adw.library.widgets.discreteseekbar.DiscreteSeekBar
@@ -60,12 +60,15 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
     private lateinit var binding: FragmentEditTrainingBinding
     private var roundTarget: Target? = null
 
+    private val database = ApplicationInstance.db
+    private val trainingDAO = database.trainingDAO()
+
     private val training: Training
         get() {
             val training = if (trainingId == null) {
                 Training()
             } else {
-                TrainingDAO.loadTraining(trainingId!!)
+                trainingDAO.loadTraining(trainingId!!)
             }
             training.title = binding.training.text.toString()
             training.date = date
@@ -77,7 +80,7 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
             SettingsManager.bow = training.bowId
             SettingsManager.arrow = training.arrowId
             SettingsManager.arrowNumbersEnabled = training.arrowNumbering
-            SettingsManager.indoor = training.indoor
+            SettingsManager.indoor = training.environment.indoor
             return training
         }
 
@@ -182,7 +185,7 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
                 GONE
         } else {
             ToolbarUtils.setTitle(this, R.string.edit_training)
-            val train = TrainingDAO.loadTraining(trainingId!!)
+            val train = trainingDAO.loadTraining(trainingId!!)
             binding.training.setText(train.title)
             date = train.date
             binding.bow.setItemId(train.bowId)
@@ -279,7 +282,7 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
                     round.target = roundTarget!!
                 }
             }
-            TrainingDAO.saveTraining(training, rounds)
+            trainingDAO.saveTraining(training, rounds)
 
             val round = rounds[0]
 
@@ -292,7 +295,7 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
             navigationController.navigateToCreateEnd(round)
         } else {
             // Edit training
-            TrainingDAO.saveTraining(training)
+            trainingDAO.updateTraining(training)
             activity!!.overridePendingTransition(R.anim.left_in, R.anim.right_out)
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
index 8806181b7..68811454d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
@@ -41,15 +41,16 @@ import com.evernote.android.state.State
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.activities.ChildActivityBase
+import de.dreier.mytargets.base.db.EndRepository
+import de.dreier.mytargets.base.db.RoundRepository
+import de.dreier.mytargets.base.db.TrainingRepository
 import de.dreier.mytargets.base.db.dao.ArrowDAO
-import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.base.db.dao.BowDAO
-import de.dreier.mytargets.base.db.dao.EndDAO
+import de.dreier.mytargets.base.db.dao.StandardRoundDAO
 import de.dreier.mytargets.base.gallery.GalleryActivity
 import de.dreier.mytargets.databinding.ActivityInputBinding
 import de.dreier.mytargets.features.settings.ESettingsScreens
 import de.dreier.mytargets.features.settings.SettingsManager
-import de.dreier.mytargets.base.db.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
@@ -79,6 +80,17 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
     private var summaryShowScope = ETrainingScope.END
     private var targetView: TargetView? = null
 
+    private val database = ApplicationInstance.db
+    private val trainingDAO = database.trainingDAO()
+    private val roundDAO = database.roundDAO()
+    private val endDAO = database.endDAO()
+    private val bowDAO = database.bowDAO()
+    private val arrowDAO = database.arrowDAO()
+    private val standardRoundDAO = database.standardRoundDAO()
+    private val endRepository = EndRepository(endDAO)
+    private val roundRepository = RoundRepository(database, roundDAO, endDAO, endRepository)
+    private val trainingRepository = TrainingRepository(database, trainingDAO, roundDAO,roundRepository, database.signatureDAO())
+
     private val updateReceiver = object : MobileWearableClient.EndUpdateReceiver() {
 
         override fun onUpdate(trainingId: Long, roundId: Long, end: End) {
@@ -148,7 +160,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
             currentEnd.end.saveTime = LocalTime.now()
         }
         currentEnd.end.score = data!!.currentRound.round.target.getReachedScore(currentEnd.shots)
-        EndDAO.saveEnd(currentEnd.end, currentEnd.images, currentEnd.shots)
+        endDAO.saveCompleteEnd(currentEnd.end, currentEnd.images, currentEnd.shots)
     }
 
     override fun onDestroy() {
@@ -225,7 +237,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
                         .inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE)
                         .input("", data!!.currentEnd.end.comment) { _, input ->
                             data!!.currentEnd.end.comment = input.toString()
-                            EndDAO.saveEnd(data!!.currentEnd.end)
+                            endDAO.updateEnd(data!!.currentEnd.end)
                         }
                         .negativeText(android.R.string.cancel)
                         .show()
@@ -252,7 +264,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
         val trainingId = args.getLong(TRAINING_ID)
         val roundId = args.getLong(ROUND_ID)
         val endIndex = args.getInt(END_INDEX)
-        return UITaskAsyncTaskLoader(this, trainingId, roundId, endIndex)
+        return UITaskAsyncTaskLoader(this, trainingId, roundId, endIndex, trainingRepository, standardRoundDAO, arrowDAO, bowDAO)
     }
 
     override fun onLoadFinished(loader: Loader<LoaderResult>, data: LoaderResult) {
@@ -450,23 +462,27 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
             context: Context,
             private val trainingId: Long,
             private val roundId: Long,
-            private val endIndex: Int
+            private val endIndex: Int,
+            val trainingRepository: TrainingRepository,
+            val standardRoundDAO: StandardRoundDAO,
+            val arrowDAO: ArrowDAO,
+            val bowDAO: BowDAO
     ) : AsyncTaskLoader<LoaderResult>(context) {
 
         override fun loadInBackground(): LoaderResult? {
-            val training = TrainingDAO.loadAugmentedTraining(trainingId)
-            val standardRound = if (training.training.standardRoundId == null) null else StandardRoundDAO.loadStandardRound(training.training.standardRoundId!!)
+            val training = trainingRepository.loadAugmentedTraining(trainingId)
+            val standardRound = if (training.training.standardRoundId == null) null else standardRoundDAO.loadStandardRound(training.training.standardRoundId!!)
             val result = LoaderResult(training, standardRound)
             result.setRoundId(roundId)
             result.setAdjustEndIndex(endIndex)
 
             if (training.training.arrowId != null) {
-                val arrow = ArrowDAO.loadArrow(training.training.arrowId!!)
+                val arrow = arrowDAO.loadArrow(training.training.arrowId!!)
                 result.maxArrowNumber = arrow.maxArrowNumber
                 result.arrowDiameter = arrow.diameter
             }
             if (training.training.bowId != null) {
-                result.sightMark = BowDAO.loadSightMarks(training.training.bowId!!)
+                result.sightMark = bowDAO.loadSightMarks(training.training.bowId!!)
                         .firstOrNull { it.distance == result.distance!! }
             }
             return result
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
index 6aa4d7efc..c5cbb66f1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
@@ -24,8 +24,11 @@ import android.os.Bundle
 import android.support.v4.content.LocalBroadcastManager
 import android.view.*
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.adapters.header.ExpandableListAdapter
-import de.dreier.mytargets.base.db.dao.TrainingDAO
+import de.dreier.mytargets.base.db.EndRepository
+import de.dreier.mytargets.base.db.RoundRepository
+import de.dreier.mytargets.base.db.TrainingRepository
 import de.dreier.mytargets.base.fragments.ItemActionModeCallback
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.databinding.FragmentTrainingsBinding
@@ -44,10 +47,18 @@ import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 /**
  * Shows an overview over all training days
  */
-open class TrainingsFragment : ExpandableListFragment<Header, Training>() {
+class TrainingsFragment : ExpandableListFragment<Header, Training>() {
 
     private lateinit var binding: FragmentTrainingsBinding
 
+    private val database = ApplicationInstance.db
+    private val trainingDAO = database.trainingDAO()
+    private val roundDAO = database.roundDAO()
+    private val endDAO = database.endDAO()
+    private val endRepository = EndRepository(endDAO)
+    private val roundRepository = RoundRepository(database, roundDAO, endDAO, endRepository)
+    private val trainingRepository = TrainingRepository(database, trainingDAO, roundDAO,roundRepository, database.signatureDAO())
+
     private val updateReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
             reloadData()
@@ -125,8 +136,8 @@ open class TrainingsFragment : ExpandableListFragment<Header, Training>() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.action_statistics -> {
-                navigationController.navigateToStatistics(TrainingDAO.loadTrainings()
-                        .flatMap { training -> TrainingDAO.loadRounds(training.id) }
+                navigationController.navigateToStatistics(trainingDAO.loadTrainings()
+                        .flatMap { training -> roundDAO.loadRounds(training.id) }
                         .map { it.id })
                 true
             }
@@ -141,8 +152,8 @@ open class TrainingsFragment : ExpandableListFragment<Header, Training>() {
 
     private fun onStatistics(ids: List<Long>) {
         navigationController.navigateToStatistics(ids
-                .map { TrainingDAO.loadTraining(it) }
-                .flatMap { t -> TrainingDAO.loadRounds(t.id) }
+                .map { trainingDAO.loadTraining(it) }
+                .flatMap { t -> roundDAO.loadRounds(t.id) }
                 .map { it.id })
     }
 
@@ -151,16 +162,16 @@ open class TrainingsFragment : ExpandableListFragment<Header, Training>() {
     }
 
     override fun deleteItem(item: Training): () -> Training {
-        val training = TrainingDAO.loadAugmentedTraining(item.id)
-        TrainingDAO.deleteTraining(item)
+        val training = trainingRepository.loadAugmentedTraining(item.id)
+        trainingDAO.deleteTraining(item)
         return {
-            TrainingDAO.insertTraining(training)
+            trainingRepository.insertTraining(training)
             item
         }
     }
 
     override fun onLoad(args: Bundle?): LoaderUICallback {
-        val trainings = TrainingDAO.loadTrainings()
+        val trainings = trainingDAO.loadTrainings()
         return {
             this@TrainingsFragment.setList(trainings, false)
             activity?.invalidateOptionsMenu()
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
index 72c7188b9..dcd123996 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
@@ -24,9 +24,9 @@ import android.view.View
 import android.view.ViewGroup
 import com.evernote.android.state.State
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.adapters.dynamicitem.DynamicItemAdapter
 import de.dreier.mytargets.base.adapters.dynamicitem.DynamicItemHolder
-import de.dreier.mytargets.base.db.dao.StandardRoundDAO
 import de.dreier.mytargets.base.fragments.EditFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.INTENT
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
@@ -46,6 +46,8 @@ import timber.log.Timber
 
 class EditStandardRoundFragment : EditFragmentBase() {
 
+    private val standardRoundDAO = ApplicationInstance.db.standardRoundDAO()
+
     @State
     var standardRound: AugmentedStandardRound? = null
     private var adapter: RoundTemplateAdapter? = null
@@ -126,7 +128,7 @@ class EditStandardRoundFragment : EditFragmentBase() {
     }
 
     private fun onDeleteStandardRound() {
-        StandardRoundDAO.deleteStandardRound(standardRound!!.standardRound)
+        standardRoundDAO.deleteStandardRound(standardRound!!.standardRound)
         navigationController.setResult(RESULT_STANDARD_ROUND_DELETED)
         navigationController.finish()
     }
@@ -134,7 +136,7 @@ class EditStandardRoundFragment : EditFragmentBase() {
     override fun onSave() {
         standardRound!!.standardRound.club = StandardRoundFactory.CUSTOM
         standardRound!!.standardRound.name = binding.name.text.toString()
-        StandardRoundDAO.saveStandardRound(standardRound!!.standardRound, standardRound!!.roundTemplates)
+        standardRoundDAO.saveStandardRound(standardRound!!.standardRound, standardRound!!.roundTemplates)
 
         val round = standardRound!!.roundTemplates[0]
         SettingsManager.shotsPerEnd = round.shotsPerEnd
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
index c939a40e4..fff1801eb 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
@@ -28,8 +28,8 @@ import android.widget.ImageView
 import com.afollestad.materialdialogs.MaterialDialog
 import com.evernote.android.state.State
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.adapters.header.HeaderListAdapter
-import de.dreier.mytargets.base.db.dao.StandardRoundDAO
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.base.fragments.SelectItemFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
@@ -53,6 +53,8 @@ class StandardRoundListFragment : SelectItemFragmentBase<AugmentedStandardRound,
 
     private lateinit var binding: FragmentListBinding
 
+    private val standardRoundDAO = ApplicationInstance.db.standardRoundDAO()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         if (savedInstanceState == null) {
@@ -83,11 +85,10 @@ class StandardRoundListFragment : SelectItemFragmentBase<AugmentedStandardRound,
     override fun onLoad(args: Bundle?): LoaderUICallback {
         val data = if (args != null && args.containsKey(KEY_QUERY)) {
             val query = args.getString(KEY_QUERY)
-            val queryString = "%${query!!.replace(' ', '%')}%"
-            StandardRoundDAO.getAllSearch(queryString)
+            standardRoundDAO.getAllSearch("%${query!!.replace(' ', '%')}%")
         } else {
-            StandardRoundDAO.loadStandardRounds()
-        }.map { AugmentedStandardRound(it, StandardRoundDAO.loadRoundTemplates(it.id)) }.toMutableList()
+            standardRoundDAO.loadStandardRounds()
+        }.map { AugmentedStandardRound(it, standardRoundDAO.loadRoundTemplates(it.id).toMutableList()) }.toMutableList()
         return {
             adapter!!.setList(data)
             selectItem(binding.recyclerView, currentSelection!!)
@@ -170,7 +171,7 @@ class StandardRoundListFragment : SelectItemFragmentBase<AugmentedStandardRound,
                 currentSelection = data.getParcelableExtra(ITEM)
                 reloadData()
             } else if (resultCode == EditStandardRoundFragment.RESULT_STANDARD_ROUND_DELETED) {
-                currentSelection = StandardRoundDAO.loadAugmentedStandardRound(32L)
+                currentSelection = standardRoundDAO.loadAugmentedStandardRound(32L)
                 saveItem()
                 reloadData()
             }
diff --git a/app/src/main/java/de/dreier/mytargets/utils/AugmentedRoundUtils.kt b/app/src/main/java/de/dreier/mytargets/utils/AugmentedRoundUtils.kt
index a91f52559..6ceaf81b0 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/AugmentedRoundUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/AugmentedRoundUtils.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.utils
 
-import de.dreier.mytargets.base.db.dao.EndDAO
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
 import de.dreier.mytargets.shared.models.db.End
@@ -30,7 +30,7 @@ fun AugmentedRound.addEnd(): AugmentedEnd {
     val end = End(index = ends.size, roundId = round.id)
     val augmentedEnd = AugmentedEnd(end, (0 until round.shotsPerEnd)
             .map { Shot(it) }.toMutableList(), mutableListOf())
-    EndDAO.saveEnd(augmentedEnd.end, augmentedEnd.images, augmentedEnd.shots)
+    ApplicationInstance.db.endDAO().saveCompleteEnd(augmentedEnd.end, augmentedEnd.images, augmentedEnd.shots)
     ends.add(augmentedEnd)
     return augmentedEnd
 }
diff --git a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
index 68e8ded12..12db8f7ca 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
@@ -19,10 +19,9 @@ import com.google.android.gms.wearable.MessageEvent
 import com.google.android.gms.wearable.WearableListenerService
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
-import de.dreier.mytargets.base.db.dao.EndDAO
-import de.dreier.mytargets.base.db.dao.RoundDAO
-import de.dreier.mytargets.base.db.dao.StandardRoundDAO
-import de.dreier.mytargets.base.db.dao.TrainingDAO
+import de.dreier.mytargets.base.db.EndRepository
+import de.dreier.mytargets.base.db.RoundRepository
+import de.dreier.mytargets.base.db.TrainingRepository
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.Environment
 import de.dreier.mytargets.shared.models.TimerSettings
@@ -33,7 +32,6 @@ import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.shared.utils.unmarshall
 import de.dreier.mytargets.shared.wearable.WearableClientBase
-import de.dreier.mytargets.utils.addEnd
 import org.threeten.bp.LocalDate
 
 /**
@@ -43,6 +41,15 @@ import org.threeten.bp.LocalDate
  */
 class MobileWearableListener : WearableListenerService() {
 
+    private val database = ApplicationInstance.db
+    private val trainingDAO = database.trainingDAO()
+    private val roundDAO = database.roundDAO()
+    private val endDAO = database.endDAO()
+    private val standardRoundDAO = database.standardRoundDAO()
+    private val endRepository = EndRepository(endDAO)
+    private val roundRepository = RoundRepository(database, roundDAO, endDAO, endRepository)
+    private val trainingRepository = TrainingRepository(database, trainingDAO, roundDAO,roundRepository, database.signatureDAO())
+
     override fun onMessageReceived(messageEvent: MessageEvent) {
         super.onMessageReceived(messageEvent)
         when (messageEvent.path) {
@@ -62,9 +69,9 @@ class MobileWearableListener : WearableListenerService() {
     }
 
     private fun trainingTemplate() {
-        val lastTraining = TrainingDAO.loadTrainings().minWith(compareByDescending(Training::date).thenByDescending(Training::id))
+        val lastTraining = trainingDAO.loadTrainings().minWith(compareByDescending(Training::date).thenByDescending(Training::id))
         if (lastTraining != null && lastTraining.date.isEqual(LocalDate.now())) {
-            val training = TrainingDAO.loadAugmentedTraining(lastTraining.id)
+            val training = trainingRepository.loadAugmentedTraining(lastTraining.id)
             ApplicationInstance.wearableClient.updateTraining(training)
         } else {
             val training = Training()
@@ -85,7 +92,7 @@ class MobileWearableListener : WearableListenerService() {
                 round.distance = SettingsManager.distance
                 aTraining.rounds = mutableListOf(AugmentedRound(round, mutableListOf()))
             } else {
-                aTraining.rounds = StandardRoundDAO
+                aTraining.rounds = standardRoundDAO
                         .loadAugmentedStandardRound(lastTraining!!.standardRoundId!!)
                         .createRoundsFromTemplate()
                         .map { AugmentedRound(it, mutableListOf()) }
@@ -97,22 +104,22 @@ class MobileWearableListener : WearableListenerService() {
 
     private fun createTraining(messageEvent: MessageEvent) {
         val augmentedTraining = messageEvent.data.unmarshall(AugmentedTraining.CREATOR)
-        TrainingDAO.saveTraining(augmentedTraining.training, augmentedTraining.rounds.map { it.round })
+        trainingDAO.saveTraining(augmentedTraining.training, augmentedTraining.rounds.map { it.round })
         ApplicationInstance.wearableClient.updateTraining(augmentedTraining)
         ApplicationInstance.wearableClient.sendCreateTrainingFromRemoteBroadcast()
     }
 
     private fun endUpdated(messageEvent: MessageEvent) {
         val (end, shots) = messageEvent.data.unmarshall(AugmentedEnd.CREATOR)
-        val round = RoundDAO.loadAugmentedRound(end.roundId!!)
+        val round = roundRepository.loadAugmentedRound(end.roundId!!)
         val newEnd = getLastEmptyOrCreateNewEnd(round)
         newEnd.end.exact = false
         newEnd.shots = shots
-        EndDAO.saveEnd(newEnd.end, newEnd.images, newEnd.shots)
+        endDAO.saveCompleteEnd(newEnd.end, newEnd.images, newEnd.shots)
 
         ApplicationInstance.wearableClient.sendUpdateTrainingFromRemoteBroadcast(round.round, newEnd.end)
         ApplicationInstance.wearableClient
-                .sendUpdateTrainingFromLocalBroadcast(TrainingDAO.loadAugmentedTraining(round.round.trainingId!!))
+                .sendUpdateTrainingFromLocalBroadcast(trainingRepository.loadAugmentedTraining(round.round.trainingId!!))
     }
 
     private fun getLastEmptyOrCreateNewEnd(round: AugmentedRound): AugmentedEnd {
diff --git a/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt b/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt
index 9fc85d136..c5f80f8d2 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt
@@ -46,16 +46,16 @@ object ScoreUtils {
     /**
      * Compound 9ers are already collapsed to one SelectableZone.
      */
-    fun getSortedScoreDistribution(rounds: List<Round>): List<Map.Entry<SelectableZone, Int>> {
-        return getRoundScores(rounds).entries.sortedBy { it.key }
+    fun getSortedScoreDistribution(roundDAO: RoundDAO, endDAO: EndDAO, rounds: List<Round>): List<Map.Entry<SelectableZone, Int>> {
+        return getRoundScores(roundDAO, endDAO, rounds).entries.sortedBy { it.key }
     }
 
-    private fun getRoundScores(rounds: List<Round>): Map<SelectableZone, Int> {
+    private fun getRoundScores(roundDAO: RoundDAO, endDAO: EndDAO, rounds: List<Round>): Map<SelectableZone, Int> {
         val t = rounds[0].target
         val scoreCount = getAllPossibleZones(t)
-        rounds.flatMap { RoundDAO.loadEnds(it.id) }
+        rounds.flatMap { roundDAO.loadEnds(it.id) }
                 .forEach {
-                    EndDAO.loadShots(it.id).forEach { s ->
+                    endDAO.loadShots(it.id).forEach { s ->
                         if (s.scoringRing != Shot.NOTHING_SELECTED) {
                             val tuple = SelectableZone(s.scoringRing,
                                     t.model.getZone(s.scoringRing),
diff --git a/app/src/main/java/de/dreier/mytargets/utils/backup/MyBackupAgent.kt b/app/src/main/java/de/dreier/mytargets/utils/backup/MyBackupAgent.kt
index 893ade61b..173b8e91e 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/backup/MyBackupAgent.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/backup/MyBackupAgent.kt
@@ -18,7 +18,7 @@ package de.dreier.mytargets.utils.backup
 import android.app.backup.BackupAgentHelper
 import android.app.backup.FileBackupHelper
 import android.app.backup.SharedPreferencesBackupHelper
-import de.dreier.mytargets.base.db.dao.ImageDAO
+import de.dreier.mytargets.app.ApplicationInstance
 
 class MyBackupAgent : BackupAgentHelper() {
 
@@ -27,7 +27,7 @@ class MyBackupAgent : BackupAgentHelper() {
         addHelper(PREFS_BACKUP_KEY, SharedPreferencesBackupHelper(this, PREFS))
         addHelper(SQLITE_BACKUP_KEY, DbBackupHelper(this))
         addHelper(IMAGES_BACKUP_KEY,
-                FileBackupHelper(this, *ImageDAO.loadAllFileNames().toTypedArray()))
+                FileBackupHelper(this, *ApplicationInstance.db.imageDAO().loadAllFileNames().toTypedArray()))
     }
 
     companion object {
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
index af350402f..58d0a0aea 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
@@ -21,7 +21,7 @@ import android.content.Intent
 import android.databinding.DataBindingUtil
 import android.util.AttributeSet
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.db.dao.ArrowDAO
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
 import de.dreier.mytargets.shared.models.db.Arrow
 
@@ -32,6 +32,8 @@ class ArrowSelector @JvmOverloads constructor(
 
     private lateinit var binding: SelectorItemImageDetailsBinding
 
+    private val arrowDAO = ApplicationInstance.db.arrowDAO()
+
     override fun bindView(item: Arrow) {
         binding = DataBindingUtil.bind(view)
         binding.name.text = item.name
@@ -48,10 +50,10 @@ class ArrowSelector @JvmOverloads constructor(
     fun setItemId(arrowId: Long?) {
         var item: Arrow? = null
         if (arrowId != null) {
-            item = ArrowDAO.loadArrowOrNull(arrowId)
+            item = arrowDAO.loadArrowOrNull(arrowId)
         }
         if (item == null) {
-            val all = ArrowDAO.loadArrows()
+            val all = arrowDAO.loadArrows()
             if (all.isNotEmpty()) {
                 item = all[0]
             }
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
index d9674986b..6cf223ae2 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
@@ -21,7 +21,7 @@ import android.content.Intent
 import android.databinding.DataBindingUtil
 import android.util.AttributeSet
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.db.dao.BowDAO
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
 import de.dreier.mytargets.shared.models.db.Bow
 
@@ -32,6 +32,9 @@ class BowSelector @JvmOverloads constructor(
 
     private lateinit var binding: SelectorItemImageDetailsBinding
 
+    private val database = ApplicationInstance.db
+    private val bowDAO = database.bowDAO()
+
     override fun bindView(item: Bow) {
         binding = DataBindingUtil.bind(view)
         binding.name.text = item.name
@@ -48,10 +51,10 @@ class BowSelector @JvmOverloads constructor(
     fun setItemId(bow: Long?) {
         var item: Bow? = null
         if (bow != null) {
-            item = BowDAO.loadBowOrNull(bow)
+            item = bowDAO.loadBowOrNull(bow)
         }
         if (item == null) {
-            item = BowDAO.loadBows().firstOrNull()
+            item = bowDAO.loadBows().firstOrNull()
         }
         setItem(item)
     }
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
index 065788147..b3afe1f26 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
@@ -20,7 +20,7 @@ import android.databinding.DataBindingUtil
 import android.util.AttributeSet
 import android.view.View
 import de.dreier.mytargets.R
-import de.dreier.mytargets.base.db.dao.StandardRoundDAO
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
 
@@ -29,6 +29,8 @@ class StandardRoundSelector @JvmOverloads constructor(context: Context, attrs: A
 
     private lateinit var binding: SelectorItemImageDetailsBinding
 
+    private val standardRoundDAO = ApplicationInstance.db.standardRoundDAO()
+
     override fun bindView(item: AugmentedStandardRound) {
         binding = DataBindingUtil.bind(view)
         binding.name.text = item.standardRound.name
@@ -38,12 +40,12 @@ class StandardRoundSelector @JvmOverloads constructor(context: Context, attrs: A
     }
 
     fun setItemId(standardRoundId: Long?) {
-        var standardRound = StandardRoundDAO.loadStandardRoundOrNull(standardRoundId!!)
+        var standardRound = standardRoundDAO.loadStandardRoundOrNull(standardRoundId!!)
         // If the round has been removed, choose default one
-        if (standardRound == null || StandardRoundDAO.loadRoundTemplates(standardRound.id).isEmpty()) {
-            standardRound = StandardRoundDAO.loadStandardRound(32L)
+        if (standardRound == null || standardRoundDAO.loadRoundTemplates(standardRound.id).isEmpty()) {
+            standardRound = standardRoundDAO.loadStandardRound(32L)
         }
-        setItem(AugmentedStandardRound(standardRound, StandardRoundDAO.loadRoundTemplates(standardRound.id)))
+        setItem(AugmentedStandardRound(standardRound, standardRoundDAO.loadRoundTemplates(standardRound.id).toMutableList()))
     }
 
     companion object {
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/EndRepository.kt b/shared/src/main/java/de/dreier/mytargets/base/db/EndRepository.kt
new file mode 100644
index 000000000..2e700cd36
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/EndRepository.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db
+
+import de.dreier.mytargets.base.db.dao.EndDAO
+import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
+
+class EndRepository(
+        private val endDAO: EndDAO
+) {
+    fun loadAugmentedEnds(roundId: Long): List<AugmentedEnd> {
+        return endDAO.loadEnds(roundId)
+                .map { AugmentedEnd(it, endDAO.loadShots(it.id).toMutableList(), endDAO.loadEndImages(it.id).toMutableList()) }
+                .toMutableList()
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/RoundRepository.kt b/shared/src/main/java/de/dreier/mytargets/base/db/RoundRepository.kt
new file mode 100644
index 000000000..399ab5907
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/RoundRepository.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db
+
+import android.arch.persistence.room.RoomDatabase
+import de.dreier.mytargets.base.db.dao.EndDAO
+import de.dreier.mytargets.base.db.dao.RoundDAO
+import de.dreier.mytargets.shared.models.augmented.AugmentedRound
+import de.dreier.mytargets.shared.models.db.Round
+
+class RoundRepository(
+        private val database: RoomDatabase,
+        private val roundDAO: RoundDAO,
+        private val endDAO: EndDAO,
+        private val endRepository: EndRepository
+) {
+
+    fun loadAugmentedRound(id: Long) = AugmentedRound(roundDAO.loadRound(id), endRepository.loadAugmentedEnds(id).toMutableList())
+
+    fun loadAugmentedRound(round: Round) = AugmentedRound(round, endRepository.loadAugmentedEnds(round.id).toMutableList())
+
+    fun insertRound(round: AugmentedRound) {
+        roundDAO.insertRound(round.round, round.ends.map { it.end })
+        round.ends.forEach {
+            endDAO.saveCompleteEnd(it.end, it.images, it.shots)
+        }
+    }
+
+    fun saveRound(round: AugmentedRound) {
+        roundDAO.insertRound(round.round)
+        for (end in round.ends) {
+            end.end.roundId = round.round.id
+            endDAO.saveCompleteEnd(end.end, end.images, end.shots)
+        }
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt b/shared/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt
new file mode 100644
index 000000000..77eca0b5f
--- /dev/null
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.base.db
+
+import android.arch.persistence.room.RoomDatabase
+import de.dreier.mytargets.base.db.dao.RoundDAO
+import de.dreier.mytargets.base.db.dao.SignatureDAO
+import de.dreier.mytargets.base.db.dao.TrainingDAO
+import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
+import de.dreier.mytargets.shared.models.db.Signature
+import de.dreier.mytargets.shared.models.db.Training
+
+class TrainingRepository(
+        private val database: RoomDatabase,
+        private val trainingDAO: TrainingDAO,
+        private val roundDAO: RoundDAO,
+        private val roundRepository: RoundRepository,
+        private val signatureDAO: SignatureDAO
+) {
+
+    fun loadAugmentedTraining(id: Long): AugmentedTraining = AugmentedTraining(trainingDAO.loadTraining(id), roundDAO.loadRounds(id)
+            .map { roundRepository.loadAugmentedRound(it) }
+            .toMutableList())
+
+    fun insertTraining(training: AugmentedTraining) {
+        database.runInTransaction {
+            trainingDAO.saveTraining(training.training)
+            training.rounds.forEach { round ->
+                round.round.trainingId = training.training.id
+                roundRepository.saveRound(round)
+            }
+        }
+    }
+
+    fun getOrCreateArcherSignature(training: Training): Signature {
+        if (training.archerSignatureId != null) {
+            val signature = signatureDAO.loadSignatureOrNull(training.archerSignatureId!!)
+            if (signature != null) {
+                return signature
+            }
+        }
+        val signature = Signature()
+        signatureDAO.saveSignature(signature)
+        training.archerSignatureId = signature.id
+        trainingDAO.saveTraining(training)
+        return signature
+    }
+
+    fun getOrCreateWitnessSignature(training: Training): Signature {
+        if (training.witnessSignatureId != null) {
+            val signature = signatureDAO.loadSignatureOrNull(training.witnessSignatureId!!)
+            if (signature != null) {
+                return signature
+            }
+        }
+        val signature = Signature()
+        signatureDAO.saveSignature(signature)
+        training.witnessSignatureId = signature.id
+        trainingDAO.saveTraining(training)
+        return signature
+    }
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
index 5731267e4..a2abe5df3 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
@@ -15,53 +15,43 @@
 
 package de.dreier.mytargets.base.db.dao
 
-import com.raizlabs.android.dbflow.config.FlowManager
-import com.raizlabs.android.dbflow.kotlinextensions.delete
-import com.raizlabs.android.dbflow.kotlinextensions.save
-import com.raizlabs.android.dbflow.sql.language.SQLite
-import de.dreier.mytargets.shared.AppDatabase
+import android.arch.persistence.room.*
 import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.shared.models.db.ArrowImage
-import de.dreier.mytargets.shared.models.db.ArrowImage_Table
-import de.dreier.mytargets.shared.models.db.Arrow_Table
 
-object ArrowDAO {
-    fun loadArrows(): List<Arrow> = SQLite.select().from(Arrow::class.java).queryList()
+@Dao
+abstract class ArrowDAO {
+    @Query("SELECT * FROM Arrow")
+    abstract fun loadArrows(): List<Arrow>
 
-    fun loadArrow(id: Long): Arrow = SQLite.select()
-            .from(Arrow::class.java)
-            .where(Arrow_Table._id.eq(id))
-            .querySingle() ?: throw IllegalStateException("Arrow $id does not exist")
+    @Query("SELECT * FROM Arrow WHERE _id = (:id)")
+    abstract fun loadArrow(id: Long): Arrow
 
-    fun loadArrowOrNull(id: Long): Arrow? = SQLite.select()
-            .from(Arrow::class.java)
-            .where(Arrow_Table._id.eq(id))
-            .querySingle()
+    @Query("SELECT * FROM Arrow WHERE _id = (:id)")
+    abstract fun loadArrowOrNull(id: Long): Arrow?
 
-    fun loadArrowImages(id: Long): List<ArrowImage> = SQLite.select()
-            .from(ArrowImage::class.java)
-            .where(ArrowImage_Table.arrow.eq(id))
-            .queryList()
+    @Query("SELECT * FROM ArrowImage WHERE arrow = (:id)")
+    abstract fun loadArrowImages(id: Long): List<ArrowImage>
 
-    fun saveArrow(arrow: Arrow, images: List<ArrowImage>) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            arrow.save(db)
-            SQLite.delete(ArrowImage::class.java)
-                    .where(ArrowImage_Table.arrow.eq(arrow.id))
-                    .execute(db)
-            for (image in images) {
-                image.arrowId = arrow.id
-                image.save(db)
-            }
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun insertArrow(arrow: Arrow): Long
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun insertArrowImages(images: List<ArrowImage>)
+
+    @Query("DELETE FROM ArrowImage WHERE arrow = (:arrowId)")
+    abstract fun deleteArrowImages(arrowId: Long)
+
+    @Transaction
+    open fun saveArrow(arrow: Arrow, images: List<ArrowImage>) {
+        arrow.id = insertArrow(arrow)
+       // deleteArrowImages(arrow.id) TODO test if insert replace deletes old images
+        for (image in images) {
+            image.arrowId = arrow.id
         }
+        insertArrowImages(images)
     }
 
-    fun deleteArrow(arrow: Arrow) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-                    SQLite.delete(ArrowImage::class.java)
-                            .where(ArrowImage_Table.arrow.eq(arrow.id))
-                            .execute(db)
-                    arrow.delete(db)
-                }
-    }
+    @Delete
+    abstract fun deleteArrow(arrow: Arrow)
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
index a7d50d0bb..ce8304226 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
@@ -15,67 +15,60 @@
 
 package de.dreier.mytargets.base.db.dao
 
-import com.raizlabs.android.dbflow.config.FlowManager
-import com.raizlabs.android.dbflow.kotlinextensions.delete
-import com.raizlabs.android.dbflow.kotlinextensions.save
-import com.raizlabs.android.dbflow.sql.language.SQLite
-import de.dreier.mytargets.shared.AppDatabase
-import de.dreier.mytargets.shared.models.db.*
+import android.arch.persistence.room.*
+import de.dreier.mytargets.shared.models.db.Bow
+import de.dreier.mytargets.shared.models.db.BowImage
+import de.dreier.mytargets.shared.models.db.SightMark
 
-object BowDAO {
-    fun loadBows(): List<Bow> = SQLite.select().from(Bow::class.java).queryList()
+@Dao
+abstract class BowDAO {
+    @Query("SELECT * FROM Bow")
+    abstract fun loadBows(): List<Bow>
 
-    fun loadBow(id: Long): Bow = SQLite.select()
-            .from(Bow::class.java)
-            .where(Bow_Table._id.eq(id))
-            .querySingle() ?: throw IllegalStateException("Bow $id does not exist")
+    @Query("SELECT * FROM Bow WHERE _id = (:id)")
+    abstract fun loadBow(id: Long): Bow
 
-    fun loadBowOrNull(id: Long): Bow? = SQLite.select()
-            .from(Bow::class.java)
-            .where(Bow_Table._id.eq(id))
-            .querySingle()
+    @Query("SELECT * FROM Bow WHERE _id = (:id)")
+    abstract fun loadBowOrNull(id: Long): Bow?
 
-    fun loadBowImages(id: Long): List<BowImage> = SQLite.select()
-            .from(BowImage::class.java)
-            .where(BowImage_Table.bow.eq(id))
-            .queryList()
+    @Query("SELECT * FROM BowImage WHERE bow = (:id)")
+    abstract fun loadBowImages(id: Long): List<BowImage>
 
-    fun loadSightMarks(id: Long): ArrayList<SightMark> = ArrayList(SQLite.select()
-            .from(SightMark::class.java)
-            .where(SightMark_Table.bow.eq(id))
-            .queryList()
-            .sortedBy { sightMark -> sightMark.distance }
-            .toMutableList())
+    @Query("SELECT * FROM SightMark WHERE bow = (:id)")
+    abstract fun loadSightMarks(id: Long): List<SightMark>
 
-    fun saveBow(bow: Bow, images: List<BowImage>, sightMarks: List<SightMark>) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-                    bow.save(db)
-                    SQLite.delete(BowImage::class.java)
-                            .where(BowImage_Table.bow.eq(bow.id))
-                            .execute(db)
-                    for (image in images) {
-                        image.bowId = bow.id
-                        image.save(db)
-                    }
-                    SQLite.delete(SightMark::class.java)
-                            .where(SightMark_Table.bow.eq(bow.id))
-                            .execute(db)
-                    for (sightMark in sightMarks) {
-                        sightMark.bowId = bow.id
-                        sightMark.save(db)
-                    }
-                }
-    }
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun insertBow(bow: Bow): Long
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun insertBowImages(images: List<BowImage>)
+
+    @Query("DELETE FROM BowImage WHERE bow = (:bowId)")
+    abstract fun deleteBowImages(bowId: Long)
 
-    fun deleteBow(bow: Bow) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-                    SQLite.delete(BowImage::class.java)
-                            .where(BowImage_Table.bow.eq(bow.id))
-                            .execute(db)
-                    SQLite.delete(SightMark::class.java)
-                            .where(SightMark_Table.bow.eq(bow.id))
-                            .execute(db)
-                    bow.delete(db)
-                }
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun insertSightMarks(sightMarks: List<SightMark>)
+
+    @Query("DELETE FROM SightMark WHERE bow = (:bowId)")
+    abstract fun deleteSightMarks(bowId: Long)
+
+    @Transaction
+    open fun saveBow(bow: Bow, images: List<BowImage>, sightMarks: List<SightMark>) {
+        bow.id = insertBow(bow)
+        // deleteBowImages(bow.id) TODO test
+        for (image in images) {
+            image.bowId = bow.id
+        }
+        insertBowImages(images)
+        // deleteSightMarks(bow.id) TODO
+        for (sightMark in sightMarks) {
+            sightMark.bowId = bow.id
+        }
+        insertSightMarks(sightMarks)
     }
+
+    //    deleteSightMarks(bow.id) // TODO
+    //    deleteBowImages(bow.id)
+    @Delete
+    abstract fun deleteBow(bow: Bow)
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
index 40cb2431f..babfd5baf 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
@@ -15,54 +15,20 @@
 
 package de.dreier.mytargets.base.db.dao
 
-import com.raizlabs.android.dbflow.sql.language.SQLite
+import android.arch.persistence.room.Dao
+import android.arch.persistence.room.Query
 import de.dreier.mytargets.shared.models.Dimension
-import de.dreier.mytargets.shared.models.db.*
-import java.util.*
 
-object DimensionDAO {
+@Dao
+interface DimensionDAO {
     /**
      * Returns a list of all distances that are either default values or used somewhere in the app
      *
-     * @param distance Distance to add to the list (current selected value)
      * @param unit     Distances are only returned which match the specified unit
      * @return List of distances
      */
-    fun getAll(distance: Dimension, unit: Dimension.Unit): List<Dimension> {
-        val distances = HashSet<Dimension>()
-
-        distances.add(Dimension.UNKNOWN)
-
-        // Add currently selected distance to list
-        if (distance.unit == unit) {
-            distances.add(distance)
-        }
-
-        // Get all distances used in Round or SightMark table
-        distances.addAll(SQLite
-                .select(SightMark_Table.distance)
-                .from(SightMark::class.java)
-                .queryList()
-                .map { it.distance }
-                .filter { it.unit == unit }
-                .toSet())
-
-        distances.addAll(SQLite
-                .select(RoundTemplate_Table.distance)
-                .from(RoundTemplate::class.java)
-                .queryList()
-                .map { it.distance }
-                .filter { it.unit == unit }
-                .toSet())
-
-        distances.addAll(SQLite
-                .select(Round_Table.distance)
-                .from(Round::class.java)
-                .queryList()
-                .map { it.distance }
-                .filter { it.unit == unit }
-                .toSet())
-
-        return ArrayList(distances)
-    }
+    @Query("SELECT distance FROM SightMark WHERE distance LIKE ('% ' || :unit)" +
+            "UNION SELECT distance FROM RoundTemplate WHERE distance LIKE ('% ' || :unit)" +
+            "UNION SELECT distance FROM Round WHERE distance LIKE ('% ' || :unit)")
+    fun getAll(unit: Dimension.Unit): List<Dimension>
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
index 6e2337225..86feff476 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
@@ -15,86 +15,70 @@
 
 package de.dreier.mytargets.base.db.dao
 
-import com.raizlabs.android.dbflow.config.FlowManager
-import com.raizlabs.android.dbflow.kotlinextensions.delete
-import com.raizlabs.android.dbflow.kotlinextensions.save
-import com.raizlabs.android.dbflow.sql.language.SQLite
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
-import de.dreier.mytargets.shared.AppDatabase
-import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
-import de.dreier.mytargets.shared.models.db.*
-
-object EndDAO {
-    fun loadEnds(): List<End> = SQLite.select().from(End::class.java).queryList()
-
-    fun loadAugmentedEnds(roundId: Long): MutableList<AugmentedEnd> = SQLite.select()
-            .from(End::class.java)
-            .where(End_Table.round.eq(roundId))
-            .orderBy(End_Table.index, true)
-            .queryList()
-            .map { AugmentedEnd(it, loadShots(it.id).toMutableList(), loadEndImages(it.id).toMutableList()) }
-            .toMutableList()
-
-    fun loadEnd(id: Long): End = SQLite.select()
-            .from(End::class.java)
-            .where(End_Table._id.eq(id))
-            .querySingle() ?: throw IllegalStateException("End $id does not exist")
-
-    fun loadEndOrNull(id: Long): End? = SQLite.select()
-            .from(End::class.java)
-            .where(End_Table._id.eq(id))
-            .querySingle()
-
-    fun loadEndImages(id: Long): List<EndImage> = SQLite.select()
-            .from(EndImage::class.java)
-            .where(EndImage_Table.end.eq(id))
-            .queryList()
-
-    fun loadShots(id: Long): MutableList<Shot> = SQLite.select()
-            .from(Shot::class.java)
-            .where(Shot_Table.end.eq(id))
-            .orderBy(Shot_Table.index, true)
-            .queryList().toMutableList()
-
-    fun saveEnd(end: End) {
-        end.save()
-    }
+import android.arch.persistence.room.*
+import de.dreier.mytargets.shared.models.db.End
+import de.dreier.mytargets.shared.models.db.EndImage
+import de.dreier.mytargets.shared.models.db.Shot
 
-    fun saveEnd(end: End, images: List<EndImage>, shots: List<Shot>) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            saveEnd(db, end, images, shots)
-        }
-    }
+@Dao
+abstract class EndDAO {
 
-    fun insertEnd(end: End, images: List<EndImage>, shots: List<Shot>) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            db.execSQL("UPDATE End SET `index` = `index` + 1 WHERE `index` >= ${end.index}")
-            saveEnd(db, end, images, shots)
-        }
+    @Query("SELECT * FROM End WHERE round = :roundId ORDER BY `index`")
+    abstract fun loadEnds(roundId: Long): MutableList<End>
+
+    @Query("SELECT * FROM EndImage WHERE end = :id")
+    abstract fun loadEndImages(id: Long): List<EndImage>
+
+    @Query("SELECT * FROM Shot WHERE end = :id ORDER BY `index`")
+    abstract fun loadShots(id: Long): List<Shot>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun saveEnd(end: End): Long
+
+    @Update
+    abstract fun updateEnd(end: End)
+
+    @Transaction
+    open fun insertEnd(end: End, images: List<EndImage>, shots: List<Shot>) {
+        incrementIndices(end.index)
+        saveCompleteEnd(end, images, shots)
     }
 
-    internal fun saveEnd(db: DatabaseWrapper, end: End, images: List<EndImage>, shots: List<Shot>) {
-        end.save(db)
-        SQLite.delete(EndImage::class.java)
-                .where(EndImage_Table.end.eq(end.id))
-                .execute(db)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun insertEndImages(images: List<EndImage>)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun insertShots(images: List<Shot>)
+
+    @Query("DELETE FROM EndImage WHERE end = (:endId)")
+    abstract fun deleteEndImages(endId: Long)
+
+    @Transaction
+    open fun saveCompleteEnd(end: End, images: List<EndImage>, shots: List<Shot>) {
+        end.id = saveEnd(end)
         for (image in images) {
             image.endId = end.id
-            image.save(db)
         }
-        SQLite.delete(Shot::class.java)
-                .where(Shot_Table.end.eq(end.id))
-                .execute(db)
+        insertEndImages(images)
+
         for (shot in shots) {
             shot.endId = end.id
-            shot.save(db)
         }
+        insertShots(shots)
     }
 
-    fun deleteEnd(end: End) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            end.delete(db)
-            db.execSQL("UPDATE End SET `index` = `index` - 1 WHERE `index` > ${end.index}")
-        }
+    @Transaction
+    open fun deleteEnd(end: End) {
+        deleteEndWithoutIndexUpdate(end)
+        decrementIndices(end.index)
     }
+
+    @Delete
+    abstract fun deleteEndWithoutIndexUpdate(end: End)
+
+    @Query("UPDATE End SET `index` = `index` - 1 WHERE `index` > :allAboveIndex")
+    abstract fun decrementIndices(allAboveIndex: Int)
+
+    @Query("UPDATE End SET `index` = `index` + 1 WHERE `index` >= :allAboveIndex")
+    abstract fun incrementIndices(allAboveIndex: Int)
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
index 328de25af..14ae3f354 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
@@ -15,32 +15,16 @@
 
 package de.dreier.mytargets.base.db.dao
 
-import com.raizlabs.android.dbflow.sql.language.SQLite
-import de.dreier.mytargets.shared.models.db.ArrowImage
-import de.dreier.mytargets.shared.models.db.BowImage
-import de.dreier.mytargets.shared.models.db.EndImage
-import java.util.*
+import android.arch.persistence.room.Dao
+import android.arch.persistence.room.Query
 
-object ImageDAO {
+@Dao
+interface ImageDAO {
     /**
      * Returns a list of file names, which are implicitly placed in the ../files/ folder of the app.
      */
-    fun loadAllFileNames(): List<String> {
-        val list = ArrayList<String>()
-        list.addAll(SQLite.select()
-                .from(BowImage::class.java)
-                .queryList()
-                .map { (_, fileName) -> fileName })
-        list.addAll(SQLite.select()
-                .from(EndImage::class.java)
-                .queryList()
-                .map { (_, fileName) -> fileName }
-        )
-        list.addAll(SQLite.select()
-                .from(ArrowImage::class.java)
-                .queryList()
-                .map { (_, fileName) -> fileName }
-        )
-        return list
-    }
+    @Query("SELECT fileName FROM BowImage " +
+            "UNION SELECT fileName FROM EndImage " +
+            "UNION SELECT fileName FROM ArrowImage")
+    fun loadAllFileNames(): List<String>
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
index 25a3cd8c8..108c81816 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
@@ -15,93 +15,64 @@
 
 package de.dreier.mytargets.base.db.dao
 
-import com.raizlabs.android.dbflow.config.FlowManager
-import com.raizlabs.android.dbflow.kotlinextensions.delete
-import com.raizlabs.android.dbflow.kotlinextensions.save
-import com.raizlabs.android.dbflow.sql.language.SQLite
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
-import de.dreier.mytargets.shared.AppDatabase
-import de.dreier.mytargets.shared.models.augmented.AugmentedRound
+import android.arch.persistence.room.*
 import de.dreier.mytargets.shared.models.db.End
-import de.dreier.mytargets.shared.models.db.End_Table
 import de.dreier.mytargets.shared.models.db.Round
-import de.dreier.mytargets.shared.models.db.Round_Table
 
-object RoundDAO {
-    fun loadRounds(roundIds: LongArray): List<Round> = SQLite.select()
-            .from(Round::class.java)
-            .where(Round_Table._id.`in`(roundIds.toList()))
-            .queryList()
+@Dao
+abstract class RoundDAO {
+    @Query("SELECT * FROM Round WHERE _id in (:roundIds)")
+    abstract fun loadRounds(roundIds: LongArray): List<Round>
 
-    fun loadRound(id: Long): Round = SQLite.select()
-            .from(Round::class.java)
-            .where(Round_Table._id.eq(id))
-            .querySingle() ?: throw IllegalStateException("Round $id does not exist")
+    @Query("SELECT * FROM Round WHERE training = :id ORDER BY `index`")
+    abstract fun loadRounds(id: Long): List<Round>
 
-    fun loadAugmentedRound(id: Long) = AugmentedRound(loadRound(id), EndDAO.loadAugmentedEnds(id))
+    @Query("SELECT * FROM Round WHERE _id = :id")
+    abstract fun loadRound(id: Long): Round
 
-    fun loadAugmentedRound(round: Round) = AugmentedRound(round, EndDAO.loadAugmentedEnds(round.id))
+    @Query("SELECT * FROM Round WHERE _id = :id")
+    abstract fun loadRoundOrNull(id: Long): Round?
 
-    fun loadRoundOrNull(id: Long): Round? = SQLite.select()
-            .from(Round::class.java)
-            .where(Round_Table._id.eq(id))
-            .querySingle()
+    @Query("SELECT * FROM End WHERE round = :id ORDER BY `index`")
+    abstract fun loadEnds(id: Long): MutableList<End>
 
-    fun loadEnds(id: Long): MutableList<End> = SQLite.select()
-            .from(End::class.java)
-            .where(End_Table.round.eq(id))
-            .orderBy(End_Table.index, true)
-            .queryList().toMutableList()
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun insertRound(round: Round): Long
 
-    fun saveRound(round: Round) {
-        round.save()
-    }
+    @Insert
+    abstract fun insertEnds(round: List<End>)
 
-    fun saveRound(round: Round, ends: List<End>) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            saveRound(db, round, ends)
-        }
-    }
+    @Update
+    abstract fun updateRound(round: Round)
 
-    private fun saveRound(db: DatabaseWrapper, round: Round, ends: List<End>) {
-        round.save(db)
-        SQLite.delete(End::class.java)
-                .where(End_Table.round.eq(round.id))
-                .execute(db)
+    @Query("DELETE FROM End WHERE round = :id")
+    abstract fun deleteEnds(id: Long)
+
+    @Transaction
+    open fun saveRound(round: Round, ends: List<End>) {
+        round.id = insertRound(round)
+        deleteEnds(round.id)
         for (end in ends) {
             end.roundId = round.id
-            end.save(db)
         }
+        insertEnds(ends)
     }
 
-    fun deleteRound(round: Round) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            round.delete(db)
-            db.execSQL("UPDATE Round SET `index` = `index` - 1 WHERE `index` > ${round.index}")
-        }
+    @Transaction
+    open fun deleteRound(round: Round) {
+        deleteRound(round)
+        decrementIndices(round.index)
     }
 
-    fun insertRound(round: AugmentedRound) {
-        insertRound(round.round, round.ends.map { it.end })
-        round.ends.forEach {
-            EndDAO.saveEnd(it.end, it.images, it.shots)
-        }
-    }
+    @Query("UPDATE Round SET `index` = `index` - 1 WHERE `index` > :allAboveIndex")
+    abstract fun decrementIndices(allAboveIndex: Int)
 
-    private fun insertRound(round: Round, ends: List<End>) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            db.execSQL("UPDATE Round SET `index` = `index` + 1 WHERE `index` >= ${round.index}")
-            saveRound(db, round, ends)
-        }
-    }
+    @Query("UPDATE Round SET `index` = `index` + 1 WHERE `index` >= :allAboveIndex")
+    abstract fun incrementIndices(allAboveIndex: Int)
 
-    fun saveRound(round: AugmentedRound) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            round.round.save(db)
-            for(end in round.ends) {
-                end.end.roundId = round.round.id
-                EndDAO.saveEnd(end.end, end.images, end.shots)
-            }
-        }
+    @Transaction
+    open fun insertRound(round: Round, ends: List<End>) {
+        incrementIndices(round.index)
+        saveRound(round, ends)
     }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
index d8875d839..ec7278520 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
@@ -15,29 +15,21 @@
 
 package de.dreier.mytargets.base.db.dao
 
-import com.raizlabs.android.dbflow.kotlinextensions.delete
-import com.raizlabs.android.dbflow.kotlinextensions.save
-import com.raizlabs.android.dbflow.sql.language.SQLite
+import android.arch.persistence.room.*
 import de.dreier.mytargets.shared.models.db.Signature
-import de.dreier.mytargets.shared.models.db.Signature_Table
 
-object SignatureDAO {
+@Dao
+interface SignatureDAO {
 
-    fun loadSignature(id: Long): Signature = SQLite.select()
-            .from(Signature::class.java)
-            .where(Signature_Table._id.eq(id))
-            .querySingle() ?: throw IllegalStateException("Signature $id does not exist")
+    @Query("SELECT * FROM Signature WHERE _id = :id")
+    fun loadSignature(id: Long): Signature
 
-    fun loadSignatureOrNull(id: Long): Signature? = SQLite.select()
-            .from(Signature::class.java)
-            .where(Signature_Table._id.eq(id))
-            .querySingle()
+    @Query("SELECT * FROM Signature WHERE _id = :id")
+    fun loadSignatureOrNull(id: Long): Signature?
 
-    fun saveSignature(signature: Signature) {
-        signature.save()
-    }
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun saveSignature(signature: Signature)
 
-    fun deleteSignature(signature: Signature) {
-        signature.delete()
-    }
+    @Delete
+    fun deleteSignature(signature: Signature)
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
index 286446f12..8830375a6 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
@@ -15,72 +15,50 @@
 
 package de.dreier.mytargets.base.db.dao
 
-import com.raizlabs.android.dbflow.config.FlowManager
-import com.raizlabs.android.dbflow.kotlinextensions.delete
-import com.raizlabs.android.dbflow.kotlinextensions.save
-import com.raizlabs.android.dbflow.sql.language.SQLite
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
-import de.dreier.mytargets.shared.AppDatabase
+import android.arch.persistence.room.*
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
 import de.dreier.mytargets.shared.models.db.RoundTemplate
-import de.dreier.mytargets.shared.models.db.RoundTemplate_Table
 import de.dreier.mytargets.shared.models.db.StandardRound
-import de.dreier.mytargets.shared.models.db.StandardRound_Table
 
-object StandardRoundDAO {
-    fun loadStandardRounds(): List<StandardRound> = SQLite.select().from(StandardRound::class.java).queryList()
+@Dao
+abstract class StandardRoundDAO {
+    @Query("SELECT * FROM StandardRound")
+    abstract fun loadStandardRounds(): List<StandardRound>
 
-    fun loadStandardRound(id: Long): StandardRound = SQLite.select()
-            .from(StandardRound::class.java)
-            .where(StandardRound_Table._id.eq(id))
-            .querySingle() ?: throw IllegalStateException("StandardRound $id does not exist")
+    @Query("SELECT * FROM StandardRound WHERE _id = :id")
+    abstract fun loadStandardRound(id: Long): StandardRound
 
-    fun loadAugmentedStandardRound(id: Long): AugmentedStandardRound = AugmentedStandardRound(loadStandardRound(id), loadRoundTemplates(id))
+    @Transaction
+    open fun loadAugmentedStandardRound(id: Long): AugmentedStandardRound = AugmentedStandardRound(loadStandardRound(id), loadRoundTemplates(id).toMutableList())
 
-    fun loadStandardRoundOrNull(id: Long): StandardRound? = SQLite.select()
-            .from(StandardRound::class.java)
-            .where(StandardRound_Table._id.eq(id))
-            .querySingle()
+    @Query("SELECT * FROM StandardRound WHERE _id = :id")
+    abstract fun loadStandardRoundOrNull(id: Long): StandardRound?
 
-    fun getAllSearch(query: String): List<StandardRound> {
-        val queryString = "%${query.replace(' ', '%')}%"
-        return SQLite.select()
-                .from(StandardRound::class.java)
-                .where(StandardRound_Table.name.like(queryString))
-                .and(StandardRound_Table.club.notEq(512))
-                .queryList()
-    }
+    @Query("SELECT * FROM StandardRound WHERE name LIKE :query AND club != 512")
+    abstract fun getAllSearch(query: String): List<StandardRound>
 
-    fun loadRoundTemplates(id: Long): ArrayList<RoundTemplate> = ArrayList(SQLite.select()
-            .from(RoundTemplate::class.java)
-            .where(RoundTemplate_Table.standardRound.eq(id))
-            .orderBy(RoundTemplate_Table.index, true)
-            .queryList()
-            .toMutableList())
+    @Query("SELECT * FROM RoundTemplate WHERE standardRound = :id ORDER BY `index`")
+    abstract fun loadRoundTemplates(id: Long): List<RoundTemplate>
 
-    fun saveStandardRound(standardRound: StandardRound, roundTemplates: List<RoundTemplate>) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            saveStandardRound(db, standardRound, roundTemplates)
-        }
-    }
+    @Insert
+    abstract fun insertStandardRound(round: StandardRound): Long
+
+    @Insert
+    abstract fun insertRoundTemplates(round: List<RoundTemplate>)
 
-    fun saveStandardRound(db: DatabaseWrapper, standardRound: StandardRound, roundTemplates: List<RoundTemplate>) {
-        standardRound.save(db)
-        SQLite.delete(RoundTemplate::class.java)
-                .where(RoundTemplate_Table.standardRound.eq(standardRound.id))
-                .execute(db)
+    @Query("DELETE FROM RoundTemplate WHERE standardRound = (:id)")
+    abstract fun deleteRoundTemplates(id: Long)
+
+    @Transaction
+    open fun saveStandardRound(standardRound: StandardRound, roundTemplates: List<RoundTemplate>) {
+        standardRound.id = insertStandardRound(standardRound)
+        deleteRoundTemplates(standardRound.id)
         for (roundTemplate in roundTemplates) {
             roundTemplate.standardRound = standardRound.id
-            roundTemplate.save(db)
         }
+        insertRoundTemplates(roundTemplates)
     }
 
-    fun deleteStandardRound(standardRound: StandardRound) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            SQLite.delete(RoundTemplate::class.java)
-                    .where(RoundTemplate_Table.standardRound.eq(standardRound.id))
-                    .execute(db)
-            standardRound.delete(db)
-        }
-    }
+    @Delete
+    abstract fun deleteStandardRound(standardRound: StandardRound)
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
index d2e84e85a..665610bf3 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
@@ -15,101 +15,36 @@
 
 package de.dreier.mytargets.base.db.dao
 
-import com.raizlabs.android.dbflow.config.FlowManager
-import com.raizlabs.android.dbflow.kotlinextensions.delete
-import com.raizlabs.android.dbflow.kotlinextensions.save
-import com.raizlabs.android.dbflow.sql.language.SQLite
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
-import de.dreier.mytargets.shared.AppDatabase
-import de.dreier.mytargets.shared.models.augmented.AugmentedTraining
-import de.dreier.mytargets.shared.models.db.*
+import android.arch.persistence.room.*
+import de.dreier.mytargets.shared.models.db.Round
+import de.dreier.mytargets.shared.models.db.Training
 
-object TrainingDAO {
-    fun loadTrainings(): List<Training> = SQLite.select()
-            .from(Training::class.java)
-            .queryList()
+@Dao
+abstract class TrainingDAO {
+    @Query("SELECT * FROM Training")
+    abstract fun loadTrainings(): List<Training>
 
-    fun loadTraining(id: Long): Training = SQLite.select()
-            .from(Training::class.java)
-            .where(Training_Table._id.eq(id))
-            .querySingle() ?: throw IllegalStateException("Training $id does not exist")
+    @Query("SELECT * FROM Training WHERE _id = :id")
+    abstract fun loadTraining(id: Long): Training
 
-    fun loadAugmentedTraining(id: Long): AugmentedTraining = AugmentedTraining(loadTraining(id), loadRounds(id)
-            .map { RoundDAO.loadAugmentedRound(it) }
-            .toMutableList())
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun saveTraining(training: Training): Long
 
-    fun loadRounds(id: Long): MutableList<Round> = SQLite.select()
-            .from(Round::class.java)
-            .where(Round_Table.training.eq(id))
-            .orderBy(Round_Table.index, true)
-            .queryList().toMutableList()
+    @Update
+    abstract fun updateTraining(training: Training)
 
-    fun saveTraining(training: Training) {
-        training.save()
-    }
-
-    fun saveTraining(training: Training, rounds: List<Round>) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            saveTraining(db, training, rounds)
-        }
-    }
-
-    private fun saveTraining(db: DatabaseWrapper, training: Training, rounds: List<Round>) {
-        training.save(db)
-//        SQLite.delete(Round::class.java)
-//                .where(Round_Table.training.eq(training.id))
-//                .execute(db)
+    @Transaction
+    open fun saveTraining(training: Training, rounds: List<Round>) {
+        training.id = saveTraining(training)
         for (round in rounds) {
             round.trainingId = training.id
-            round.save(db)
         }
+        insertRounds(rounds)
     }
 
-    fun insertTraining(training: AugmentedTraining) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            training.training.save(db)
-            training.rounds.forEach { round ->
-                round.round.trainingId = training.training.id
-                round.round.save(db)
-                for (end in round.ends) {
-                    end.end.roundId = round.round.id
-                    EndDAO.saveEnd(db, end.end, end.images, end.shots)
-                }
-            }
-        }
-    }
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun insertRounds(round: List<Round>)
 
-    fun deleteTraining(training: Training) {
-        FlowManager.getDatabase(AppDatabase::class.java).executeTransaction { db ->
-            training.delete(db)
-        }
-    }
-
-    fun getOrCreateArcherSignature(training: Training): Signature {
-        if (training.archerSignatureId != null) {
-            val signature = SignatureDAO.loadSignatureOrNull(training.archerSignatureId!!)
-            if (signature != null) {
-                return signature
-            }
-        }
-        val signature = Signature()
-        SignatureDAO.saveSignature(signature)
-        training.archerSignatureId = signature.id
-        saveTraining(training)
-        return signature
-    }
-
-    fun getOrCreateWitnessSignature(training: Training): Signature {
-        if (training.witnessSignatureId != null) {
-            val signature = SignatureDAO.loadSignatureOrNull(training.witnessSignatureId!!)
-            if (signature != null) {
-                return signature
-            }
-        }
-        val signature = Signature()
-        SignatureDAO.saveSignature(signature)
-        training.witnessSignatureId = signature.id
-        saveTraining(training)
-        return signature
-    }
+    @Delete
+    abstract fun deleteTraining(training: Training)
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
index 4b3cb8a12..eba71092e 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
@@ -20,7 +20,6 @@ import android.arch.persistence.room.migration.Migration
 import android.content.ContentValues
 import android.database.Cursor
 import android.database.sqlite.SQLiteDatabase.*
-import de.dreier.mytargets.base.db.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
@@ -176,7 +175,7 @@ object Migration9 : Migration(8, 9) {
         }
         res.close()
 
-        if (StandardRoundDAO.loadRoundTemplates(sr.id).isEmpty()) {
+        if (loadRoundTemplates(db, sr.id).isEmpty()) {
             return 0L
         }
         insertStandardRound(db, AugmentedStandardRound(sr, rounds))
@@ -226,6 +225,19 @@ object Migration9 : Migration(8, 9) {
         }
     }
 
+    private fun loadRoundTemplates(database: SupportSQLiteDatabase, sid: Long): List<RoundTemplate> {
+        val cursor = database.query("SELECT _id, r_index, arrows, target, scoring_style, " +
+                "target, scoring_style, distance, unit, size, target_unit, passes, sid " +
+                "FROM ROUND_TEMPLATE WHERE sid=?",
+                arrayOf(sid.toString()))
+        val r: MutableList<RoundTemplate> = mutableListOf()
+        if (cursor.moveToFirst()) {
+            r.add(cursorToRoundTemplate(cursor, 0))
+        }
+        cursor.close()
+        return r
+    }
+
     private fun getRoundTemplate(database: SupportSQLiteDatabase, sid: Long, index: Int): RoundTemplate? {
         val cursor = database.query("SELECT _id, r_index, arrows, target, scoring_style, " +
                 "target, scoring_style, distance, unit, size, target_unit, passes, sid " +
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
index 834c3ee88..e9bebeb5d 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
@@ -17,7 +17,8 @@ package de.dreier.mytargets.base.db.migrations
 
 import android.arch.persistence.db.SupportSQLiteDatabase
 import android.arch.persistence.room.RoomDatabase
-import de.dreier.mytargets.base.db.dao.StandardRoundDAO
+import de.dreier.mytargets.shared.models.db.RoundTemplate
+import de.dreier.mytargets.shared.models.db.StandardRound
 import de.dreier.mytargets.shared.utils.StandardRoundFactory
 
 object RoomCreationCallback : RoomDatabase.Callback() {
@@ -30,10 +31,35 @@ object RoomCreationCallback : RoomDatabase.Callback() {
     fun fillStandardRound(db: SupportSQLiteDatabase) {
         val standardRounds = StandardRoundFactory.initTable()
         for (standardRound in standardRounds) {
-            StandardRoundDAO.saveStandardRound(db, standardRound.standardRound, standardRound.roundTemplates)
+            saveStandardRound(db, standardRound.standardRound, standardRound.roundTemplates)
         }
     }
 
+    private fun saveStandardRound(db: SupportSQLiteDatabase, standardRound: StandardRound, roundTemplates: List<RoundTemplate>) {
+        insertStandardRound(db, standardRound)
+        for (roundTemplate in roundTemplates) {
+            roundTemplate.standardRound = standardRound.id
+            insertRoundTemplate(db, roundTemplate)
+        }
+    }
+
+    private fun insertStandardRound(db: SupportSQLiteDatabase, standardRound: StandardRound) {
+        db.query("INSERT OR REPLACE INTO StandardRound(_id, club, name) VALUES (?,?,?)",
+                arrayOf(standardRound.id, standardRound.club, standardRound.name))
+    }
+
+    private fun insertRoundTemplate(db: SupportSQLiteDatabase, roundTemplate: RoundTemplate) {
+        db.query("INSERT OR REPLACE INTO RoundTemplate(_id, standardRound, index, " +
+                "shotsPerEnd, endCount, distance, targetId, targetScoringStyle, targetDiameter) " +
+                "VALUES (?,?,?,?,?,?,?,?,?)",
+                arrayOf(roundTemplate.id, roundTemplate.standardRound, roundTemplate.index,
+                        roundTemplate.shotsPerEnd, roundTemplate.endCount,
+                        "${roundTemplate.distance.value} ${roundTemplate.distance.unit}",
+                        roundTemplate.targetTemplate.id,
+                        roundTemplate.targetTemplate.scoringStyleIndex,
+                        roundTemplate.targetTemplate.diameter))
+    }
+
     fun createScoreTriggers(database: SupportSQLiteDatabase) {
         database.execSQL("CREATE TRIGGER round_sum_score " +
                 "AFTER UPDATE ON `End` " +
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
index ec02764c6..1ab082c30 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
@@ -18,7 +18,7 @@ package de.dreier.mytargets.shared
 import android.arch.persistence.room.Database
 import android.arch.persistence.room.RoomDatabase
 import android.arch.persistence.room.TypeConverters
-import de.dreier.mytargets.base.db.dao.TrainingDAO
+import de.dreier.mytargets.base.db.dao.*
 import de.dreier.mytargets.shared.models.db.*
 import de.dreier.mytargets.shared.utils.typeconverters.*
 
@@ -54,5 +54,13 @@ abstract class AppDatabase : RoomDatabase() {
         const val VERSION = 26
     }
 
+    abstract fun arrowDAO(): ArrowDAO
+    abstract fun bowDAO(): BowDAO
+    abstract fun dimensionDAO(): DimensionDAO
+    abstract fun endDAO(): EndDAO
+    abstract fun imageDAO(): ImageDAO
+    abstract fun roundDAO(): RoundDAO
+    abstract fun signatureDAO(): SignatureDAO
+    abstract fun standardRoundDAO(): StandardRoundDAO
     abstract fun trainingDAO(): TrainingDAO
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
index dc2a606fa..28d9d90ba 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
@@ -17,6 +17,7 @@ package de.dreier.mytargets.shared.models
 
 import android.annotation.SuppressLint
 import android.arch.persistence.room.ColumnInfo
+import android.arch.persistence.room.Ignore
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.targets.TargetFactory
@@ -42,10 +43,13 @@ data class Target(
 ) : IIdProvider, Comparable<Target>, Parcelable {
 
     @IgnoredOnParcel
+    @delegate:Ignore
     val model: TargetModelBase by lazy { TargetFactory.getTarget(id.toInt()) }
     @IgnoredOnParcel
+    @delegate:Ignore
     val drawable: TargetDrawable by lazy { TargetDrawable(this) }
 
+    @Ignore
     constructor(target: Long, scoringStyle: Int) : this(target, scoringStyle, Dimension.UNKNOWN) {
         this.diameter = model.diameters[0]
     }
@@ -73,7 +77,7 @@ data class Target(
         return model.getScoringStyle(scoringStyleIndex)
     }
 
-    fun getReachedScore(shots: MutableList<Shot>): Score {
+    fun getReachedScore(shots: List<Shot>): Score {
         return getScoringStyle().getReachedScore(shots)
     }
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt
index 9aedeb35f..b997a0e24 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt
@@ -64,12 +64,5 @@ data class Signature(
 
             override fun newArray(size: Int) = arrayOfNulls<Signature>(size)
         }
-
-        operator fun get(signatureId: Long): Signature? {
-            return SQLite.select()
-                    .from(Signature::class.java)
-                    .where(Signature_Table._id.eq(signatureId))
-                    .querySingle()
-        }
     }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ColorScoringStyle.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ColorScoringStyle.kt
index f609f1cfc..2757f1588 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ColorScoringStyle.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ColorScoringStyle.kt
@@ -21,7 +21,7 @@ import de.dreier.mytargets.shared.models.db.Shot
 
 class ColorScoringStyle(@StringRes title: Int, private val maxEndPoints: Int, vararg points: Int) : ScoringStyle(title, false, *points) {
 
-    override fun getReachedScore(shots: MutableList<Shot>): Score {
+    override fun getReachedScore(shots: List<Shot>): Score {
         val reachedScore = shots
                 .map { s -> getPointsByScoringRing(s.scoringRing, s.index) }
                 .distinct()
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/DimensionConverter.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/DimensionConverter.kt
index 6ca9e044e..b30aaf7bd 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/DimensionConverter.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/DimensionConverter.kt
@@ -32,4 +32,9 @@ class DimensionConverters {
         val unit = data.substring(index + 1)
         return Dimension.from(value.toFloat(), unit)
     }
+
+    @TypeConverter
+    fun getDBValue(model: Dimension.Unit): String {
+        return model.abbreviation
+    }
 }

From 3d6993572886f1c2b7ae9b12a83ae24d1c7a16df Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier@cqse.eu>
Date: Sun, 28 Jan 2018 17:13:24 +0100
Subject: [PATCH 063/102] Fixes (App opens again)

---
 .../scoreboard/SignatureDialogFragment.kt         |  4 ++--
 .../features/training/input/InputActivity.kt      |  5 +++--
 .../views/selector/EnvironmentSelector.kt         |  9 ++++++---
 .../mytargets/base/db/TrainingRepository.kt       |  4 ++--
 .../de/dreier/mytargets/base/db/dao/EndDAO.kt     |  9 +++++++++
 .../dreier/mytargets/base/db/dao/SignatureDAO.kt  |  5 ++++-
 .../mytargets/base/db/dao/StandardRoundDAO.kt     |  4 ++--
 .../dreier/mytargets/base/db/dao/TrainingDAO.kt   |  4 ++--
 .../mytargets/base/db/migrations/Migration26.kt   | 15 +++++++++++++++
 .../mytargets/base/db/migrations/Migration9.kt    |  5 ++---
 .../base/db/migrations/RoomCreationCallback.kt    | 10 ++++++----
 .../dreier/mytargets/shared/models/Dimension.kt   |  5 -----
 12 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
index 655a028ca..503052020 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
@@ -48,7 +48,7 @@ class SignatureDialogFragment : DialogFragment() {
                     .inputType(InputType.TYPE_CLASS_TEXT)
                     .input(defaultName, signature.name) { _, input ->
                         signature.name = input.toString()
-                        signatureDAO.saveSignature(signature)
+                        signatureDAO.updateSignature(signature)
                         binding.signer.text = signature.name
                     }
                     .negativeText(android.R.string.cancel)
@@ -61,7 +61,7 @@ class SignatureDialogFragment : DialogFragment() {
                 bitmap = binding.signatureView.transparentSignatureBitmap
             }
             signature.bitmap = bitmap
-            signatureDAO.saveSignature(signature)
+            signatureDAO.updateSignature(signature)
             dismiss()
         }
         binding.clear.setOnClickListener { binding.signatureView.clear() }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
index 68811454d..2ef820322 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
@@ -148,7 +148,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
             for (image in imageList.removedImages) {
                 File(filesDir, image).delete()
             }
-            saveCurrentEnd()
+            endDAO.replaceImages(currentEnd.end, currentEnd.images)
             updateEnd()
             invalidateOptionsMenu()
         }
@@ -160,7 +160,8 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
             currentEnd.end.saveTime = LocalTime.now()
         }
         currentEnd.end.score = data!!.currentRound.round.target.getReachedScore(currentEnd.shots)
-        endDAO.saveCompleteEnd(currentEnd.end, currentEnd.images, currentEnd.shots)
+        endDAO.updateEnd(currentEnd.end)
+        endDAO.updateShots(currentEnd.shots)
     }
 
     override fun onDestroy() {
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
index 393bd95b4..210d50eef 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
@@ -94,8 +94,7 @@ class EnvironmentSelector @JvmOverloads constructor(context: Context, attrs: Att
         }
         if (ContextCompat.checkSelfPermission(fragment.context!!, ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
             setDefaultWeather()
-            fragment.requestPermissions(arrayOf(ACCESS_FINE_LOCATION),
-                    requestCode)
+            fragment.requestPermissions(arrayOf(ACCESS_FINE_LOCATION), requestCode)
         } else {
             queryWeatherInfo(fragment.context!!)
         }
@@ -152,7 +151,11 @@ class EnvironmentSelector @JvmOverloads constructor(context: Context, attrs: Att
 
             if (addresses.size > 0) {
                 val fetchedAddress = addresses[0]
-                "${fetchedAddress.locality}, ${fetchedAddress.subLocality}"
+                var address = fetchedAddress.locality
+                if(fetchedAddress.subLocality != null) {
+                    address += ", ${fetchedAddress.subLocality}"
+                }
+                address
             } else {
                 null
             }
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt b/shared/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt
index 77eca0b5f..d97ea998a 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt
@@ -53,7 +53,7 @@ class TrainingRepository(
             }
         }
         val signature = Signature()
-        signatureDAO.saveSignature(signature)
+        signature.id = signatureDAO.insertSignature(signature)
         training.archerSignatureId = signature.id
         trainingDAO.saveTraining(training)
         return signature
@@ -67,7 +67,7 @@ class TrainingRepository(
             }
         }
         val signature = Signature()
-        signatureDAO.saveSignature(signature)
+        signature.id = signatureDAO.insertSignature(signature)
         training.witnessSignatureId = signature.id
         trainingDAO.saveTraining(training)
         return signature
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
index 86feff476..c8b0efba3 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
@@ -38,6 +38,9 @@ abstract class EndDAO {
     @Update
     abstract fun updateEnd(end: End)
 
+    @Update
+    abstract fun updateShots(shots: List<Shot>)
+
     @Transaction
     open fun insertEnd(end: End, images: List<EndImage>, shots: List<Shot>) {
         incrementIndices(end.index)
@@ -81,4 +84,10 @@ abstract class EndDAO {
 
     @Query("UPDATE End SET `index` = `index` + 1 WHERE `index` >= :allAboveIndex")
     abstract fun incrementIndices(allAboveIndex: Int)
+
+    @Transaction
+    open fun replaceImages(end: End, images: List<EndImage>) {
+        deleteEndImages(end.id)
+        insertEndImages(images)
+    }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
index ec7278520..8e4690c8e 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
@@ -28,7 +28,10 @@ interface SignatureDAO {
     fun loadSignatureOrNull(id: Long): Signature?
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun saveSignature(signature: Signature)
+    fun insertSignature(signature: Signature): Long
+
+    @Update
+    fun updateSignature(signature: Signature)
 
     @Delete
     fun deleteSignature(signature: Signature)
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
index 8830375a6..91a64903c 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
@@ -44,7 +44,7 @@ abstract class StandardRoundDAO {
     abstract fun insertStandardRound(round: StandardRound): Long
 
     @Insert
-    abstract fun insertRoundTemplates(round: List<RoundTemplate>)
+    abstract fun insertRoundTemplate(round: RoundTemplate): Long
 
     @Query("DELETE FROM RoundTemplate WHERE standardRound = (:id)")
     abstract fun deleteRoundTemplates(id: Long)
@@ -55,8 +55,8 @@ abstract class StandardRoundDAO {
         deleteRoundTemplates(standardRound.id)
         for (roundTemplate in roundTemplates) {
             roundTemplate.standardRound = standardRound.id
+            roundTemplate.id = insertRoundTemplate(roundTemplate)
         }
-        insertRoundTemplates(roundTemplates)
     }
 
     @Delete
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt b/shared/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
index 665610bf3..d880b5cc0 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
@@ -38,12 +38,12 @@ abstract class TrainingDAO {
         training.id = saveTraining(training)
         for (round in rounds) {
             round.trainingId = training.id
+            round.id = insertRound(round)
         }
-        insertRounds(rounds)
     }
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    abstract fun insertRounds(round: List<Round>)
+    abstract fun insertRound(round: Round): Long
 
     @Delete
     abstract fun deleteTraining(training: Training)
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
index 5fa44f9dc..2a856a8fc 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
@@ -23,6 +23,21 @@ import de.dreier.mytargets.shared.models.db.Shot
 
 object Migration26 : Migration(25, 26) {
     override fun migrate(database: SupportSQLiteDatabase) {
+//        database.execSQL("CREATE TABLE IF NOT EXISTS `NewTraining` " +
+//                "(`game_name` TEXT NOT NULL, " +
+//                "PRIMARY KEY(`game_name`))")
+//
+//        // 2. Copy the data
+//        database.execSQL("INSERT INTO $TABLE_NAME_TEMP (game_name) "
+//                + "SELECT game_name "
+//                + "FROM $TABLE_NAME")
+//
+//        // 3. Remove the old table
+//        database.execSQL("DROP TABLE $TABLE_NAME")
+//
+//        // 4. Change the table name to the correct one
+//        database.execSQL("ALTER TABLE $TABLE_NAME_TEMP RENAME TO $TABLE_NAME")
+
         database.execSQL("ALTER TABLE `Training` ADD COLUMN reachedPoints INTEGER;")
         database.execSQL("ALTER TABLE `Training` ADD COLUMN totalPoints INTEGER;")
         database.execSQL("ALTER TABLE `Training` ADD COLUMN shotCount INTEGER;")
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
index eba71092e..e35bcef02 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
@@ -208,13 +208,12 @@ object Migration9 : Migration(8, 9) {
         values.put("sid", item.standardRound)
         values.put("r_index", item.index)
         values.put("distance", item.distance.value)
-        values.put("unit", Dimension.Unit.toStringHandleNull(item.distance.unit))
+        values.put("unit", item.distance.unit?.toString())
         values.put("passes", item.endCount)
         values.put("arrows", item.shotsPerEnd)
         values.put("target", item.targetTemplate.id.toInt())
         values.put("size", item.targetTemplate.diameter.value)
-        values.put("target_unit", Dimension.Unit
-                .toStringHandleNull(item.targetTemplate.diameter.unit))
+        values.put("target_unit", item.targetTemplate.diameter.unit?.toString())
         values.put("scoring_style", item.targetTemplate.scoringStyleIndex)
         if (item.id == 0L) {
             item.id = database
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
index e9bebeb5d..e1a42c4a4 100644
--- a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
+++ b/shared/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
@@ -35,7 +35,8 @@ object RoomCreationCallback : RoomDatabase.Callback() {
         }
     }
 
-    private fun saveStandardRound(db: SupportSQLiteDatabase, standardRound: StandardRound, roundTemplates: List<RoundTemplate>) {
+    private fun saveStandardRound(db: SupportSQLiteDatabase, standardRound: StandardRound,
+                                  roundTemplates: List<RoundTemplate>) {
         insertStandardRound(db, standardRound)
         for (roundTemplate in roundTemplates) {
             roundTemplate.standardRound = standardRound.id
@@ -44,12 +45,12 @@ object RoomCreationCallback : RoomDatabase.Callback() {
     }
 
     private fun insertStandardRound(db: SupportSQLiteDatabase, standardRound: StandardRound) {
-        db.query("INSERT OR REPLACE INTO StandardRound(_id, club, name) VALUES (?,?,?)",
+        db.execSQL("INSERT OR REPLACE INTO StandardRound(_id, club, name) VALUES (?,?,?)",
                 arrayOf(standardRound.id, standardRound.club, standardRound.name))
     }
 
     private fun insertRoundTemplate(db: SupportSQLiteDatabase, roundTemplate: RoundTemplate) {
-        db.query("INSERT OR REPLACE INTO RoundTemplate(_id, standardRound, index, " +
+        db.execSQL("INSERT OR REPLACE INTO RoundTemplate(_id, standardRound, `index`, " +
                 "shotsPerEnd, endCount, distance, targetId, targetScoringStyle, targetDiameter) " +
                 "VALUES (?,?,?,?,?,?,?,?,?)",
                 arrayOf(roundTemplate.id, roundTemplate.standardRound, roundTemplate.index,
@@ -57,7 +58,8 @@ object RoomCreationCallback : RoomDatabase.Callback() {
                         "${roundTemplate.distance.value} ${roundTemplate.distance.unit}",
                         roundTemplate.targetTemplate.id,
                         roundTemplate.targetTemplate.scoringStyleIndex,
-                        roundTemplate.targetTemplate.diameter))
+                        roundTemplate.targetTemplate.diameter.value.toString() + " " +
+                                roundTemplate.targetTemplate.diameter.unit))
     }
 
     fun createScoreTriggers(database: SupportSQLiteDatabase) {
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Dimension.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Dimension.kt
index 5b246a4da..8b3c03c32 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Dimension.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Dimension.kt
@@ -70,7 +70,6 @@ data class Dimension(val value: Float, val unit: Unit?) : IIdProvider, Comparabl
         }
 
         companion object {
-
             fun from(unit: String?): Unit? {
                 return when (unit) {
                     "cm" -> CENTIMETER
@@ -82,10 +81,6 @@ data class Dimension(val value: Float, val unit: Unit?) : IIdProvider, Comparabl
                     else -> null
                 }
             }
-
-            fun toStringHandleNull(unit: Unit?): String? {
-                return unit?.toString()
-            }
         }
     }
 

From f96ffb003f4577cf527af458a9b880749573589b Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier@cqse.eu>
Date: Sun, 28 Jan 2018 17:24:26 +0100
Subject: [PATCH 064/102] Moved database related classes to app module

---
 .../26.json                                   | 1019 +++++++++++++++++
 .../de/dreier/mytargets/app/MigrationTest.kt  |    6 +-
 .../test/utils/rules/DbTestRuleBase.kt        |   11 +-
 .../mytargets/app/ApplicationInstance.kt      |    2 +-
 .../dreier/mytargets/base/db}/AppDatabase.kt  |    6 +-
 .../dreier/mytargets/base/db/EndRepository.kt |    0
 .../mytargets/base/db/RoundRepository.kt      |    0
 .../mytargets/base/db/TrainingRepository.kt   |    0
 .../dreier/mytargets/base/db/dao/ArrowDAO.kt  |    0
 .../de/dreier/mytargets/base/db/dao/BowDAO.kt |    0
 .../mytargets/base/db/dao/DimensionDAO.kt     |    0
 .../de/dreier/mytargets/base/db/dao/EndDAO.kt |    0
 .../dreier/mytargets/base/db/dao/ImageDAO.kt  |    0
 .../dreier/mytargets/base/db/dao/RoundDAO.kt  |    0
 .../mytargets/base/db/dao/SignatureDAO.kt     |    0
 .../mytargets/base/db/dao/StandardRoundDAO.kt |    0
 .../mytargets/base/db/dao/TrainingDAO.kt      |    0
 .../base/db/migrations/Migration10.kt         |    0
 .../base/db/migrations/Migration11.kt         |    0
 .../base/db/migrations/Migration12.kt         |    0
 .../base/db/migrations/Migration13.kt         |    0
 .../base/db/migrations/Migration14.kt         |    0
 .../base/db/migrations/Migration15.kt         |    0
 .../base/db/migrations/Migration16.kt         |    0
 .../base/db/migrations/Migration17.kt         |    0
 .../base/db/migrations/Migration18.kt         |    0
 .../base/db/migrations/Migration19.kt         |    0
 .../base/db/migrations/Migration2.kt          |    0
 .../base/db/migrations/Migration20.kt         |    0
 .../base/db/migrations/Migration21.kt         |    0
 .../base/db/migrations/Migration22.kt         |    0
 .../base/db/migrations/Migration23.kt         |    0
 .../base/db/migrations/Migration24.kt         |    0
 .../base/db/migrations/Migration25.kt         |    0
 .../base/db/migrations/Migration26.kt         |    0
 .../base/db/migrations/Migration3.kt          |    0
 .../base/db/migrations/Migration4.kt          |    0
 .../base/db/migrations/Migration5.kt          |    0
 .../base/db/migrations/Migration6.kt          |    0
 .../base/db/migrations/Migration7.kt          |    0
 .../base/db/migrations/Migration8.kt          |    0
 .../base/db/migrations/Migration9.kt          |    0
 .../db/migrations/RoomCreationCallback.kt     |    0
 .../db}/typeconverters/BitmapConverters.kt    |    2 +-
 .../db}/typeconverters/DimensionConverter.kt  |    4 +-
 .../db}/typeconverters/EBowTypeConverters.kt  |    2 +-
 .../db}/typeconverters/EWeatherConverters.kt  |    2 +-
 .../db}/typeconverters/LocalDateConverters.kt |    2 +-
 .../db}/typeconverters/LocalTimeConverters.kt |    2 +-
 .../db}/typeconverters/ThumbnailConverters.kt |    2 +-
 .../features/scoreboard/ScoreboardUtils.kt    |    2 +-
 .../layout/DefaultScoreboardLayout.kt         |    4 +-
 .../settings/backup/provider/BackupUtils.kt   |    2 +-
 .../features/statistics/CsvExporter.kt        |    2 +-
 .../mytargets/utils/backup/DbBackupHelper.kt  |    2 +-
 shared/build.gradle                           |    1 -
 56 files changed, 1042 insertions(+), 31 deletions(-)
 create mode 100644 app/schemas/de.dreier.mytargets.base.db.AppDatabase/26.json
 rename {shared/src/main/java/de/dreier/mytargets/shared => app/src/main/java/de/dreier/mytargets/base/db}/AppDatabase.kt (93%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/EndRepository.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/RoundRepository.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration10.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration11.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration12.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration13.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration14.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration15.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration16.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration17.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration18.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration19.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration2.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration20.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration21.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration24.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration25.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration5.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration7.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration8.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt (100%)
 rename {shared => app}/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt (100%)
 rename {shared/src/main/java/de/dreier/mytargets/shared/utils => app/src/main/java/de/dreier/mytargets/base/db}/typeconverters/BitmapConverters.kt (94%)
 rename {shared/src/main/java/de/dreier/mytargets/shared/utils => app/src/main/java/de/dreier/mytargets/base/db}/typeconverters/DimensionConverter.kt (92%)
 rename {shared/src/main/java/de/dreier/mytargets/shared/utils => app/src/main/java/de/dreier/mytargets/base/db}/typeconverters/EBowTypeConverters.kt (94%)
 rename {shared/src/main/java/de/dreier/mytargets/shared/utils => app/src/main/java/de/dreier/mytargets/base/db}/typeconverters/EWeatherConverters.kt (94%)
 rename {shared/src/main/java/de/dreier/mytargets/shared/utils => app/src/main/java/de/dreier/mytargets/base/db}/typeconverters/LocalDateConverters.kt (94%)
 rename {shared/src/main/java/de/dreier/mytargets/shared/utils => app/src/main/java/de/dreier/mytargets/base/db}/typeconverters/LocalTimeConverters.kt (94%)
 rename {shared/src/main/java/de/dreier/mytargets/shared/utils => app/src/main/java/de/dreier/mytargets/base/db}/typeconverters/ThumbnailConverters.kt (94%)

diff --git a/app/schemas/de.dreier.mytargets.base.db.AppDatabase/26.json b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/26.json
new file mode 100644
index 000000000..413343ab1
--- /dev/null
+++ b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/26.json
@@ -0,0 +1,1019 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 26,
+    "identityHash": "073ada58fac1a02407d87cc2562ed1dc",
+    "entities": [
+      {
+        "tableName": "Arrow",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `maxArrowNumber` INTEGER NOT NULL, `length` TEXT, `material` TEXT, `spine` TEXT, `weight` TEXT, `tipWeight` TEXT, `vanes` TEXT, `nock` TEXT, `comment` TEXT, `diameter` TEXT NOT NULL, `thumbnail` BLOB)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "maxArrowNumber",
+            "columnName": "maxArrowNumber",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "length",
+            "columnName": "length",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "material",
+            "columnName": "material",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "spine",
+            "columnName": "spine",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tipWeight",
+            "columnName": "tipWeight",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "vanes",
+            "columnName": "vanes",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "nock",
+            "columnName": "nock",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "diameter",
+            "columnName": "diameter",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thumbnail",
+            "columnName": "thumbnail",
+            "affinity": "BLOB",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ArrowImage",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `fileName` TEXT NOT NULL, `arrow` INTEGER, FOREIGN KEY(`arrow`) REFERENCES `Arrow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fileName",
+            "columnName": "fileName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "arrowId",
+            "columnName": "arrow",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Arrow",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "arrow"
+            ],
+            "referencedColumns": [
+              "_id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Bow",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `type` INTEGER, `brand` TEXT, `size` TEXT, `braceHeight` TEXT, `tiller` TEXT, `limbs` TEXT, `sight` TEXT, `drawWeight` TEXT, `stabilizer` TEXT, `clicker` TEXT, `button` TEXT, `string` TEXT, `nockingPoint` TEXT, `letoffWeight` TEXT, `arrowRest` TEXT, `restHorizontalPosition` TEXT, `restVerticalPosition` TEXT, `restStiffness` TEXT, `camSetting` TEXT, `scopeMagnification` TEXT, `description` TEXT, `thumbnail` BLOB)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "brand",
+            "columnName": "brand",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "size",
+            "columnName": "size",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "braceHeight",
+            "columnName": "braceHeight",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tiller",
+            "columnName": "tiller",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limbs",
+            "columnName": "limbs",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "sight",
+            "columnName": "sight",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "drawWeight",
+            "columnName": "drawWeight",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "stabilizer",
+            "columnName": "stabilizer",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "clicker",
+            "columnName": "clicker",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "button",
+            "columnName": "button",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "string",
+            "columnName": "string",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "nockingPoint",
+            "columnName": "nockingPoint",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "letoffWeight",
+            "columnName": "letoffWeight",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "arrowRest",
+            "columnName": "arrowRest",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "restHorizontalPosition",
+            "columnName": "restHorizontalPosition",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "restVerticalPosition",
+            "columnName": "restVerticalPosition",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "restStiffness",
+            "columnName": "restStiffness",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "camSetting",
+            "columnName": "camSetting",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "scopeMagnification",
+            "columnName": "scopeMagnification",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "thumbnail",
+            "columnName": "thumbnail",
+            "affinity": "BLOB",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BowImage",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `fileName` TEXT NOT NULL, `bow` INTEGER, FOREIGN KEY(`bow`) REFERENCES `Bow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fileName",
+            "columnName": "fileName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bowId",
+            "columnName": "bow",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Bow",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "bow"
+            ],
+            "referencedColumns": [
+              "_id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "End",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `index` INTEGER NOT NULL, `round` INTEGER, `exact` INTEGER NOT NULL, `saveTime` TEXT, `comment` TEXT NOT NULL, `reachedPoints` INTEGER NOT NULL, `totalPoints` INTEGER NOT NULL, `shotCount` INTEGER NOT NULL, FOREIGN KEY(`round`) REFERENCES `Round`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "index",
+            "columnName": "index",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roundId",
+            "columnName": "round",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "exact",
+            "columnName": "exact",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saveTime",
+            "columnName": "saveTime",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "score.reachedPoints",
+            "columnName": "reachedPoints",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "score.totalPoints",
+            "columnName": "totalPoints",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "score.shotCount",
+            "columnName": "shotCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Round",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "round"
+            ],
+            "referencedColumns": [
+              "_id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "EndImage",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `fileName` TEXT NOT NULL, `end` INTEGER, FOREIGN KEY(`end`) REFERENCES `End`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "_id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fileName",
+            "columnName": "fileName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "endId",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "End",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "end"
+            ],
+            "referencedColumns": [
+              "_id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Round",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `training` INTEGER, `index` INTEGER NOT NULL, `shotsPerEnd` INTEGER NOT NULL, `maxEndCount` INTEGER, `distance` TEXT NOT NULL, `comment` TEXT NOT NULL, `targetId` INTEGER NOT NULL, `targetScoringStyle` INTEGER NOT NULL, `targetDiameter` TEXT NOT NULL, `reachedPoints` INTEGER NOT NULL, `totalPoints` INTEGER NOT NULL, `shotCount` INTEGER NOT NULL, FOREIGN KEY(`training`) REFERENCES `Training`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "trainingId",
+            "columnName": "training",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "index",
+            "columnName": "index",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shotsPerEnd",
+            "columnName": "shotsPerEnd",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "maxEndCount",
+            "columnName": "maxEndCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "distance",
+            "columnName": "distance",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "target.id",
+            "columnName": "targetId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "target.scoringStyleIndex",
+            "columnName": "targetScoringStyle",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "target.diameter",
+            "columnName": "targetDiameter",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "score.reachedPoints",
+            "columnName": "reachedPoints",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "score.totalPoints",
+            "columnName": "totalPoints",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "score.shotCount",
+            "columnName": "shotCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Training",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "training"
+            ],
+            "referencedColumns": [
+              "_id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "RoundTemplate",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `standardRound` INTEGER, `index` INTEGER NOT NULL, `shotsPerEnd` INTEGER NOT NULL, `endCount` INTEGER NOT NULL, `distance` TEXT NOT NULL, `targetId` INTEGER NOT NULL, `targetScoringStyle` INTEGER NOT NULL, `targetDiameter` TEXT NOT NULL, FOREIGN KEY(`standardRound`) REFERENCES `StandardRound`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "standardRound",
+            "columnName": "standardRound",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "index",
+            "columnName": "index",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shotsPerEnd",
+            "columnName": "shotsPerEnd",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "endCount",
+            "columnName": "endCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "distance",
+            "columnName": "distance",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "targetTemplate.id",
+            "columnName": "targetId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "targetTemplate.scoringStyleIndex",
+            "columnName": "targetScoringStyle",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "targetTemplate.diameter",
+            "columnName": "targetDiameter",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "StandardRound",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "standardRound"
+            ],
+            "referencedColumns": [
+              "_id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Shot",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `index` INTEGER NOT NULL, `end` INTEGER, `x` REAL NOT NULL, `y` REAL NOT NULL, `scoringRing` INTEGER NOT NULL, `arrowNumber` TEXT, FOREIGN KEY(`end`) REFERENCES `End`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "index",
+            "columnName": "index",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "endId",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "x",
+            "columnName": "x",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "y",
+            "columnName": "y",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scoringRing",
+            "columnName": "scoringRing",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "arrowNumber",
+            "columnName": "arrowNumber",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "End",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "end"
+            ],
+            "referencedColumns": [
+              "_id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "SightMark",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `bow` INTEGER, `distance` TEXT NOT NULL, `value` TEXT, FOREIGN KEY(`bow`) REFERENCES `Bow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bowId",
+            "columnName": "bow",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "distance",
+            "columnName": "distance",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Bow",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "bow"
+            ],
+            "referencedColumns": [
+              "_id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Signature",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `bitmap` BLOB)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bitmap",
+            "columnName": "bitmap",
+            "affinity": "BLOB",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StandardRound",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `club` INTEGER NOT NULL, `name` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "club",
+            "columnName": "club",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Training",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `title` TEXT NOT NULL, `date` TEXT NOT NULL, `standardRound` INTEGER, `bow` INTEGER, `arrow` INTEGER, `arrowNumbering` INTEGER NOT NULL, `comment` TEXT NOT NULL, `archerSignature` INTEGER, `witnessSignature` INTEGER, `indoor` INTEGER NOT NULL, `weather` INTEGER NOT NULL, `windSpeed` INTEGER NOT NULL, `windDirection` INTEGER NOT NULL, `location` TEXT NOT NULL, `reachedPoints` INTEGER NOT NULL, `totalPoints` INTEGER NOT NULL, `shotCount` INTEGER NOT NULL, FOREIGN KEY(`arrow`) REFERENCES `Arrow`(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`bow`) REFERENCES `Bow`(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`standardRound`) REFERENCES `StandardRound`(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`archerSignature`) REFERENCES `Signature`(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`witnessSignature`) REFERENCES `Signature`(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "standardRoundId",
+            "columnName": "standardRound",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "bowId",
+            "columnName": "bow",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "arrowId",
+            "columnName": "arrow",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "arrowNumbering",
+            "columnName": "arrowNumbering",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "archerSignatureId",
+            "columnName": "archerSignature",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "witnessSignatureId",
+            "columnName": "witnessSignature",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "environment.indoor",
+            "columnName": "indoor",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "environment.weather",
+            "columnName": "weather",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "environment.windSpeed",
+            "columnName": "windSpeed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "environment.windDirection",
+            "columnName": "windDirection",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "environment.location",
+            "columnName": "location",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "score.reachedPoints",
+            "columnName": "reachedPoints",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "score.totalPoints",
+            "columnName": "totalPoints",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "score.shotCount",
+            "columnName": "shotCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Arrow",
+            "onDelete": "SET NULL",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "arrow"
+            ],
+            "referencedColumns": [
+              "_id"
+            ]
+          },
+          {
+            "table": "Bow",
+            "onDelete": "SET NULL",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "bow"
+            ],
+            "referencedColumns": [
+              "_id"
+            ]
+          },
+          {
+            "table": "StandardRound",
+            "onDelete": "SET NULL",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "standardRound"
+            ],
+            "referencedColumns": [
+              "_id"
+            ]
+          },
+          {
+            "table": "Signature",
+            "onDelete": "SET NULL",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "archerSignature"
+            ],
+            "referencedColumns": [
+              "_id"
+            ]
+          },
+          {
+            "table": "Signature",
+            "onDelete": "SET NULL",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "witnessSignature"
+            ],
+            "referencedColumns": [
+              "_id"
+            ]
+          }
+        ]
+      }
+    ],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"073ada58fac1a02407d87cc2562ed1dc\")"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
index 4c0b915a6..d8bd00863 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
@@ -22,15 +22,11 @@ import android.support.test.InstrumentationRegistry.getTargetContext
 import android.support.test.filters.SmallTest
 import android.support.test.runner.AndroidJUnit4
 import com.google.common.truth.Truth
-import com.raizlabs.android.dbflow.config.FlowManager
-import com.raizlabs.android.dbflow.structure.database.AndroidDatabase
-import com.raizlabs.android.dbflow.structure.database.DatabaseHelperDelegate
-import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper
 import de.dreier.mytargets.base.db.dao.BowDAO
 import de.dreier.mytargets.base.db.dao.EndDAO
 import de.dreier.mytargets.base.db.dao.RoundDAO
 import de.dreier.mytargets.base.db.dao.TrainingDAO
-import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.base.db.AppDatabase
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Dimension.Unit.CENTIMETER
 import de.dreier.mytargets.shared.models.Dimension.Unit.METER
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
index 585d38962..1245e525f 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
@@ -17,7 +17,6 @@ package de.dreier.mytargets.test.utils.rules
 
 import android.content.Context
 import android.support.test.InstrumentationRegistry
-import com.raizlabs.android.dbflow.sql.language.SQLite
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.shared.models.Dimension
@@ -27,8 +26,6 @@ import de.dreier.mytargets.shared.models.Thumbnail
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
 import de.dreier.mytargets.base.db.dao.ArrowDAO
-import de.dreier.mytargets.base.db.dao.dao.BowDAO
-import de.dreier.mytargets.base.db.dao.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.shared.models.db.Training
@@ -120,10 +117,10 @@ abstract class DbTestRuleBase : TestRule {
         val training = Training()
         training.title = InstrumentationRegistry.getTargetContext().getString(R.string.training)
         training.date = LocalDate.of(2016, 4 + generator.nextInt(5), generator.nextInt(29))
-        training.location = ""
-        training.weather = EWeather.SUNNY
-        training.windSpeed = 1
-        training.windDirection = 0
+        training.environment.location = ""
+        training.environment.weather = EWeather.SUNNY
+        training.environment.windSpeed = 1
+        training.environment.windDirection = 0
         training.standardRoundId = standardRoundId
         training.bowId = null
         training.arrowId = null
diff --git a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
index c5f2ab0e0..acd2a320b 100644
--- a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
+++ b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
@@ -24,9 +24,9 @@ import android.util.Log
 import com.crashlytics.android.Crashlytics
 import com.evernote.android.state.StateSaver
 import de.dreier.mytargets.BuildConfig
+import de.dreier.mytargets.base.db.AppDatabase
 import de.dreier.mytargets.base.db.migrations.*
 import de.dreier.mytargets.features.settings.SettingsManager
-import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.SharedApplicationInstance
 import de.dreier.mytargets.utils.MobileWearableClient
 import de.dreier.mytargets.utils.backup.MyBackupAgent
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt b/app/src/main/java/de/dreier/mytargets/base/db/AppDatabase.kt
similarity index 93%
rename from shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/AppDatabase.kt
index 1ab082c30..17c01f9f0 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/AppDatabase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/AppDatabase.kt
@@ -13,14 +13,14 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared
+package de.dreier.mytargets.base.db
 
 import android.arch.persistence.room.Database
 import android.arch.persistence.room.RoomDatabase
 import android.arch.persistence.room.TypeConverters
 import de.dreier.mytargets.base.db.dao.*
+import de.dreier.mytargets.base.db.typeconverters.*
 import de.dreier.mytargets.shared.models.db.*
-import de.dreier.mytargets.shared.utils.typeconverters.*
 
 @Database(entities = [
     Arrow::class,
@@ -49,7 +49,7 @@ import de.dreier.mytargets.shared.utils.typeconverters.*
 abstract class AppDatabase : RoomDatabase() {
     companion object {
         const val NAME = "database"
-        const val DATABASE_FILE_NAME = "$NAME.db"
+        const val DATABASE_FILE_NAME = "${NAME}.db"
         const val DATABASE_IMPORT_FILE_NAME = "database"
         const val VERSION = 26
     }
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/EndRepository.kt b/app/src/main/java/de/dreier/mytargets/base/db/EndRepository.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/EndRepository.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/EndRepository.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/RoundRepository.kt b/app/src/main/java/de/dreier/mytargets/base/db/RoundRepository.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/RoundRepository.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/RoundRepository.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt b/app/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration10.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration10.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration10.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration10.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration11.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration11.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration11.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration11.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration12.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration12.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration12.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration12.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration13.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration13.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration13.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration13.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration14.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration14.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration14.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration14.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration15.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration15.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration15.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration15.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration16.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration16.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration16.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration16.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration17.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration17.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration17.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration17.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration18.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration18.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration18.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration18.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration19.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration19.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration19.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration19.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration2.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration2.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration2.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration2.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration20.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration20.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration20.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration20.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration21.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration21.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration21.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration21.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration24.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration24.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration24.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration24.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration25.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration25.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration25.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration25.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration5.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration5.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration5.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration5.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration7.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration7.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration7.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration7.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration8.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration8.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration8.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration8.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
similarity index 100%
rename from shared/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/BitmapConverters.kt b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/BitmapConverters.kt
similarity index 94%
rename from shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/BitmapConverters.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/typeconverters/BitmapConverters.kt
index ba85fcc1a..b4432c12c 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/BitmapConverters.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/BitmapConverters.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.utils.typeconverters
+package de.dreier.mytargets.base.db.typeconverters
 
 import android.arch.persistence.room.TypeConverter
 import android.graphics.Bitmap
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/DimensionConverter.kt b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/DimensionConverter.kt
similarity index 92%
rename from shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/DimensionConverter.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/typeconverters/DimensionConverter.kt
index b30aaf7bd..e7ca73eea 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/DimensionConverter.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/DimensionConverter.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.utils.typeconverters
+package de.dreier.mytargets.base.db.typeconverters
 
 import android.arch.persistence.room.TypeConverter
 import de.dreier.mytargets.shared.models.Dimension
@@ -35,6 +35,6 @@ class DimensionConverters {
 
     @TypeConverter
     fun getDBValue(model: Dimension.Unit): String {
-        return model.abbreviation
+        return model.toString()
     }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EBowTypeConverters.kt b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/EBowTypeConverters.kt
similarity index 94%
rename from shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EBowTypeConverters.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/typeconverters/EBowTypeConverters.kt
index ee37f4781..48ba9cf47 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EBowTypeConverters.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/EBowTypeConverters.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.utils.typeconverters
+package de.dreier.mytargets.base.db.typeconverters
 
 import android.arch.persistence.room.TypeConverter
 import de.dreier.mytargets.shared.models.EBowType
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EWeatherConverters.kt b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/EWeatherConverters.kt
similarity index 94%
rename from shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EWeatherConverters.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/typeconverters/EWeatherConverters.kt
index df71b9a9e..2f090f5a7 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/EWeatherConverters.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/EWeatherConverters.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.utils.typeconverters
+package de.dreier.mytargets.base.db.typeconverters
 
 import android.arch.persistence.room.TypeConverter
 import de.dreier.mytargets.shared.models.EWeather
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalDateConverters.kt b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/LocalDateConverters.kt
similarity index 94%
rename from shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalDateConverters.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/typeconverters/LocalDateConverters.kt
index c093eb197..199b65922 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalDateConverters.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/LocalDateConverters.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.utils.typeconverters
+package de.dreier.mytargets.base.db.typeconverters
 
 import android.arch.persistence.room.TypeConverter
 import org.threeten.bp.LocalDate
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalTimeConverters.kt b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/LocalTimeConverters.kt
similarity index 94%
rename from shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalTimeConverters.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/typeconverters/LocalTimeConverters.kt
index e73c1dd82..b196ad572 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/LocalTimeConverters.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/LocalTimeConverters.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.utils.typeconverters
+package de.dreier.mytargets.base.db.typeconverters
 
 import android.arch.persistence.room.TypeConverter
 import org.threeten.bp.LocalTime
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/ThumbnailConverters.kt b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/ThumbnailConverters.kt
similarity index 94%
rename from shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/ThumbnailConverters.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/typeconverters/ThumbnailConverters.kt
index 71b1f4628..e139719f3 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/typeconverters/ThumbnailConverters.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/typeconverters/ThumbnailConverters.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.utils.typeconverters
+package de.dreier.mytargets.base.db.typeconverters
 
 import android.arch.persistence.room.TypeConverter
 import de.dreier.mytargets.shared.models.Thumbnail
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
index 9dec7a90b..26bfe912d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
@@ -25,9 +25,9 @@ import android.print.PageRange
 import android.support.annotation.RequiresApi
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.LinearLayout
+import de.dreier.mytargets.base.db.AppDatabase
 import de.dreier.mytargets.features.scoreboard.builder.ViewBuilder
 import de.dreier.mytargets.features.scoreboard.layout.DefaultScoreboardLayout
-import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.utils.print.CustomPrintDocumentAdapter
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
index 6cd12a31f..8e7a06cb4 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
@@ -18,6 +18,7 @@ package de.dreier.mytargets.features.scoreboard.layout
 import android.content.Context
 import android.text.TextUtils
 import de.dreier.mytargets.R
+import de.dreier.mytargets.base.db.AppDatabase
 import de.dreier.mytargets.base.db.EndRepository
 import de.dreier.mytargets.base.db.RoundRepository
 import de.dreier.mytargets.base.db.TrainingRepository
@@ -26,7 +27,6 @@ import de.dreier.mytargets.features.scoreboard.ScoreboardConfiguration
 import de.dreier.mytargets.features.scoreboard.builder.model.Table
 import de.dreier.mytargets.features.scoreboard.builder.model.TextCell
 import de.dreier.mytargets.features.settings.SettingsManager
-import de.dreier.mytargets.shared.AppDatabase
 import de.dreier.mytargets.shared.models.SelectableZone
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.db.Round
@@ -47,7 +47,7 @@ class DefaultScoreboardLayout(private val context: Context, database: AppDatabas
     private val standardRoundDAO = database.standardRoundDAO()
     private val endRepository = EndRepository(endDAO)
     private val roundRepository = RoundRepository(database, roundDAO, endDAO, endRepository)
-    private val trainingRepository = TrainingRepository(database, trainingDAO, roundDAO,roundRepository, database.signatureDAO())
+    private val trainingRepository = TrainingRepository(database, trainingDAO, roundDAO, roundRepository, database.signatureDAO())
 
     fun generateWithBuilder(builder: ScoreboardBuilder, training: Training, rounds: List<Round>) {
         this.builder = builder
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt
index 06351b7a9..47e878b3c 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/BackupUtils.kt
@@ -16,7 +16,7 @@
 package de.dreier.mytargets.features.settings.backup.provider
 
 import android.content.Context
-import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.base.db.AppDatabase
 import java.io.*
 import java.text.SimpleDateFormat
 import java.util.*
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
index 3ed0f9e79..2f7f151e4 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
@@ -17,7 +17,7 @@ package de.dreier.mytargets.features.statistics
 
 import android.content.Context
 import de.dreier.mytargets.R
-import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.base.db.AppDatabase
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import org.threeten.bp.format.DateTimeFormatter
diff --git a/app/src/main/java/de/dreier/mytargets/utils/backup/DbBackupHelper.kt b/app/src/main/java/de/dreier/mytargets/utils/backup/DbBackupHelper.kt
index 3f7c7d39a..59a797062 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/backup/DbBackupHelper.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/backup/DbBackupHelper.kt
@@ -18,6 +18,6 @@ package de.dreier.mytargets.utils.backup
 import android.app.backup.FileBackupHelper
 import android.content.Context
 
-import de.dreier.mytargets.shared.AppDatabase
+import de.dreier.mytargets.base.db.AppDatabase
 
 internal class DbBackupHelper(ctx: Context) : FileBackupHelper(ctx, ctx.getDatabasePath(AppDatabase.DATABASE_FILE_NAME).absolutePath)
diff --git a/shared/build.gradle b/shared/build.gradle
index 25bba05cf..c98a4adf9 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -56,7 +56,6 @@ dependencies {
     api dependencies.threeTenABP
 
     implementation dependencies.archRoomRuntime
-    kapt dependencies.archRoomCompiler
 
     implementation dependencies.androidState
     kapt dependencies.androidStateProcessor

From b9e457872d186cd66edb14073a5f80ea27cab0fe Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier@cqse.eu>
Date: Sun, 28 Jan 2018 17:37:21 +0100
Subject: [PATCH 065/102] Moved util classes to app module

Those that are only used within app
---
 .../java/de/dreier/mytargets/base/db}/StandardRoundFactory.kt | 2 +-
 .../de/dreier/mytargets/base/db/migrations/Migration23.kt     | 2 +-
 .../java/de/dreier/mytargets/base/db/migrations/Migration9.kt | 2 +-
 .../mytargets/base/db/migrations/RoomCreationCallback.kt      | 2 +-
 .../mytargets/base/fragments/EditWithImageFragmentBase.kt     | 2 +-
 .../java/de/dreier/mytargets/base/gallery/GalleryActivity.kt  | 4 ++--
 .../mytargets/features/scoreboard/ScoreboardFragment.kt       | 2 +-
 .../de/dreier/mytargets/features/settings/SettingsManager.kt  | 4 ++--
 .../features/statistics/DispersionPatternActivity.kt          | 2 +-
 .../mytargets/features/statistics/StatisticsActivity.kt       | 4 ++--
 .../training/standardround/EditStandardRoundFragment.kt       | 2 +-
 .../training/standardround/StandardRoundListFragment.kt       | 4 ++--
 .../src/main/java/de/dreier/mytargets}/utils/FileUtils.kt     | 2 +-
 .../src/main/java/de/dreier/mytargets}/utils/ImageList.kt     | 4 ++--
 .../java/de/dreier/mytargets}/utils/LongSparseArrayUtils.kt   | 2 +-
 .../src/test/java/de/dreier/mytargets}/utils/ImageListTest.kt | 2 +-
 16 files changed, 21 insertions(+), 21 deletions(-)
 rename {shared/src/main/java/de/dreier/mytargets/shared/utils => app/src/main/java/de/dreier/mytargets/base/db}/StandardRoundFactory.kt (99%)
 rename {shared/src/main/java/de/dreier/mytargets/shared => app/src/main/java/de/dreier/mytargets}/utils/FileUtils.kt (96%)
 rename {shared/src/main/java/de/dreier/mytargets/shared => app/src/main/java/de/dreier/mytargets}/utils/ImageList.kt (97%)
 rename {shared/src/main/java/de/dreier/mytargets/shared => app/src/main/java/de/dreier/mytargets}/utils/LongSparseArrayUtils.kt (96%)
 rename {shared/src/test/java/de/dreier/mytargets/shared => app/src/test/java/de/dreier/mytargets}/utils/ImageListTest.kt (97%)

diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/StandardRoundFactory.kt b/app/src/main/java/de/dreier/mytargets/base/db/StandardRoundFactory.kt
similarity index 99%
rename from shared/src/main/java/de/dreier/mytargets/shared/utils/StandardRoundFactory.kt
rename to app/src/main/java/de/dreier/mytargets/base/db/StandardRoundFactory.kt
index b5c29ea6e..6b373715d 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/StandardRoundFactory.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/StandardRoundFactory.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.utils
+package de.dreier.mytargets.base.db
 
 import de.dreier.mytargets.shared.R
 import de.dreier.mytargets.shared.SharedApplicationInstance
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
index af1c4f68e..cb42a1adf 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
@@ -18,7 +18,7 @@ package de.dreier.mytargets.base.db.migrations
 import android.arch.persistence.db.SupportSQLiteDatabase
 import android.arch.persistence.room.migration.Migration
 import de.dreier.mytargets.shared.SharedApplicationInstance
-import de.dreier.mytargets.shared.utils.moveTo
+import de.dreier.mytargets.utils.moveTo
 import java.io.File
 import java.io.IOException
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
index e35bcef02..06dc39ec5 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
@@ -25,7 +25,7 @@ import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
 import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.StandardRound
-import de.dreier.mytargets.shared.utils.StandardRoundFactory
+import de.dreier.mytargets.base.db.StandardRoundFactory
 
 object Migration9 : Migration(8, 9) {
     override fun migrate(database: SupportSQLiteDatabase) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
index e1a42c4a4..0d513c7a1 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
@@ -19,7 +19,7 @@ import android.arch.persistence.db.SupportSQLiteDatabase
 import android.arch.persistence.room.RoomDatabase
 import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.StandardRound
-import de.dreier.mytargets.shared.utils.StandardRoundFactory
+import de.dreier.mytargets.base.db.StandardRoundFactory
 
 object RoomCreationCallback : RoomDatabase.Callback() {
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
index e1ee18ce3..b4f7ad32a 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
@@ -34,7 +34,7 @@ import de.dreier.mytargets.R
 import de.dreier.mytargets.databinding.FragmentEditImageBinding
 import de.dreier.mytargets.shared.models.Thumbnail
 import de.dreier.mytargets.shared.models.Image
-import de.dreier.mytargets.shared.utils.moveTo
+import de.dreier.mytargets.utils.moveTo
 import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.Utils
 import permissions.dispatcher.NeedsPermission
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
index d50c6e97d..331364020 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
@@ -35,8 +35,8 @@ import de.dreier.mytargets.base.gallery.adapters.ViewPagerAdapter
 import de.dreier.mytargets.base.navigation.NavigationController
 import de.dreier.mytargets.databinding.ActivityGalleryBinding
 import de.dreier.mytargets.shared.utils.ImageList
-import de.dreier.mytargets.shared.utils.moveTo
-import de.dreier.mytargets.shared.utils.toUri
+import de.dreier.mytargets.utils.moveTo
+import de.dreier.mytargets.utils.toUri
 import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.Utils
 import permissions.dispatcher.NeedsPermission
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
index 66b489ee1..ae5e4dbb1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
@@ -51,7 +51,7 @@ import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Signature
 import de.dreier.mytargets.shared.models.db.Training
-import de.dreier.mytargets.shared.utils.toUri
+import de.dreier.mytargets.utils.toUri
 import de.dreier.mytargets.utils.MobileWearableClient
 import de.dreier.mytargets.utils.MobileWearableClient.Companion.BROADCAST_UPDATE_TRAINING_FROM_REMOTE
 import de.dreier.mytargets.utils.Utils
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt
index c46ad124b..1c34bb563 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt
@@ -32,8 +32,8 @@ import de.dreier.mytargets.shared.models.Score
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.TimerSettings
 import de.dreier.mytargets.shared.targets.scoringstyle.ArrowAwareScoringStyle
-import de.dreier.mytargets.shared.utils.map
-import de.dreier.mytargets.shared.utils.toSparseArray
+import de.dreier.mytargets.utils.map
+import de.dreier.mytargets.utils.toSparseArray
 import de.dreier.mytargets.shared.views.TargetViewBase
 import de.dreier.mytargets.shared.views.TargetViewBase.EInputMethod.KEYBOARD
 import de.dreier.mytargets.shared.views.TargetViewBase.EInputMethod.PLOTTING
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
index cba42e362..16992233f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
@@ -32,7 +32,7 @@ import de.dreier.mytargets.databinding.ActivityArrowRankingDetailsBinding
 import de.dreier.mytargets.features.scoreboard.EFileType
 import de.dreier.mytargets.features.settings.ESettingsScreens
 import de.dreier.mytargets.features.settings.SettingsManager
-import de.dreier.mytargets.shared.utils.toUri
+import de.dreier.mytargets.utils.toUri
 import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.Utils
 import de.dreier.mytargets.utils.print.CustomPrintDocumentAdapter
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
index bcdbffad6..3e99f184f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
@@ -41,8 +41,8 @@ import de.dreier.mytargets.databinding.ActivityStatisticsBinding
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
-import de.dreier.mytargets.shared.utils.toSparseArray
-import de.dreier.mytargets.shared.utils.toUri
+import de.dreier.mytargets.utils.toSparseArray
+import de.dreier.mytargets.utils.toUri
 import de.dreier.mytargets.utils.ToolbarUtils
 import java.io.File
 import java.io.IOException
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
index dcd123996..78b1966c2 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
@@ -36,7 +36,7 @@ import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
 import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.StandardRound
-import de.dreier.mytargets.shared.utils.StandardRoundFactory
+import de.dreier.mytargets.base.db.StandardRoundFactory
 import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.Utils
 import de.dreier.mytargets.views.selector.DistanceSelector
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
index fff1801eb..9f9770886 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
@@ -37,8 +37,8 @@ import de.dreier.mytargets.databinding.FragmentListBinding
 import de.dreier.mytargets.databinding.ItemStandardRoundBinding
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
-import de.dreier.mytargets.shared.utils.StandardRoundFactory
-import de.dreier.mytargets.shared.utils.contains
+import de.dreier.mytargets.base.db.StandardRoundFactory
+import de.dreier.mytargets.utils.contains
 import de.dreier.mytargets.utils.SlideInItemAnimator
 import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.multiselector.OnItemLongClickListener
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/FileUtils.kt b/app/src/main/java/de/dreier/mytargets/utils/FileUtils.kt
similarity index 96%
rename from shared/src/main/java/de/dreier/mytargets/shared/utils/FileUtils.kt
rename to app/src/main/java/de/dreier/mytargets/utils/FileUtils.kt
index d088a6606..a1fd81e12 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/FileUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/FileUtils.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.utils
+package de.dreier.mytargets.utils
 
 import android.content.Context
 import android.net.Uri
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/ImageList.kt b/app/src/main/java/de/dreier/mytargets/utils/ImageList.kt
similarity index 97%
rename from shared/src/main/java/de/dreier/mytargets/shared/utils/ImageList.kt
rename to app/src/main/java/de/dreier/mytargets/utils/ImageList.kt
index aa321493f..07388496d 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/ImageList.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/ImageList.kt
@@ -13,12 +13,12 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.utils
+package de.dreier.mytargets.utils
 
 import android.annotation.SuppressLint
 import android.os.Parcelable
-import de.dreier.mytargets.shared.models.db.EndImage
 import de.dreier.mytargets.shared.models.Image
+import de.dreier.mytargets.shared.models.db.EndImage
 import kotlinx.android.parcel.Parcelize
 
 @SuppressLint("ParcelCreator")
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/LongSparseArrayUtils.kt b/app/src/main/java/de/dreier/mytargets/utils/LongSparseArrayUtils.kt
similarity index 96%
rename from shared/src/main/java/de/dreier/mytargets/shared/utils/LongSparseArrayUtils.kt
rename to app/src/main/java/de/dreier/mytargets/utils/LongSparseArrayUtils.kt
index c8ccf0f00..162031984 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/LongSparseArrayUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/LongSparseArrayUtils.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.utils
+package de.dreier.mytargets.utils
 
 import android.support.v4.util.LongSparseArray
 
diff --git a/shared/src/test/java/de/dreier/mytargets/shared/utils/ImageListTest.kt b/app/src/test/java/de/dreier/mytargets/utils/ImageListTest.kt
similarity index 97%
rename from shared/src/test/java/de/dreier/mytargets/shared/utils/ImageListTest.kt
rename to app/src/test/java/de/dreier/mytargets/utils/ImageListTest.kt
index fb0f9a053..1b8323fb1 100644
--- a/shared/src/test/java/de/dreier/mytargets/shared/utils/ImageListTest.kt
+++ b/app/src/test/java/de/dreier/mytargets/utils/ImageListTest.kt
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-package de.dreier.mytargets.shared.utils
+package de.dreier.mytargets.utils
 
 import de.dreier.mytargets.shared.models.db.EndImage
 import org.junit.Assert.assertEquals

From bf76727d3eedc81ff4f49d438dcf5fe6ff3c45af Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Wed, 14 Mar 2018 19:11:18 +0100
Subject: [PATCH 066/102] Updated state saver library

---
 dependencies.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index a5d943bb6..50eb8dd98 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -80,9 +80,9 @@ ext {
 
             archLifecycleExtensions       : "android.arch.lifecycle:extensions:$libraryVersion.architectureComponents",
             archLifecycleCompiler         : "android.arch.lifecycle:compiler:$libraryVersion.architectureComponents",
-            archRoomRuntime               : "android.arch.persistence.room:runtime:$libraryVersion.architectureComponents",
-            archRoomCompiler              : "android.arch.persistence.room:compiler:$libraryVersion.architectureComponents",
-            archRoomTesting               : "android.arch.persistence.room:testing:$libraryVersion.architectureComponents",
+            archRoomRuntime               : "android.arch.persistence.room:runtime:$libraryVersion.architectureComponentsRoom",
+            archRoomCompiler              : "android.arch.persistence.room:compiler:$libraryVersion.architectureComponentsRoom",
+            archRoomTesting               : "android.arch.persistence.room:testing:$libraryVersion.architectureComponentsRoom",
 
             playServicesDrive             : "com.google.android.gms:play-services-drive:$libraryVersion.playService",
             playServicesWearable          : "com.google.android.gms:play-services-wearable:$libraryVersion.playService",

From 74dd092483b8869fe8edb4d111e0026306e601bb Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Mon, 19 Mar 2018 20:19:42 +0100
Subject: [PATCH 067/102] Fixed ImageList references

---
 .../mytargets/base/gallery/GalleryActivity.kt |   7 +-
 .../adapters/HorizontalListAdapters.kt        |   2 +-
 .../base/gallery/adapters/ViewPagerAdapter.kt |   2 +-
 .../base/navigation/NavigationController.kt   |   2 +-
 .../features/training/input/InputActivity.kt  | 152 +++++++++++-------
 5 files changed, 96 insertions(+), 69 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
index 331364020..4f2bd61dc 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
@@ -27,18 +27,13 @@ import android.view.Menu
 import android.view.MenuItem
 import com.afollestad.materialdialogs.MaterialDialog
 import com.evernote.android.state.State
-import com.evernote.android.state.StateSaver
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.activities.ChildActivityBase
 import de.dreier.mytargets.base.gallery.adapters.HorizontalListAdapters
 import de.dreier.mytargets.base.gallery.adapters.ViewPagerAdapter
 import de.dreier.mytargets.base.navigation.NavigationController
 import de.dreier.mytargets.databinding.ActivityGalleryBinding
-import de.dreier.mytargets.shared.utils.ImageList
-import de.dreier.mytargets.utils.moveTo
-import de.dreier.mytargets.utils.toUri
-import de.dreier.mytargets.utils.ToolbarUtils
-import de.dreier.mytargets.utils.Utils
+import de.dreier.mytargets.utils.*
 import permissions.dispatcher.NeedsPermission
 import permissions.dispatcher.RuntimePermissions
 import pl.aprilapps.easyphotopicker.DefaultCallback
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/HorizontalListAdapters.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/HorizontalListAdapters.kt
index 5ca5d6bf9..19a41a1e0 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/HorizontalListAdapters.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/HorizontalListAdapters.kt
@@ -25,7 +25,7 @@ import android.view.ViewGroup
 import com.squareup.picasso.Picasso
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.gallery.HorizontalImageViewHolder
-import de.dreier.mytargets.shared.utils.ImageList
+import de.dreier.mytargets.utils.ImageList
 import java.io.File
 
 typealias OnItemClickListener  = (Int) -> Unit
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/ViewPagerAdapter.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/ViewPagerAdapter.kt
index e3a8c32d7..935bb0883 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/ViewPagerAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/ViewPagerAdapter.kt
@@ -29,8 +29,8 @@ import com.github.chrisbanes.photoview.PhotoView
 import com.squareup.picasso.Callback
 import com.squareup.picasso.Picasso
 import de.dreier.mytargets.R
-import de.dreier.mytargets.shared.utils.ImageList
 import de.dreier.mytargets.utils.Utils
+import de.dreier.mytargets.utils.ImageList
 import java.io.File
 
 class ViewPagerAdapter(private val activity: Activity, private val images: ImageList, private val toolbar: Toolbar, private val imagesHorizontalList: RecyclerView) : PagerAdapter() {
diff --git a/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt b/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
index b66949d3c..c1a92931f 100644
--- a/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
@@ -64,7 +64,7 @@ import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
-import de.dreier.mytargets.shared.utils.ImageList
+import de.dreier.mytargets.utils.ImageList
 import de.dreier.mytargets.utils.IntentWrapper
 import de.dreier.mytargets.utils.Utils
 import de.dreier.mytargets.views.selector.*
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
index 2ef820322..904cf8c59 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
@@ -55,22 +55,19 @@ import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Shot
 import de.dreier.mytargets.shared.models.sum
-import de.dreier.mytargets.shared.utils.ImageList
 import de.dreier.mytargets.shared.views.TargetViewBase
 import de.dreier.mytargets.shared.views.TargetViewBase.EInputMethod
 import de.dreier.mytargets.shared.wearable.WearableClientBase.Companion.BROADCAST_TIMER_SETTINGS_FROM_REMOTE
-import de.dreier.mytargets.utils.MobileWearableClient
+import de.dreier.mytargets.utils.*
 import de.dreier.mytargets.utils.MobileWearableClient.Companion.BROADCAST_UPDATE_TRAINING_FROM_REMOTE
-import de.dreier.mytargets.utils.ToolbarUtils
-import de.dreier.mytargets.utils.Utils
 import de.dreier.mytargets.utils.Utils.getCurrentLocale
-import de.dreier.mytargets.utils.addEnd
 import de.dreier.mytargets.utils.transitions.FabTransform
 import de.dreier.mytargets.utils.transitions.TransitionAdapter
 import org.threeten.bp.LocalTime
 import java.io.File
 
-class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener, TargetView.OnEndUpdatedListener, LoaderManager.LoaderCallbacks<LoaderResult> {
+class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
+    TargetView.OnEndUpdatedListener, LoaderManager.LoaderCallbacks<LoaderResult> {
 
     @State
     var data: LoaderResult? = null
@@ -89,7 +86,13 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
     private val standardRoundDAO = database.standardRoundDAO()
     private val endRepository = EndRepository(endDAO)
     private val roundRepository = RoundRepository(database, roundDAO, endDAO, endRepository)
-    private val trainingRepository = TrainingRepository(database, trainingDAO, roundDAO,roundRepository, database.signatureDAO())
+    private val trainingRepository = TrainingRepository(
+        database,
+        trainingDAO,
+        roundDAO,
+        roundRepository,
+        database.signatureDAO()
+    )
 
     private val updateReceiver = object : MobileWearableClient.EndUpdateReceiver() {
 
@@ -124,10 +127,14 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
         if (data == null) {
             supportLoaderManager.initLoader(0, intent.extras, this).forceLoad()
         }
-        LocalBroadcastManager.getInstance(this).registerReceiver(updateReceiver,
-                IntentFilter(BROADCAST_UPDATE_TRAINING_FROM_REMOTE))
-        LocalBroadcastManager.getInstance(this).registerReceiver(timerReceiver,
-                IntentFilter(BROADCAST_TIMER_SETTINGS_FROM_REMOTE))
+        LocalBroadcastManager.getInstance(this).registerReceiver(
+            updateReceiver,
+            IntentFilter(BROADCAST_UPDATE_TRAINING_FROM_REMOTE)
+        )
+        LocalBroadcastManager.getInstance(this).registerReceiver(
+            timerReceiver,
+            IntentFilter(BROADCAST_TIMER_SETTINGS_FROM_REMOTE)
+        )
     }
 
     override fun onResume() {
@@ -182,7 +189,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     private fun setupTransitionListener() {
         val sharedElementEnterTransition = window
-                .sharedElementEnterTransition
+            .sharedElementEnterTransition
         if (sharedElementEnterTransition != null && sharedElementEnterTransition is FabTransform) {
             transitionFinished = false
             window.sharedElementEnterTransition.addListener(object : TransitionAdapter() {
@@ -209,18 +216,22 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
             newRound.isVisible = false
         } else {
             takePicture.isVisible = Utils.hasCameraHardware(this)
-            timer.setIcon(if (SettingsManager.timerEnabled)
-                R.drawable.ic_timer_off_white_24dp
-            else
-                R.drawable.ic_timer_white_24dp)
+            timer.setIcon(
+                if (SettingsManager.timerEnabled)
+                    R.drawable.ic_timer_off_white_24dp
+                else
+                    R.drawable.ic_timer_white_24dp
+            )
             timer.isVisible = true
             timer.isChecked = SettingsManager.timerEnabled
             newRound.isVisible = data!!.training.training.standardRoundId == null
             takePicture.isVisible = Utils.hasCameraHardware(this)
-            takePicture.setIcon(if (data!!.currentEnd.images.isEmpty())
-                R.drawable.ic_photo_camera_white_24dp
-            else
-                R.drawable.ic_image_white_24dp)
+            takePicture.setIcon(
+                if (data!!.currentEnd.images.isEmpty())
+                    R.drawable.ic_photo_camera_white_24dp
+                else
+                    R.drawable.ic_image_white_24dp
+            )
         }
         return true
     }
@@ -234,14 +245,14 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
             }
             R.id.action_comment -> {
                 MaterialDialog.Builder(this)
-                        .title(R.string.comment)
-                        .inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE)
-                        .input("", data!!.currentEnd.end.comment) { _, input ->
-                            data!!.currentEnd.end.comment = input.toString()
-                            endDAO.updateEnd(data!!.currentEnd.end)
-                        }
-                        .negativeText(android.R.string.cancel)
-                        .show()
+                    .title(R.string.comment)
+                    .inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE)
+                    .input("", data!!.currentEnd.end.comment) { _, input ->
+                        data!!.currentEnd.end.comment = input.toString()
+                        endDAO.updateEnd(data!!.currentEnd.end)
+                    }
+                    .negativeText(android.R.string.cancel)
+                    .show()
             }
             R.id.action_timer -> {
                 val timerEnabled = !SettingsManager.timerEnabled
@@ -265,7 +276,16 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
         val trainingId = args.getLong(TRAINING_ID)
         val roundId = args.getLong(ROUND_ID)
         val endIndex = args.getInt(END_INDEX)
-        return UITaskAsyncTaskLoader(this, trainingId, roundId, endIndex, trainingRepository, standardRoundDAO, arrowDAO, bowDAO)
+        return UITaskAsyncTaskLoader(
+            this,
+            trainingId,
+            roundId,
+            endIndex,
+            trainingRepository,
+            standardRoundDAO,
+            arrowDAO,
+            bowDAO
+        )
     }
 
     override fun onLoadFinished(loader: Loader<LoaderResult>, data: LoaderResult) {
@@ -281,8 +301,10 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
         }
         targetView = binding.targetViewStub.binding.root as TargetView
         targetView!!.initWithTarget(data!!.currentRound.round.target)
-        targetView!!.setArrow(data!!.arrowDiameter, data!!.training.training.arrowNumbering, data!!
-                .maxArrowNumber)
+        targetView!!.setArrow(
+            data!!.arrowDiameter, data!!.training.training.arrowNumbering, data!!
+                .maxArrowNumber
+        )
         targetView!!.setOnTargetSetListener(this@InputActivity)
         targetView!!.setUpdateListener(this@InputActivity)
         targetView!!.reloadSettings()
@@ -317,10 +339,10 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
         val shotShowScope = SettingsManager.showMode
         val data = this.data
         val shots = data!!.training.rounds
-                .filter { r -> shouldShowRound(r.round, shotShowScope, currentRoundId) }
-                .flatMap { r -> r.ends }
-                .filter { end -> shouldShowEnd(end.end, currentEndId) }
-                .flatMap { (_, shots) -> shots }
+            .filter { r -> shouldShowRound(r.round, shotShowScope, currentRoundId) }
+            .flatMap { r -> r.ends }
+            .filter { end -> shouldShowEnd(end.end, currentEndId) }
+            .flatMap { (_, shots) -> shots }
         targetView!!.setTransparentShots(shots)
     }
 
@@ -352,9 +374,10 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
             data!!.currentRound.round.maxEndCount
         binding.endTitle.text = getString(R.string.end_x_of_y, data!!.endIndex + 1, totalEnds)
         binding.roundTitle.text = getString(
-                R.string.round_x_of_y,
-                data!!.currentRound.round.index + 1,
-                data!!.training.rounds.size)
+            R.string.round_x_of_y,
+            data!!.currentRound.round.index + 1,
+            data!!.training.rounds.size
+        )
         updateNavigationButtons()
         updateWearNotification()
     }
@@ -414,10 +437,10 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
     private fun openRound(round: Round, endIndex: Int) {
         finish()
         navigationController.navigateToRound(round)
-                .noAnimation()
-                .start()
+            .noAnimation()
+            .start()
         navigationController.navigateToEditEnd(round, endIndex)
-                .start()
+            .start()
     }
 
     override fun onEndUpdated(shots: List<Shot>) {
@@ -426,26 +449,28 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
 
         // Set current end score
         val reachedEndScore = data!!.currentRound.round.target
-                .getReachedScore(data!!.currentEnd.shots)
+            .getReachedScore(data!!.currentEnd.shots)
         binding.endScore.text = reachedEndScore.toString()
 
         // Set current round score
         val reachedRoundScore = data!!.ends
-                .map { end -> data!!.currentRound.round.target.getReachedScore(end.shots) }
-                .sum()
+            .map { end -> data!!.currentRound.round.target.getReachedScore(end.shots) }
+            .sum()
         binding.roundScore.text = reachedRoundScore.toString()
 
         // Set current training score
         val reachedTrainingScore = data!!.training.rounds
-                .flatMap { r -> r.ends.map { end -> r.round.target.getReachedScore(end.shots) } }
-                .sum()
+            .flatMap { r -> r.ends.map { end -> r.round.target.getReachedScore(end.shots) } }
+            .sum()
         binding.trainingScore.text = reachedTrainingScore.toString()
 
         when (summaryShowScope) {
-            ETrainingScope.END -> binding.averageScore.text = reachedEndScore.getShotAverageFormatted(getCurrentLocale(this))
-            ETrainingScope.ROUND -> binding.averageScore.text = reachedRoundScore.getShotAverageFormatted(getCurrentLocale(this))
+            ETrainingScope.END -> binding.averageScore.text =
+                    reachedEndScore.getShotAverageFormatted(getCurrentLocale(this))
+            ETrainingScope.ROUND -> binding.averageScore.text =
+                    reachedRoundScore.getShotAverageFormatted(getCurrentLocale(this))
             ETrainingScope.TRAINING -> binding.averageScore.text = reachedTrainingScore
-                    .getShotAverageFormatted(getCurrentLocale(this))
+                .getShotAverageFormatted(getCurrentLocale(this))
         }
     }
 
@@ -460,19 +485,22 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
     }
 
     private class UITaskAsyncTaskLoader(
-            context: Context,
-            private val trainingId: Long,
-            private val roundId: Long,
-            private val endIndex: Int,
-            val trainingRepository: TrainingRepository,
-            val standardRoundDAO: StandardRoundDAO,
-            val arrowDAO: ArrowDAO,
-            val bowDAO: BowDAO
+        context: Context,
+        private val trainingId: Long,
+        private val roundId: Long,
+        private val endIndex: Int,
+        val trainingRepository: TrainingRepository,
+        val standardRoundDAO: StandardRoundDAO,
+        val arrowDAO: ArrowDAO,
+        val bowDAO: BowDAO
     ) : AsyncTaskLoader<LoaderResult>(context) {
 
         override fun loadInBackground(): LoaderResult? {
             val training = trainingRepository.loadAugmentedTraining(trainingId)
-            val standardRound = if (training.training.standardRoundId == null) null else standardRoundDAO.loadStandardRound(training.training.standardRoundId!!)
+            val standardRound =
+                if (training.training.standardRoundId == null) null else standardRoundDAO.loadStandardRound(
+                    training.training.standardRoundId!!
+                )
             val result = LoaderResult(training, standardRound)
             result.setRoundId(roundId)
             result.setAdjustEndIndex(endIndex)
@@ -484,7 +512,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
             }
             if (training.training.bowId != null) {
                 result.sightMark = bowDAO.loadSightMarks(training.training.bowId!!)
-                        .firstOrNull { it.distance == result.distance!! }
+                    .firstOrNull { it.distance == result.distance!! }
             }
             return result
         }
@@ -496,7 +524,11 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
         internal const val END_INDEX = "end_ind"
         internal const val GALLERY_REQUEST_CODE = 1
 
-        private fun shouldShowRound(r: Round, shotShowScope: ETrainingScope, roundId: Long?): Boolean {
+        private fun shouldShowRound(
+            r: Round,
+            shotShowScope: ETrainingScope,
+            roundId: Long?
+        ): Boolean {
             return shotShowScope !== ETrainingScope.END && (shotShowScope === ETrainingScope.TRAINING || r.id == roundId)
         }
 

From 5860af4d9e6656571b57bc69bcd17bf5b0418668 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Mon, 19 Mar 2018 21:05:52 +0100
Subject: [PATCH 068/102] Fixed shots not correctly saved bug

---
 .../java/de/dreier/mytargets/base/db/dao/EndDAO.kt   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
index c8b0efba3..6c225b04f 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
@@ -48,10 +48,10 @@ abstract class EndDAO {
     }
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    abstract fun insertEndImages(images: List<EndImage>)
+    abstract fun insertEndImage(images: EndImage): Long
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    abstract fun insertShots(images: List<Shot>)
+    abstract fun insertShot(images: Shot): Long
 
     @Query("DELETE FROM EndImage WHERE end = (:endId)")
     abstract fun deleteEndImages(endId: Long)
@@ -61,13 +61,13 @@ abstract class EndDAO {
         end.id = saveEnd(end)
         for (image in images) {
             image.endId = end.id
+            image._id = insertEndImage(image)
         }
-        insertEndImages(images)
 
         for (shot in shots) {
             shot.endId = end.id
+            shot.id = insertShot(shot)
         }
-        insertShots(shots)
     }
 
     @Transaction
@@ -88,6 +88,8 @@ abstract class EndDAO {
     @Transaction
     open fun replaceImages(end: End, images: List<EndImage>) {
         deleteEndImages(end.id)
-        insertEndImages(images)
+        for (image in images) {
+            image._id = insertEndImage(image)
+        }
     }
 }

From 4322c33e178fa0ab8a8a66248ef8202c575c0d78 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Wed, 21 Mar 2018 22:07:49 +0100
Subject: [PATCH 069/102] WIP: MigrationTest

---
 .../16.json                                   |  651 ++++++++++
 .../17.json                                   | 1125 +++++++++++++++++
 .../18.json                                   |  825 ++++++++++++
 .../19.json                                   |  825 ++++++++++++
 .../20.json                                   |  825 ++++++++++++
 .../21.json                                   |  825 ++++++++++++
 .../22.json                                   |  825 ++++++++++++
 .../23.json                                   |  825 ++++++++++++
 .../24.json                                   |  849 +++++++++++++
 .../25.json                                   |  849 +++++++++++++
 .../de/dreier/mytargets/app/MigrationTest.kt  |  102 +-
 11 files changed, 8507 insertions(+), 19 deletions(-)
 create mode 100644 app/schemas/de.dreier.mytargets.base.db.AppDatabase/16.json
 create mode 100644 app/schemas/de.dreier.mytargets.base.db.AppDatabase/17.json
 create mode 100644 app/schemas/de.dreier.mytargets.base.db.AppDatabase/18.json
 create mode 100644 app/schemas/de.dreier.mytargets.base.db.AppDatabase/19.json
 create mode 100644 app/schemas/de.dreier.mytargets.base.db.AppDatabase/20.json
 create mode 100644 app/schemas/de.dreier.mytargets.base.db.AppDatabase/21.json
 create mode 100644 app/schemas/de.dreier.mytargets.base.db.AppDatabase/22.json
 create mode 100644 app/schemas/de.dreier.mytargets.base.db.AppDatabase/23.json
 create mode 100644 app/schemas/de.dreier.mytargets.base.db.AppDatabase/24.json
 create mode 100644 app/schemas/de.dreier.mytargets.base.db.AppDatabase/25.json

diff --git a/app/schemas/de.dreier.mytargets.base.db.AppDatabase/16.json b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/16.json
new file mode 100644
index 000000000..ed7cd1a12
--- /dev/null
+++ b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/16.json
@@ -0,0 +1,651 @@
+{
+  "database": {
+    "entities": [
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS BOW ( _id INTEGER PRIMARY KEY AUTOINCREMENT,name TEXT,brand TEXT,type INTEGER,size INTEGER,height TEXT,tiller TEXT,limbs TEXT,sight TEXT,draw_weight TEXT,stabilizer TEXT,clicker TEXT,description TEXT,thumbnail BLOB,image TEXT)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "brand",
+            "fieldPath": "brand",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "type",
+            "fieldPath": "type",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "size",
+            "fieldPath": "size",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "height",
+            "fieldPath": "height",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tiller",
+            "fieldPath": "tiller",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "limbs",
+            "fieldPath": "limbs",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "sight",
+            "fieldPath": "sight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "draw_weight",
+            "fieldPath": "draw_weight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "stabilizer",
+            "fieldPath": "stabilizer",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "clicker",
+            "fieldPath": "clicker",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "description",
+            "fieldPath": "description",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "image",
+            "fieldPath": "image",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "BOW"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS VISIER ( _id INTEGER PRIMARY KEY AUTOINCREMENT,bow INTEGER,distance INTEGER,setting TEXT, unit TEXT)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "setting",
+            "fieldPath": "setting",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "unit",
+            "fieldPath": "unit",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "VISIER"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS NUMBER ( _id INTEGER PRIMARY KEY AUTOINCREMENT,arrow INTEGER,value INTEGER)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "value",
+            "fieldPath": "value",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "NUMBER"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS ARROW (_id INTEGER PRIMARY KEY AUTOINCREMENT,name TEXT,length TEXT,material TEXT,spine TEXT,weight TEXT,tip_weight TEXT,vanes TEXT,nock TEXT,comment TEXT,thumbnail BLOB,image TEXT,diameter TEXT,diameter_unit TEXT)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "length",
+            "fieldPath": "length",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "material",
+            "fieldPath": "material",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "spine",
+            "fieldPath": "spine",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "weight",
+            "fieldPath": "weight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tip_weight",
+            "fieldPath": "tip_weight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "vanes",
+            "fieldPath": "vanes",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "nock",
+            "fieldPath": "nock",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "image",
+            "fieldPath": "image",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "diameter",
+            "fieldPath": "diameter",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "diameter_unit",
+            "fieldPath": "diameter_unit",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "ARROW"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS TRAINING ( _id INTEGER PRIMARY KEY AUTOINCREMENT,datum INTEGER,title TEXT,weather INTEGER,wind_speed INTEGER,wind_direction INTEGER,location TEXT,standard_round INTEGER,bow INTEGER,arrow INTEGER,arrow_numbering INTEGER,time INTEGER)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "datum",
+            "fieldPath": "datum",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "title",
+            "fieldPath": "title",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "weather",
+            "fieldPath": "weather",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "wind_speed",
+            "fieldPath": "wind_speed",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "wind_direction",
+            "fieldPath": "wind_direction",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "location",
+            "fieldPath": "location",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "standard_round",
+            "fieldPath": "standard_round",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow_numbering",
+            "fieldPath": "arrow_numbering",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "time",
+            "fieldPath": "time",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "TRAINING"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS ROUND_TEMPLATE (_id INTEGER PRIMARY KEY AUTOINCREMENT,sid INTEGER,r_index INTEGER,distance INTEGER,unit TEXT,passes INTEGER,arrows INTEGER,target INTEGER,size INTEGER,target_unit INTEGER,scoring_style INTEGER,UNIQUE(sid, r_index) ON CONFLICT REPLACE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "sid",
+            "fieldPath": "sid",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "r_index",
+            "fieldPath": "r_index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "unit",
+            "fieldPath": "unit",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "passes",
+            "fieldPath": "passes",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrows",
+            "fieldPath": "arrows",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "target",
+            "fieldPath": "target",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "size",
+            "fieldPath": "size",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "target_unit",
+            "fieldPath": "target_unit",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "scoring_style",
+            "fieldPath": "scoring_style",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "ROUND_TEMPLATE"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS ROUND (_id INTEGER PRIMARY KEY AUTOINCREMENT,training INTEGER,comment TEXT,template INTEGER,target INTEGER,scoring_style INTEGER)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "training",
+            "fieldPath": "training",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "template",
+            "fieldPath": "template",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "target",
+            "fieldPath": "target",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "scoring_style",
+            "fieldPath": "scoring_style",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "ROUND"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS PASSE (_id INTEGER PRIMARY KEY AUTOINCREMENT,round INTEGER,image TEXT,exact INTEGER,save_time INTEGER)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "round",
+            "fieldPath": "round",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "image",
+            "fieldPath": "image",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "exact",
+            "fieldPath": "exact",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "save_time",
+            "fieldPath": "save_time",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "PASSE"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS SHOOT (_id INTEGER PRIMARY KEY AUTOINCREMENT,passe INTEGER,points INTEGER,x REAL,y REAL,comment TEXT,arrow INTEGER,arrow_index INTEGER)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "passe",
+            "fieldPath": "passe",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "points",
+            "fieldPath": "points",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "x",
+            "fieldPath": "x",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "y",
+            "fieldPath": "y",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow_index",
+            "fieldPath": "arrow_index",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "SHOOT"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS STANDARD_ROUND_TEMPLATE (_id INTEGER PRIMARY KEY AUTOINCREMENT,name TEXT,club INTEGER,indoor INTEGER)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "club",
+            "fieldPath": "club",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "indoor",
+            "fieldPath": "indoor",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "STANDARD_ROUND_TEMPLATE"
+      }
+    ],
+    "identityHash": "cc22aefa9081b7cc1e4247705865e22d",
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"cc22aefa9081b7cc1e4247705865e22d\")"
+    ],
+    "version": 16
+  },
+  "formatVersion": 1
+}
\ No newline at end of file
diff --git a/app/schemas/de.dreier.mytargets.base.db.AppDatabase/17.json b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/17.json
new file mode 100644
index 000000000..fd80a2138
--- /dev/null
+++ b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/17.json
@@ -0,0 +1,1125 @@
+{
+  "database": {
+    "entities": [
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS BOW ( _id INTEGER PRIMARY KEY AUTOINCREMENT,name TEXT,brand TEXT,type INTEGER,size INTEGER,height TEXT,tiller TEXT,limbs TEXT,sight TEXT,draw_weight TEXT,stabilizer TEXT,clicker TEXT,description TEXT,thumbnail BLOB,image TEXT)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "brand",
+            "fieldPath": "brand",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "type",
+            "fieldPath": "type",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "size",
+            "fieldPath": "size",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "height",
+            "fieldPath": "height",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tiller",
+            "fieldPath": "tiller",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "limbs",
+            "fieldPath": "limbs",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "sight",
+            "fieldPath": "sight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "draw_weight",
+            "fieldPath": "draw_weight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "stabilizer",
+            "fieldPath": "stabilizer",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "clicker",
+            "fieldPath": "clicker",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "description",
+            "fieldPath": "description",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "image",
+            "fieldPath": "image",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "BOW"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS VISIER ( _id INTEGER PRIMARY KEY AUTOINCREMENT,bow INTEGER,distance INTEGER,setting TEXT, unit TEXT)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "setting",
+            "fieldPath": "setting",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "unit",
+            "fieldPath": "unit",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "VISIER"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS NUMBER ( _id INTEGER PRIMARY KEY AUTOINCREMENT,arrow INTEGER,value INTEGER)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "value",
+            "fieldPath": "value",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "NUMBER"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS ARROW (_id INTEGER PRIMARY KEY AUTOINCREMENT,name TEXT,length TEXT,material TEXT,spine TEXT,weight TEXT,tip_weight TEXT,vanes TEXT,nock TEXT,comment TEXT,thumbnail BLOB,image TEXT,diameter TEXT,diameter_unit TEXT)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "length",
+            "fieldPath": "length",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "material",
+            "fieldPath": "material",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "spine",
+            "fieldPath": "spine",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "weight",
+            "fieldPath": "weight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tip_weight",
+            "fieldPath": "tip_weight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "vanes",
+            "fieldPath": "vanes",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "nock",
+            "fieldPath": "nock",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "image",
+            "fieldPath": "image",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "diameter",
+            "fieldPath": "diameter",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "diameter_unit",
+            "fieldPath": "diameter_unit",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "ARROW"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS TRAINING ( _id INTEGER PRIMARY KEY AUTOINCREMENT,datum INTEGER,title TEXT,weather INTEGER,wind_speed INTEGER,wind_direction INTEGER,location TEXT,standard_round INTEGER,bow INTEGER,arrow INTEGER,arrow_numbering INTEGER,time INTEGER)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "datum",
+            "fieldPath": "datum",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "title",
+            "fieldPath": "title",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "weather",
+            "fieldPath": "weather",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "wind_speed",
+            "fieldPath": "wind_speed",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "wind_direction",
+            "fieldPath": "wind_direction",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "location",
+            "fieldPath": "location",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "standard_round",
+            "fieldPath": "standard_round",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow_numbering",
+            "fieldPath": "arrow_numbering",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "time",
+            "fieldPath": "time",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "TRAINING"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS ROUND_TEMPLATE (_id INTEGER PRIMARY KEY AUTOINCREMENT,sid INTEGER,r_index INTEGER,distance INTEGER,unit TEXT,passes INTEGER,arrows INTEGER,target INTEGER,size INTEGER,target_unit INTEGER,scoring_style INTEGER,UNIQUE(sid, r_index) ON CONFLICT REPLACE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "sid",
+            "fieldPath": "sid",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "r_index",
+            "fieldPath": "r_index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "unit",
+            "fieldPath": "unit",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "passes",
+            "fieldPath": "passes",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrows",
+            "fieldPath": "arrows",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "target",
+            "fieldPath": "target",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "size",
+            "fieldPath": "size",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "target_unit",
+            "fieldPath": "target_unit",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "scoring_style",
+            "fieldPath": "scoring_style",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "ROUND_TEMPLATE"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS ROUND (_id INTEGER PRIMARY KEY AUTOINCREMENT,training INTEGER,comment TEXT,template INTEGER,target INTEGER,scoring_style INTEGER)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "training",
+            "fieldPath": "training",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "template",
+            "fieldPath": "template",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "target",
+            "fieldPath": "target",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "scoring_style",
+            "fieldPath": "scoring_style",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "ROUND"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS PASSE (_id INTEGER PRIMARY KEY AUTOINCREMENT,round INTEGER,image TEXT,exact INTEGER,save_time INTEGER)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "round",
+            "fieldPath": "round",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "image",
+            "fieldPath": "image",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "exact",
+            "fieldPath": "exact",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "save_time",
+            "fieldPath": "save_time",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "PASSE"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS SHOOT (_id INTEGER PRIMARY KEY AUTOINCREMENT,passe INTEGER,points INTEGER,x REAL,y REAL,comment TEXT,arrow INTEGER,arrow_index INTEGER)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "passe",
+            "fieldPath": "passe",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "points",
+            "fieldPath": "points",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "x",
+            "fieldPath": "x",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "y",
+            "fieldPath": "y",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow_index",
+            "fieldPath": "arrow_index",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "SHOOT"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS STANDARD_ROUND_TEMPLATE (_id INTEGER PRIMARY KEY AUTOINCREMENT,name TEXT,club INTEGER,indoor INTEGER)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "club",
+            "fieldPath": "club",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "indoor",
+            "fieldPath": "indoor",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "STANDARD_ROUND_TEMPLATE"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `End`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `index` INTEGER, `round` INTEGER, `exact` INTEGER, `saveTime` TEXT, `comment` TEXT, `scoreReachedPoints` INTEGER, `scoreTotalPoints` INTEGER, `scoreShotCount` INTEGER, FOREIGN KEY(`round`) REFERENCES `Round`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "round",
+            "fieldPath": "round",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "exact",
+            "fieldPath": "exact",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "saveTime",
+            "fieldPath": "saveTime",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "scoreReachedPoints",
+            "fieldPath": "scoreReachedPoints",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "scoreTotalPoints",
+            "fieldPath": "scoreTotalPoints",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "scoreShotCount",
+            "fieldPath": "scoreShotCount",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "round"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Round"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "End"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Shot`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `index` INTEGER, `end` INTEGER, `x` REAL, `y` REAL, `scoringRing` INTEGER, `arrowNumber` TEXT, FOREIGN KEY(`end`) REFERENCES `End`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "end",
+            "fieldPath": "end",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "x",
+            "fieldPath": "x",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "y",
+            "fieldPath": "y",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "scoringRing",
+            "fieldPath": "scoringRing",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "arrowNumber",
+            "fieldPath": "arrowNumber",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "end"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "End"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Shot"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `StandardRound`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `club` INTEGER, `name` TEXT)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "club",
+            "fieldPath": "club",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "StandardRound"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `BowImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `bow` INTEGER, FOREIGN KEY(`bow`) REFERENCES `Bow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "bow"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Bow"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "BowImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `EndImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `end` INTEGER, FOREIGN KEY(`end`) REFERENCES `End`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "end",
+            "fieldPath": "end",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "end"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "End"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "EndImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Signature`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `bitmap` BLOB)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "bitmap",
+            "fieldPath": "bitmap",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Signature"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `SightMark`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `bow` INTEGER, `distance` TEXT, `value` TEXT, FOREIGN KEY(`bow`) REFERENCES `Bow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "value",
+            "fieldPath": "value",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "bow"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Bow"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "SightMark"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `RoundTemplate`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `standardRound` INTEGER, `index` INTEGER, `shotsPerEnd` INTEGER, `endCount` INTEGER, `distance` TEXT, `targetId` INTEGER, `targetScoringStyle` INTEGER, `targetDiameter` TEXT, FOREIGN KEY(`standardRound`) REFERENCES `StandardRound`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "standardRound",
+            "fieldPath": "standardRound",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "shotsPerEnd",
+            "fieldPath": "shotsPerEnd",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "endCount",
+            "fieldPath": "endCount",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetId",
+            "fieldPath": "targetId",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetScoringStyle",
+            "fieldPath": "targetScoringStyle",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "targetDiameter",
+            "fieldPath": "targetDiameter",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "standardRound"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "StandardRound"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "RoundTemplate"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `ArrowImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `arrow` INTEGER, FOREIGN KEY(`arrow`) REFERENCES `Arrow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "arrow"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Arrow"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "ArrowImage"
+      }
+    ],
+    "identityHash": "ca2ff5013725d3d929f8601fbb4b9eab",
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"ca2ff5013725d3d929f8601fbb4b9eab\")"
+    ],
+    "version": 17
+  },
+  "formatVersion": 1
+}
\ No newline at end of file
diff --git a/app/schemas/de.dreier.mytargets.base.db.AppDatabase/18.json b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/18.json
new file mode 100644
index 000000000..b73a19c5e
--- /dev/null
+++ b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/18.json
@@ -0,0 +1,825 @@
+{
+  "database": {
+    "entities": [
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `BowImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `bow` INTEGER, FOREIGN KEY(`bow`) REFERENCES `Bow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "bow"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Bow"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "BowImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `EndImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `end` INTEGER, FOREIGN KEY(`end`) REFERENCES `End`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "end",
+            "fieldPath": "end",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "end"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "End"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "EndImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Signature`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `bitmap` BLOB)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "bitmap",
+            "fieldPath": "bitmap",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Signature"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `ArrowImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `arrow` INTEGER, FOREIGN KEY(`arrow`) REFERENCES `Arrow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "arrow"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Arrow"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "ArrowImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Arrow`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `length` TEXT, `material` TEXT, `spine` TEXT, `weight` TEXT, `tipWeight` TEXT, `vanes` TEXT, `nock` TEXT, `comment` TEXT, `diameter` TEXT, `thumbnail` BLOB )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "length",
+            "fieldPath": "length",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "material",
+            "fieldPath": "material",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "spine",
+            "fieldPath": "spine",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "weight",
+            "fieldPath": "weight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tipWeight",
+            "fieldPath": "tipWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "vanes",
+            "fieldPath": "vanes",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "nock",
+            "fieldPath": "nock",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "diameter",
+            "fieldPath": "diameter",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Arrow"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Bow`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `type` INTEGER, `brand` TEXT, `size` TEXT, `braceHeight` TEXT, `tiller` TEXT, `limbs` TEXT, `sight` TEXT, `drawWeight` TEXT, `stabilizer` TEXT, `clicker` TEXT, `button` TEXT, `string` TEXT, `nockingPoint` TEXT, `letoffWeight` TEXT, `arrowRest` TEXT, `restHorizontalPosition` TEXT, `restVerticalPosition` TEXT, `restStiffness` TEXT, `camSetting` TEXT, `scopeMagnification` TEXT, `description` TEXT, `thumbnail` BLOB )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "type",
+            "fieldPath": "type",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "brand",
+            "fieldPath": "brand",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "size",
+            "fieldPath": "size",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "braceHeight",
+            "fieldPath": "braceHeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tiller",
+            "fieldPath": "tiller",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "limbs",
+            "fieldPath": "limbs",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "sight",
+            "fieldPath": "sight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "drawWeight",
+            "fieldPath": "drawWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "stabilizer",
+            "fieldPath": "stabilizer",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "clicker",
+            "fieldPath": "clicker",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "button",
+            "fieldPath": "button",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "string",
+            "fieldPath": "string",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "nockingPoint",
+            "fieldPath": "nockingPoint",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "letoffWeight",
+            "fieldPath": "letoffWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "arrowRest",
+            "fieldPath": "arrowRest",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restHorizontalPosition",
+            "fieldPath": "restHorizontalPosition",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restVerticalPosition",
+            "fieldPath": "restVerticalPosition",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restStiffness",
+            "fieldPath": "restStiffness",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "camSetting",
+            "fieldPath": "camSetting",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "scopeMagnification",
+            "fieldPath": "scopeMagnification",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "description",
+            "fieldPath": "description",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Bow"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `StandardRound`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `club` INTEGER, `name` TEXT )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "club",
+            "fieldPath": "club",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "StandardRound"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `RoundTemplate`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `standardRound` INTEGER, `index` INTEGER, `shotsPerEnd` INTEGER, `endCount` INTEGER, `distance` TEXT, `targetId` INTEGER, `targetScoringStyle` INTEGER, `targetDiameter` TEXT, FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "standardRound",
+            "fieldPath": "standardRound",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "shotsPerEnd",
+            "fieldPath": "shotsPerEnd",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "endCount",
+            "fieldPath": "endCount",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetId",
+            "fieldPath": "targetId",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetScoringStyle",
+            "fieldPath": "targetScoringStyle",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "targetDiameter",
+            "fieldPath": "targetDiameter",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "RoundTemplate"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Training`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `title` TEXT, `date` INTEGER, `standardRound` INTEGER, `bow` INTEGER, `arrow` INTEGER, `arrowNumbering` INTEGER, `indoor` INTEGER, `weather` INTEGER, `windDirection` INTEGER, `windSpeed` INTEGER, `location` TEXT, FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE NO ACTION, FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "title",
+            "fieldPath": "title",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "date",
+            "fieldPath": "date",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "standardRound",
+            "fieldPath": "standardRound",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrowNumbering",
+            "fieldPath": "arrowNumbering",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "indoor",
+            "fieldPath": "indoor",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "weather",
+            "fieldPath": "weather",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "windDirection",
+            "fieldPath": "windDirection",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "windSpeed",
+            "fieldPath": "windSpeed",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "location",
+            "fieldPath": "location",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Training"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Round`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `training` INTEGER, `index` INTEGER, `shotsPerEnd` INTEGER, `maxEndCount` INTEGER, `distance` TEXT, `comment` TEXT, `targetId` INTEGER, `targetScoringStyle` INTEGER, `targetDiameter` TEXT, FOREIGN KEY(`training`) REFERENCES Training(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "training",
+            "fieldPath": "training",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "shotsPerEnd",
+            "fieldPath": "shotsPerEnd",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "maxEndCount",
+            "fieldPath": "maxEndCount",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetId",
+            "fieldPath": "targetId",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetScoringStyle",
+            "fieldPath": "targetScoringStyle",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "targetDiameter",
+            "fieldPath": "targetDiameter",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Round"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `End`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `index` INTEGER, `round` INTEGER, `exact` INTEGER, `saveTime` INTEGER, FOREIGN KEY(`round`) REFERENCES Round(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "round",
+            "fieldPath": "round",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "exact",
+            "fieldPath": "exact",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "saveTime",
+            "fieldPath": "saveTime",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "End"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Shot`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `index` INTEGER, `end` INTEGER, `x` REAL, `y` REAL, `scoringRing` INTEGER, `comment` TEXT, `arrowNumber` TEXT, FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "end",
+            "fieldPath": "end",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "x",
+            "fieldPath": "x",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "y",
+            "fieldPath": "y",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "scoringRing",
+            "fieldPath": "scoringRing",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "arrowNumber",
+            "fieldPath": "arrowNumber",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Shot"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `SightMark`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `bow` INTEGER, `distance` TEXT, `value` TEXT, FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "value",
+            "fieldPath": "value",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "SightMark"
+      }
+    ],
+    "identityHash": "b6b98474875167708d8af9a67e3e0f04",
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"b6b98474875167708d8af9a67e3e0f04\")"
+    ],
+    "version": 18
+  },
+  "formatVersion": 1
+}
\ No newline at end of file
diff --git a/app/schemas/de.dreier.mytargets.base.db.AppDatabase/19.json b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/19.json
new file mode 100644
index 000000000..833cc9a1e
--- /dev/null
+++ b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/19.json
@@ -0,0 +1,825 @@
+{
+  "database": {
+    "entities": [
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `BowImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `bow` INTEGER, FOREIGN KEY(`bow`) REFERENCES `Bow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "bow"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Bow"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "BowImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `EndImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `end` INTEGER, FOREIGN KEY(`end`) REFERENCES `End`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "end",
+            "fieldPath": "end",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "end"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "End"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "EndImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Signature`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `bitmap` BLOB)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "bitmap",
+            "fieldPath": "bitmap",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Signature"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `ArrowImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `arrow` INTEGER, FOREIGN KEY(`arrow`) REFERENCES `Arrow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "arrow"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Arrow"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "ArrowImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Arrow`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `length` TEXT, `material` TEXT, `spine` TEXT, `weight` TEXT, `tipWeight` TEXT, `vanes` TEXT, `nock` TEXT, `comment` TEXT, `diameter` TEXT, `thumbnail` BLOB )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "length",
+            "fieldPath": "length",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "material",
+            "fieldPath": "material",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "spine",
+            "fieldPath": "spine",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "weight",
+            "fieldPath": "weight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tipWeight",
+            "fieldPath": "tipWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "vanes",
+            "fieldPath": "vanes",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "nock",
+            "fieldPath": "nock",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "diameter",
+            "fieldPath": "diameter",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Arrow"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Bow`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `type` INTEGER, `brand` TEXT, `size` TEXT, `braceHeight` TEXT, `tiller` TEXT, `limbs` TEXT, `sight` TEXT, `drawWeight` TEXT, `stabilizer` TEXT, `clicker` TEXT, `button` TEXT, `string` TEXT, `nockingPoint` TEXT, `letoffWeight` TEXT, `arrowRest` TEXT, `restHorizontalPosition` TEXT, `restVerticalPosition` TEXT, `restStiffness` TEXT, `camSetting` TEXT, `scopeMagnification` TEXT, `description` TEXT, `thumbnail` BLOB )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "type",
+            "fieldPath": "type",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "brand",
+            "fieldPath": "brand",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "size",
+            "fieldPath": "size",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "braceHeight",
+            "fieldPath": "braceHeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tiller",
+            "fieldPath": "tiller",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "limbs",
+            "fieldPath": "limbs",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "sight",
+            "fieldPath": "sight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "drawWeight",
+            "fieldPath": "drawWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "stabilizer",
+            "fieldPath": "stabilizer",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "clicker",
+            "fieldPath": "clicker",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "button",
+            "fieldPath": "button",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "string",
+            "fieldPath": "string",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "nockingPoint",
+            "fieldPath": "nockingPoint",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "letoffWeight",
+            "fieldPath": "letoffWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "arrowRest",
+            "fieldPath": "arrowRest",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restHorizontalPosition",
+            "fieldPath": "restHorizontalPosition",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restVerticalPosition",
+            "fieldPath": "restVerticalPosition",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restStiffness",
+            "fieldPath": "restStiffness",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "camSetting",
+            "fieldPath": "camSetting",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "scopeMagnification",
+            "fieldPath": "scopeMagnification",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "description",
+            "fieldPath": "description",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Bow"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `StandardRound`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `club` INTEGER, `name` TEXT )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "club",
+            "fieldPath": "club",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "StandardRound"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `RoundTemplate`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `standardRound` INTEGER, `index` INTEGER, `shotsPerEnd` INTEGER, `endCount` INTEGER, `distance` TEXT, `targetId` INTEGER, `targetScoringStyle` INTEGER, `targetDiameter` TEXT, FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "standardRound",
+            "fieldPath": "standardRound",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "shotsPerEnd",
+            "fieldPath": "shotsPerEnd",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "endCount",
+            "fieldPath": "endCount",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetId",
+            "fieldPath": "targetId",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetScoringStyle",
+            "fieldPath": "targetScoringStyle",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "targetDiameter",
+            "fieldPath": "targetDiameter",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "RoundTemplate"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Training`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `title` TEXT, `date` INTEGER, `standardRound` INTEGER, `bow` INTEGER, `arrow` INTEGER, `arrowNumbering` INTEGER, `indoor` INTEGER, `weather` INTEGER, `windDirection` INTEGER, `windSpeed` INTEGER, `location` TEXT, FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE NO ACTION, FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "title",
+            "fieldPath": "title",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "date",
+            "fieldPath": "date",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "standardRound",
+            "fieldPath": "standardRound",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrowNumbering",
+            "fieldPath": "arrowNumbering",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "indoor",
+            "fieldPath": "indoor",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "weather",
+            "fieldPath": "weather",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "windDirection",
+            "fieldPath": "windDirection",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "windSpeed",
+            "fieldPath": "windSpeed",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "location",
+            "fieldPath": "location",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Training"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Round`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `training` INTEGER, `index` INTEGER, `shotsPerEnd` INTEGER, `maxEndCount` INTEGER, `distance` TEXT, `comment` TEXT, `targetId` INTEGER, `targetScoringStyle` INTEGER, `targetDiameter` TEXT, FOREIGN KEY(`training`) REFERENCES Training(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "training",
+            "fieldPath": "training",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "shotsPerEnd",
+            "fieldPath": "shotsPerEnd",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "maxEndCount",
+            "fieldPath": "maxEndCount",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetId",
+            "fieldPath": "targetId",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetScoringStyle",
+            "fieldPath": "targetScoringStyle",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "targetDiameter",
+            "fieldPath": "targetDiameter",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Round"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `End`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `index` INTEGER, `round` INTEGER, `exact` INTEGER, `saveTime` INTEGER, FOREIGN KEY(`round`) REFERENCES Round(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "round",
+            "fieldPath": "round",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "exact",
+            "fieldPath": "exact",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "saveTime",
+            "fieldPath": "saveTime",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "End"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Shot`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `index` INTEGER, `end` INTEGER, `x` REAL, `y` REAL, `scoringRing` INTEGER, `comment` TEXT, `arrowNumber` TEXT, FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "end",
+            "fieldPath": "end",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "x",
+            "fieldPath": "x",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "y",
+            "fieldPath": "y",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "scoringRing",
+            "fieldPath": "scoringRing",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "arrowNumber",
+            "fieldPath": "arrowNumber",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Shot"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `SightMark`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `bow` INTEGER, `distance` TEXT, `value` TEXT, FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "value",
+            "fieldPath": "value",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "SightMark"
+      }
+    ],
+    "identityHash": "b6b98474875167708d8af9a67e3e0f04",
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"b6b98474875167708d8af9a67e3e0f04\")"
+    ],
+    "version": 19
+  },
+  "formatVersion": 1
+}
\ No newline at end of file
diff --git a/app/schemas/de.dreier.mytargets.base.db.AppDatabase/20.json b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/20.json
new file mode 100644
index 000000000..73dec8644
--- /dev/null
+++ b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/20.json
@@ -0,0 +1,825 @@
+{
+  "database": {
+    "entities": [
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `BowImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `bow` INTEGER, FOREIGN KEY(`bow`) REFERENCES `Bow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "bow"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Bow"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "BowImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `EndImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `end` INTEGER, FOREIGN KEY(`end`) REFERENCES `End`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "end",
+            "fieldPath": "end",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "end"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "End"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "EndImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Signature`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `bitmap` BLOB)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "bitmap",
+            "fieldPath": "bitmap",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Signature"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `ArrowImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `arrow` INTEGER, FOREIGN KEY(`arrow`) REFERENCES `Arrow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "arrow"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Arrow"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "ArrowImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Arrow`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `length` TEXT, `material` TEXT, `spine` TEXT, `weight` TEXT, `tipWeight` TEXT, `vanes` TEXT, `nock` TEXT, `comment` TEXT, `diameter` TEXT, `thumbnail` BLOB )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "length",
+            "fieldPath": "length",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "material",
+            "fieldPath": "material",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "spine",
+            "fieldPath": "spine",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "weight",
+            "fieldPath": "weight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tipWeight",
+            "fieldPath": "tipWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "vanes",
+            "fieldPath": "vanes",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "nock",
+            "fieldPath": "nock",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "diameter",
+            "fieldPath": "diameter",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Arrow"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Bow`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `type` INTEGER, `brand` TEXT, `size` TEXT, `braceHeight` TEXT, `tiller` TEXT, `limbs` TEXT, `sight` TEXT, `drawWeight` TEXT, `stabilizer` TEXT, `clicker` TEXT, `button` TEXT, `string` TEXT, `nockingPoint` TEXT, `letoffWeight` TEXT, `arrowRest` TEXT, `restHorizontalPosition` TEXT, `restVerticalPosition` TEXT, `restStiffness` TEXT, `camSetting` TEXT, `scopeMagnification` TEXT, `description` TEXT, `thumbnail` BLOB )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "type",
+            "fieldPath": "type",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "brand",
+            "fieldPath": "brand",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "size",
+            "fieldPath": "size",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "braceHeight",
+            "fieldPath": "braceHeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tiller",
+            "fieldPath": "tiller",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "limbs",
+            "fieldPath": "limbs",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "sight",
+            "fieldPath": "sight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "drawWeight",
+            "fieldPath": "drawWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "stabilizer",
+            "fieldPath": "stabilizer",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "clicker",
+            "fieldPath": "clicker",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "button",
+            "fieldPath": "button",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "string",
+            "fieldPath": "string",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "nockingPoint",
+            "fieldPath": "nockingPoint",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "letoffWeight",
+            "fieldPath": "letoffWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "arrowRest",
+            "fieldPath": "arrowRest",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restHorizontalPosition",
+            "fieldPath": "restHorizontalPosition",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restVerticalPosition",
+            "fieldPath": "restVerticalPosition",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restStiffness",
+            "fieldPath": "restStiffness",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "camSetting",
+            "fieldPath": "camSetting",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "scopeMagnification",
+            "fieldPath": "scopeMagnification",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "description",
+            "fieldPath": "description",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Bow"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `StandardRound`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `club` INTEGER, `name` TEXT )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "club",
+            "fieldPath": "club",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "StandardRound"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `RoundTemplate`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `standardRound` INTEGER, `index` INTEGER, `shotsPerEnd` INTEGER, `endCount` INTEGER, `distance` TEXT, `targetId` INTEGER, `targetScoringStyle` INTEGER, `targetDiameter` TEXT, FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "standardRound",
+            "fieldPath": "standardRound",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "shotsPerEnd",
+            "fieldPath": "shotsPerEnd",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "endCount",
+            "fieldPath": "endCount",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetId",
+            "fieldPath": "targetId",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetScoringStyle",
+            "fieldPath": "targetScoringStyle",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "targetDiameter",
+            "fieldPath": "targetDiameter",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "RoundTemplate"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Training`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `title` TEXT, `date` INTEGER, `standardRound` INTEGER, `bow` INTEGER, `arrow` INTEGER, `arrowNumbering` INTEGER, `indoor` INTEGER, `weather` INTEGER, `windDirection` INTEGER, `windSpeed` INTEGER, `location` TEXT, FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE NO ACTION, FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "title",
+            "fieldPath": "title",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "date",
+            "fieldPath": "date",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "standardRound",
+            "fieldPath": "standardRound",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrowNumbering",
+            "fieldPath": "arrowNumbering",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "indoor",
+            "fieldPath": "indoor",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "weather",
+            "fieldPath": "weather",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "windDirection",
+            "fieldPath": "windDirection",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "windSpeed",
+            "fieldPath": "windSpeed",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "location",
+            "fieldPath": "location",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Training"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Round`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `training` INTEGER, `index` INTEGER, `shotsPerEnd` INTEGER, `maxEndCount` INTEGER, `distance` TEXT, `comment` TEXT, `targetId` INTEGER, `targetScoringStyle` INTEGER, `targetDiameter` TEXT, FOREIGN KEY(`training`) REFERENCES Training(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "training",
+            "fieldPath": "training",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "shotsPerEnd",
+            "fieldPath": "shotsPerEnd",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "maxEndCount",
+            "fieldPath": "maxEndCount",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetId",
+            "fieldPath": "targetId",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetScoringStyle",
+            "fieldPath": "targetScoringStyle",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "targetDiameter",
+            "fieldPath": "targetDiameter",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Round"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `End`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `index` INTEGER, `round` INTEGER, `exact` INTEGER, `saveTime` INTEGER, FOREIGN KEY(`round`) REFERENCES Round(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "round",
+            "fieldPath": "round",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "exact",
+            "fieldPath": "exact",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "saveTime",
+            "fieldPath": "saveTime",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "End"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Shot`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `index` INTEGER, `end` INTEGER, `x` REAL, `y` REAL, `scoringRing` INTEGER, `comment` TEXT, `arrowNumber` TEXT, FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "end",
+            "fieldPath": "end",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "x",
+            "fieldPath": "x",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "y",
+            "fieldPath": "y",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "scoringRing",
+            "fieldPath": "scoringRing",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "arrowNumber",
+            "fieldPath": "arrowNumber",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Shot"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `SightMark`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `bow` INTEGER, `distance` TEXT, `value` TEXT, FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "value",
+            "fieldPath": "value",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "SightMark"
+      }
+    ],
+    "identityHash": "b6b98474875167708d8af9a67e3e0f04",
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"b6b98474875167708d8af9a67e3e0f04\")"
+    ],
+    "version": 20
+  },
+  "formatVersion": 1
+}
\ No newline at end of file
diff --git a/app/schemas/de.dreier.mytargets.base.db.AppDatabase/21.json b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/21.json
new file mode 100644
index 000000000..0ed19497a
--- /dev/null
+++ b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/21.json
@@ -0,0 +1,825 @@
+{
+  "database": {
+    "entities": [
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `EndImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `end` INTEGER, FOREIGN KEY(`end`) REFERENCES `End`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "end",
+            "fieldPath": "end",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "end"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "End"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "EndImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Signature`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `bitmap` BLOB)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "bitmap",
+            "fieldPath": "bitmap",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Signature"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `BowImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `bow` INTEGER, FOREIGN KEY(`bow`) REFERENCES `Bow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "bow"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Bow"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "BowImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `ArrowImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `arrow` INTEGER, FOREIGN KEY(`arrow`) REFERENCES `Arrow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "arrow"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Arrow"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "ArrowImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Arrow`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `length` TEXT, `material` TEXT, `spine` TEXT, `weight` TEXT, `tipWeight` TEXT, `vanes` TEXT, `nock` TEXT, `comment` TEXT, `diameter` TEXT, `thumbnail` BLOB )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "length",
+            "fieldPath": "length",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "material",
+            "fieldPath": "material",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "spine",
+            "fieldPath": "spine",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "weight",
+            "fieldPath": "weight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tipWeight",
+            "fieldPath": "tipWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "vanes",
+            "fieldPath": "vanes",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "nock",
+            "fieldPath": "nock",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "diameter",
+            "fieldPath": "diameter",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Arrow"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Bow`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `type` INTEGER, `brand` TEXT, `size` TEXT, `braceHeight` TEXT, `tiller` TEXT, `limbs` TEXT, `sight` TEXT, `drawWeight` TEXT, `stabilizer` TEXT, `clicker` TEXT, `button` TEXT, `string` TEXT, `nockingPoint` TEXT, `letoffWeight` TEXT, `arrowRest` TEXT, `restHorizontalPosition` TEXT, `restVerticalPosition` TEXT, `restStiffness` TEXT, `camSetting` TEXT, `scopeMagnification` TEXT, `description` TEXT, `thumbnail` BLOB )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "type",
+            "fieldPath": "type",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "brand",
+            "fieldPath": "brand",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "size",
+            "fieldPath": "size",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "braceHeight",
+            "fieldPath": "braceHeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tiller",
+            "fieldPath": "tiller",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "limbs",
+            "fieldPath": "limbs",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "sight",
+            "fieldPath": "sight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "drawWeight",
+            "fieldPath": "drawWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "stabilizer",
+            "fieldPath": "stabilizer",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "clicker",
+            "fieldPath": "clicker",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "button",
+            "fieldPath": "button",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "string",
+            "fieldPath": "string",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "nockingPoint",
+            "fieldPath": "nockingPoint",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "letoffWeight",
+            "fieldPath": "letoffWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "arrowRest",
+            "fieldPath": "arrowRest",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restHorizontalPosition",
+            "fieldPath": "restHorizontalPosition",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restVerticalPosition",
+            "fieldPath": "restVerticalPosition",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restStiffness",
+            "fieldPath": "restStiffness",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "camSetting",
+            "fieldPath": "camSetting",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "scopeMagnification",
+            "fieldPath": "scopeMagnification",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "description",
+            "fieldPath": "description",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Bow"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `StandardRound`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `club` INTEGER, `name` TEXT )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "club",
+            "fieldPath": "club",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "StandardRound"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `RoundTemplate`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `standardRound` INTEGER, `index` INTEGER, `shotsPerEnd` INTEGER, `endCount` INTEGER, `distance` TEXT, `targetId` INTEGER, `targetScoringStyle` INTEGER, `targetDiameter` TEXT, FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "standardRound",
+            "fieldPath": "standardRound",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "shotsPerEnd",
+            "fieldPath": "shotsPerEnd",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "endCount",
+            "fieldPath": "endCount",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetId",
+            "fieldPath": "targetId",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetScoringStyle",
+            "fieldPath": "targetScoringStyle",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "targetDiameter",
+            "fieldPath": "targetDiameter",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "RoundTemplate"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Training`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `title` TEXT, `date` INTEGER, `standardRound` INTEGER, `bow` INTEGER, `arrow` INTEGER, `arrowNumbering` INTEGER, `indoor` INTEGER, `weather` INTEGER, `windDirection` INTEGER, `windSpeed` INTEGER, `location` TEXT, FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE NO ACTION, FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "title",
+            "fieldPath": "title",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "date",
+            "fieldPath": "date",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "standardRound",
+            "fieldPath": "standardRound",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrowNumbering",
+            "fieldPath": "arrowNumbering",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "indoor",
+            "fieldPath": "indoor",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "weather",
+            "fieldPath": "weather",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "windDirection",
+            "fieldPath": "windDirection",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "windSpeed",
+            "fieldPath": "windSpeed",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "location",
+            "fieldPath": "location",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Training"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Round`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `training` INTEGER, `index` INTEGER, `shotsPerEnd` INTEGER, `maxEndCount` INTEGER, `distance` TEXT, `comment` TEXT, `targetId` INTEGER, `targetScoringStyle` INTEGER, `targetDiameter` TEXT, FOREIGN KEY(`training`) REFERENCES Training(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "training",
+            "fieldPath": "training",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "shotsPerEnd",
+            "fieldPath": "shotsPerEnd",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "maxEndCount",
+            "fieldPath": "maxEndCount",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetId",
+            "fieldPath": "targetId",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetScoringStyle",
+            "fieldPath": "targetScoringStyle",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "targetDiameter",
+            "fieldPath": "targetDiameter",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Round"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `End`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `index` INTEGER, `round` INTEGER, `exact` INTEGER, `saveTime` INTEGER, FOREIGN KEY(`round`) REFERENCES Round(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "round",
+            "fieldPath": "round",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "exact",
+            "fieldPath": "exact",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "saveTime",
+            "fieldPath": "saveTime",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "End"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Shot`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `index` INTEGER, `end` INTEGER, `x` REAL, `y` REAL, `scoringRing` INTEGER, `comment` TEXT, `arrowNumber` TEXT, FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "end",
+            "fieldPath": "end",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "x",
+            "fieldPath": "x",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "y",
+            "fieldPath": "y",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "scoringRing",
+            "fieldPath": "scoringRing",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "arrowNumber",
+            "fieldPath": "arrowNumber",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Shot"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `SightMark`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `bow` INTEGER, `distance` TEXT, `value` TEXT, FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "value",
+            "fieldPath": "value",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "SightMark"
+      }
+    ],
+    "identityHash": "b6b98474875167708d8af9a67e3e0f04",
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"b6b98474875167708d8af9a67e3e0f04\")"
+    ],
+    "version": 21
+  },
+  "formatVersion": 1
+}
\ No newline at end of file
diff --git a/app/schemas/de.dreier.mytargets.base.db.AppDatabase/22.json b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/22.json
new file mode 100644
index 000000000..273073d70
--- /dev/null
+++ b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/22.json
@@ -0,0 +1,825 @@
+{
+  "database": {
+    "entities": [
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `EndImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `end` INTEGER, FOREIGN KEY(`end`) REFERENCES `End`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "end",
+            "fieldPath": "end",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "end"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "End"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "EndImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Signature`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `bitmap` BLOB)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "bitmap",
+            "fieldPath": "bitmap",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Signature"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `BowImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `bow` INTEGER, FOREIGN KEY(`bow`) REFERENCES `Bow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "bow"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Bow"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "BowImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `ArrowImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `arrow` INTEGER, FOREIGN KEY(`arrow`) REFERENCES `Arrow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "arrow"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Arrow"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "ArrowImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Arrow`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `length` TEXT, `material` TEXT, `spine` TEXT, `weight` TEXT, `tipWeight` TEXT, `vanes` TEXT, `nock` TEXT, `comment` TEXT, `diameter` TEXT, `thumbnail` BLOB )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "length",
+            "fieldPath": "length",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "material",
+            "fieldPath": "material",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "spine",
+            "fieldPath": "spine",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "weight",
+            "fieldPath": "weight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tipWeight",
+            "fieldPath": "tipWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "vanes",
+            "fieldPath": "vanes",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "nock",
+            "fieldPath": "nock",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "diameter",
+            "fieldPath": "diameter",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Arrow"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Bow`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `type` INTEGER, `brand` TEXT, `size` TEXT, `braceHeight` TEXT, `tiller` TEXT, `limbs` TEXT, `sight` TEXT, `drawWeight` TEXT, `stabilizer` TEXT, `clicker` TEXT, `button` TEXT, `string` TEXT, `nockingPoint` TEXT, `letoffWeight` TEXT, `arrowRest` TEXT, `restHorizontalPosition` TEXT, `restVerticalPosition` TEXT, `restStiffness` TEXT, `camSetting` TEXT, `scopeMagnification` TEXT, `description` TEXT, `thumbnail` BLOB )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "type",
+            "fieldPath": "type",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "brand",
+            "fieldPath": "brand",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "size",
+            "fieldPath": "size",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "braceHeight",
+            "fieldPath": "braceHeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tiller",
+            "fieldPath": "tiller",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "limbs",
+            "fieldPath": "limbs",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "sight",
+            "fieldPath": "sight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "drawWeight",
+            "fieldPath": "drawWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "stabilizer",
+            "fieldPath": "stabilizer",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "clicker",
+            "fieldPath": "clicker",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "button",
+            "fieldPath": "button",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "string",
+            "fieldPath": "string",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "nockingPoint",
+            "fieldPath": "nockingPoint",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "letoffWeight",
+            "fieldPath": "letoffWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "arrowRest",
+            "fieldPath": "arrowRest",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restHorizontalPosition",
+            "fieldPath": "restHorizontalPosition",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restVerticalPosition",
+            "fieldPath": "restVerticalPosition",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restStiffness",
+            "fieldPath": "restStiffness",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "camSetting",
+            "fieldPath": "camSetting",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "scopeMagnification",
+            "fieldPath": "scopeMagnification",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "description",
+            "fieldPath": "description",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Bow"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `StandardRound`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `club` INTEGER, `name` TEXT )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "club",
+            "fieldPath": "club",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "StandardRound"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `RoundTemplate`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `standardRound` INTEGER, `index` INTEGER, `shotsPerEnd` INTEGER, `endCount` INTEGER, `distance` TEXT, `targetId` INTEGER, `targetScoringStyle` INTEGER, `targetDiameter` TEXT, FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "standardRound",
+            "fieldPath": "standardRound",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "shotsPerEnd",
+            "fieldPath": "shotsPerEnd",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "endCount",
+            "fieldPath": "endCount",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetId",
+            "fieldPath": "targetId",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetScoringStyle",
+            "fieldPath": "targetScoringStyle",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "targetDiameter",
+            "fieldPath": "targetDiameter",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "RoundTemplate"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Training`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `title` TEXT, `date` INTEGER, `standardRound` INTEGER, `bow` INTEGER, `arrow` INTEGER, `arrowNumbering` INTEGER, `indoor` INTEGER, `weather` INTEGER, `windDirection` INTEGER, `windSpeed` INTEGER, `location` TEXT, FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE NO ACTION, FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "title",
+            "fieldPath": "title",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "date",
+            "fieldPath": "date",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "standardRound",
+            "fieldPath": "standardRound",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrowNumbering",
+            "fieldPath": "arrowNumbering",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "indoor",
+            "fieldPath": "indoor",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "weather",
+            "fieldPath": "weather",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "windDirection",
+            "fieldPath": "windDirection",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "windSpeed",
+            "fieldPath": "windSpeed",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "location",
+            "fieldPath": "location",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Training"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Round`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `training` INTEGER, `index` INTEGER, `shotsPerEnd` INTEGER, `maxEndCount` INTEGER, `distance` TEXT, `comment` TEXT, `targetId` INTEGER, `targetScoringStyle` INTEGER, `targetDiameter` TEXT, FOREIGN KEY(`training`) REFERENCES Training(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "training",
+            "fieldPath": "training",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "shotsPerEnd",
+            "fieldPath": "shotsPerEnd",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "maxEndCount",
+            "fieldPath": "maxEndCount",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetId",
+            "fieldPath": "targetId",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetScoringStyle",
+            "fieldPath": "targetScoringStyle",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "targetDiameter",
+            "fieldPath": "targetDiameter",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Round"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `End`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `index` INTEGER, `round` INTEGER, `exact` INTEGER, `saveTime` INTEGER, FOREIGN KEY(`round`) REFERENCES Round(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "round",
+            "fieldPath": "round",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "exact",
+            "fieldPath": "exact",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "saveTime",
+            "fieldPath": "saveTime",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "End"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Shot`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `index` INTEGER, `end` INTEGER, `x` REAL, `y` REAL, `scoringRing` INTEGER, `comment` TEXT, `arrowNumber` TEXT, FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "end",
+            "fieldPath": "end",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "x",
+            "fieldPath": "x",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "y",
+            "fieldPath": "y",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "scoringRing",
+            "fieldPath": "scoringRing",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "arrowNumber",
+            "fieldPath": "arrowNumber",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Shot"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `SightMark`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `bow` INTEGER, `distance` TEXT, `value` TEXT, FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "value",
+            "fieldPath": "value",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "SightMark"
+      }
+    ],
+    "identityHash": "b6b98474875167708d8af9a67e3e0f04",
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"b6b98474875167708d8af9a67e3e0f04\")"
+    ],
+    "version": 22
+  },
+  "formatVersion": 1
+}
\ No newline at end of file
diff --git a/app/schemas/de.dreier.mytargets.base.db.AppDatabase/23.json b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/23.json
new file mode 100644
index 000000000..4d9597484
--- /dev/null
+++ b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/23.json
@@ -0,0 +1,825 @@
+{
+  "database": {
+    "entities": [
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `EndImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `end` INTEGER, FOREIGN KEY(`end`) REFERENCES `End`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "end",
+            "fieldPath": "end",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "end"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "End"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "EndImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Signature`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `bitmap` BLOB)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "bitmap",
+            "fieldPath": "bitmap",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Signature"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `BowImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `bow` INTEGER, FOREIGN KEY(`bow`) REFERENCES `Bow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "bow"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Bow"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "BowImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `ArrowImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `arrow` INTEGER, FOREIGN KEY(`arrow`) REFERENCES `Arrow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "arrow"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Arrow"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "ArrowImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Arrow`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `length` TEXT, `material` TEXT, `spine` TEXT, `weight` TEXT, `tipWeight` TEXT, `vanes` TEXT, `nock` TEXT, `comment` TEXT, `diameter` TEXT, `thumbnail` BLOB )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "length",
+            "fieldPath": "length",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "material",
+            "fieldPath": "material",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "spine",
+            "fieldPath": "spine",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "weight",
+            "fieldPath": "weight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tipWeight",
+            "fieldPath": "tipWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "vanes",
+            "fieldPath": "vanes",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "nock",
+            "fieldPath": "nock",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "diameter",
+            "fieldPath": "diameter",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Arrow"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Bow`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `type` INTEGER, `brand` TEXT, `size` TEXT, `braceHeight` TEXT, `tiller` TEXT, `limbs` TEXT, `sight` TEXT, `drawWeight` TEXT, `stabilizer` TEXT, `clicker` TEXT, `button` TEXT, `string` TEXT, `nockingPoint` TEXT, `letoffWeight` TEXT, `arrowRest` TEXT, `restHorizontalPosition` TEXT, `restVerticalPosition` TEXT, `restStiffness` TEXT, `camSetting` TEXT, `scopeMagnification` TEXT, `description` TEXT, `thumbnail` BLOB )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "type",
+            "fieldPath": "type",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "brand",
+            "fieldPath": "brand",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "size",
+            "fieldPath": "size",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "braceHeight",
+            "fieldPath": "braceHeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tiller",
+            "fieldPath": "tiller",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "limbs",
+            "fieldPath": "limbs",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "sight",
+            "fieldPath": "sight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "drawWeight",
+            "fieldPath": "drawWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "stabilizer",
+            "fieldPath": "stabilizer",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "clicker",
+            "fieldPath": "clicker",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "button",
+            "fieldPath": "button",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "string",
+            "fieldPath": "string",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "nockingPoint",
+            "fieldPath": "nockingPoint",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "letoffWeight",
+            "fieldPath": "letoffWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "arrowRest",
+            "fieldPath": "arrowRest",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restHorizontalPosition",
+            "fieldPath": "restHorizontalPosition",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restVerticalPosition",
+            "fieldPath": "restVerticalPosition",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restStiffness",
+            "fieldPath": "restStiffness",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "camSetting",
+            "fieldPath": "camSetting",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "scopeMagnification",
+            "fieldPath": "scopeMagnification",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "description",
+            "fieldPath": "description",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Bow"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `StandardRound`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `club` INTEGER, `name` TEXT )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "club",
+            "fieldPath": "club",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "StandardRound"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `RoundTemplate`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `standardRound` INTEGER, `index` INTEGER, `shotsPerEnd` INTEGER, `endCount` INTEGER, `distance` TEXT, `targetId` INTEGER, `targetScoringStyle` INTEGER, `targetDiameter` TEXT, FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "standardRound",
+            "fieldPath": "standardRound",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "shotsPerEnd",
+            "fieldPath": "shotsPerEnd",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "endCount",
+            "fieldPath": "endCount",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetId",
+            "fieldPath": "targetId",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetScoringStyle",
+            "fieldPath": "targetScoringStyle",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "targetDiameter",
+            "fieldPath": "targetDiameter",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "RoundTemplate"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Training`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `title` TEXT, `date` INTEGER, `standardRound` INTEGER, `bow` INTEGER, `arrow` INTEGER, `arrowNumbering` INTEGER, `indoor` INTEGER, `weather` INTEGER, `windDirection` INTEGER, `windSpeed` INTEGER, `location` TEXT, FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE NO ACTION, FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "title",
+            "fieldPath": "title",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "date",
+            "fieldPath": "date",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "standardRound",
+            "fieldPath": "standardRound",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrowNumbering",
+            "fieldPath": "arrowNumbering",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "indoor",
+            "fieldPath": "indoor",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "weather",
+            "fieldPath": "weather",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "windDirection",
+            "fieldPath": "windDirection",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "windSpeed",
+            "fieldPath": "windSpeed",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "location",
+            "fieldPath": "location",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Training"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Round`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `training` INTEGER, `index` INTEGER, `shotsPerEnd` INTEGER, `maxEndCount` INTEGER, `distance` TEXT, `comment` TEXT, `targetId` INTEGER, `targetScoringStyle` INTEGER, `targetDiameter` TEXT, FOREIGN KEY(`training`) REFERENCES Training(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "training",
+            "fieldPath": "training",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "shotsPerEnd",
+            "fieldPath": "shotsPerEnd",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "maxEndCount",
+            "fieldPath": "maxEndCount",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetId",
+            "fieldPath": "targetId",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetScoringStyle",
+            "fieldPath": "targetScoringStyle",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "targetDiameter",
+            "fieldPath": "targetDiameter",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Round"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `End`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `index` INTEGER, `round` INTEGER, `exact` INTEGER, `saveTime` INTEGER, FOREIGN KEY(`round`) REFERENCES Round(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "round",
+            "fieldPath": "round",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "exact",
+            "fieldPath": "exact",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "saveTime",
+            "fieldPath": "saveTime",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "End"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Shot`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `index` INTEGER, `end` INTEGER, `x` REAL, `y` REAL, `scoringRing` INTEGER, `comment` TEXT, `arrowNumber` TEXT, FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "end",
+            "fieldPath": "end",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "x",
+            "fieldPath": "x",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "y",
+            "fieldPath": "y",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "scoringRing",
+            "fieldPath": "scoringRing",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "arrowNumber",
+            "fieldPath": "arrowNumber",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Shot"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `SightMark`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `bow` INTEGER, `distance` TEXT, `value` TEXT, FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "value",
+            "fieldPath": "value",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "SightMark"
+      }
+    ],
+    "identityHash": "b6b98474875167708d8af9a67e3e0f04",
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"b6b98474875167708d8af9a67e3e0f04\")"
+    ],
+    "version": 23
+  },
+  "formatVersion": 1
+}
\ No newline at end of file
diff --git a/app/schemas/de.dreier.mytargets.base.db.AppDatabase/24.json b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/24.json
new file mode 100644
index 000000000..784a2cb5f
--- /dev/null
+++ b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/24.json
@@ -0,0 +1,849 @@
+{
+  "database": {
+    "entities": [
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `EndImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `end` INTEGER, FOREIGN KEY(`end`) REFERENCES `End`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "end",
+            "fieldPath": "end",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "end"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "End"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "EndImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Signature`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `bitmap` BLOB)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "bitmap",
+            "fieldPath": "bitmap",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Signature"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `BowImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `bow` INTEGER, FOREIGN KEY(`bow`) REFERENCES `Bow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "bow"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Bow"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "BowImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `ArrowImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `arrow` INTEGER, FOREIGN KEY(`arrow`) REFERENCES `Arrow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "arrow"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Arrow"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "ArrowImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Arrow`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `length` TEXT, `material` TEXT, `spine` TEXT, `weight` TEXT, `tipWeight` TEXT, `vanes` TEXT, `nock` TEXT, `comment` TEXT, `diameter` TEXT, `thumbnail` BLOB , maxArrowNumber INTEGER)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "length",
+            "fieldPath": "length",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "material",
+            "fieldPath": "material",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "spine",
+            "fieldPath": "spine",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "weight",
+            "fieldPath": "weight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tipWeight",
+            "fieldPath": "tipWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "vanes",
+            "fieldPath": "vanes",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "nock",
+            "fieldPath": "nock",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "diameter",
+            "fieldPath": "diameter",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "maxArrowNumber",
+            "fieldPath": "maxArrowNumber",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Arrow"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Bow`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `type` INTEGER, `brand` TEXT, `size` TEXT, `braceHeight` TEXT, `tiller` TEXT, `limbs` TEXT, `sight` TEXT, `drawWeight` TEXT, `stabilizer` TEXT, `clicker` TEXT, `button` TEXT, `string` TEXT, `nockingPoint` TEXT, `letoffWeight` TEXT, `arrowRest` TEXT, `restHorizontalPosition` TEXT, `restVerticalPosition` TEXT, `restStiffness` TEXT, `camSetting` TEXT, `scopeMagnification` TEXT, `description` TEXT, `thumbnail` BLOB )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "type",
+            "fieldPath": "type",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "brand",
+            "fieldPath": "brand",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "size",
+            "fieldPath": "size",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "braceHeight",
+            "fieldPath": "braceHeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tiller",
+            "fieldPath": "tiller",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "limbs",
+            "fieldPath": "limbs",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "sight",
+            "fieldPath": "sight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "drawWeight",
+            "fieldPath": "drawWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "stabilizer",
+            "fieldPath": "stabilizer",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "clicker",
+            "fieldPath": "clicker",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "button",
+            "fieldPath": "button",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "string",
+            "fieldPath": "string",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "nockingPoint",
+            "fieldPath": "nockingPoint",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "letoffWeight",
+            "fieldPath": "letoffWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "arrowRest",
+            "fieldPath": "arrowRest",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restHorizontalPosition",
+            "fieldPath": "restHorizontalPosition",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restVerticalPosition",
+            "fieldPath": "restVerticalPosition",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restStiffness",
+            "fieldPath": "restStiffness",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "camSetting",
+            "fieldPath": "camSetting",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "scopeMagnification",
+            "fieldPath": "scopeMagnification",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "description",
+            "fieldPath": "description",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Bow"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `StandardRound`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `club` INTEGER, `name` TEXT )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "club",
+            "fieldPath": "club",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "StandardRound"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `RoundTemplate`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `standardRound` INTEGER, `index` INTEGER, `shotsPerEnd` INTEGER, `endCount` INTEGER, `distance` TEXT, `targetId` INTEGER, `targetScoringStyle` INTEGER, `targetDiameter` TEXT, FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "standardRound",
+            "fieldPath": "standardRound",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "shotsPerEnd",
+            "fieldPath": "shotsPerEnd",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "endCount",
+            "fieldPath": "endCount",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetId",
+            "fieldPath": "targetId",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetScoringStyle",
+            "fieldPath": "targetScoringStyle",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "targetDiameter",
+            "fieldPath": "targetDiameter",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "RoundTemplate"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Round`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `training` INTEGER, `index` INTEGER, `shotsPerEnd` INTEGER, `maxEndCount` INTEGER, `distance` TEXT, `comment` TEXT, `targetId` INTEGER, `targetScoringStyle` INTEGER, `targetDiameter` TEXT, FOREIGN KEY(`training`) REFERENCES Training(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "training",
+            "fieldPath": "training",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "shotsPerEnd",
+            "fieldPath": "shotsPerEnd",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "maxEndCount",
+            "fieldPath": "maxEndCount",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetId",
+            "fieldPath": "targetId",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetScoringStyle",
+            "fieldPath": "targetScoringStyle",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "targetDiameter",
+            "fieldPath": "targetDiameter",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Round"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `SightMark`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `bow` INTEGER, `distance` TEXT, `value` TEXT, FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "value",
+            "fieldPath": "value",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "SightMark"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Training`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `title` TEXT, `date` TEXT, `standardRound` INTEGER, `bow` INTEGER, `arrow` INTEGER, `arrowNumbering` INTEGER, `indoor` INTEGER, `weather` INTEGER, `windDirection` INTEGER, `windSpeed` INTEGER, `location` TEXT, `comment` TEXT, `archerSignature` INTEGER, `witnessSignature` INTEGER, FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, FOREIGN KEY(`archerSignature`) REFERENCES Signature(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, FOREIGN KEY(`witnessSignature`) REFERENCES Signature(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "title",
+            "fieldPath": "title",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "date",
+            "fieldPath": "date",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "standardRound",
+            "fieldPath": "standardRound",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrowNumbering",
+            "fieldPath": "arrowNumbering",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "indoor",
+            "fieldPath": "indoor",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "weather",
+            "fieldPath": "weather",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "windDirection",
+            "fieldPath": "windDirection",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "windSpeed",
+            "fieldPath": "windSpeed",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "location",
+            "fieldPath": "location",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "archerSignature",
+            "fieldPath": "archerSignature",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "witnessSignature",
+            "fieldPath": "witnessSignature",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Training"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `End`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `index` INTEGER, `round` INTEGER, `exact` INTEGER, `saveTime` TEXT, `comment` TEXT, FOREIGN KEY(`round`) REFERENCES Round(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "round",
+            "fieldPath": "round",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "exact",
+            "fieldPath": "exact",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "saveTime",
+            "fieldPath": "saveTime",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "End"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Shot`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `index` INTEGER, `end` INTEGER, `x` REAL, `y` REAL, `scoringRing` INTEGER, `arrowNumber` TEXT, FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "end",
+            "fieldPath": "end",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "x",
+            "fieldPath": "x",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "y",
+            "fieldPath": "y",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "scoringRing",
+            "fieldPath": "scoringRing",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "arrowNumber",
+            "fieldPath": "arrowNumber",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Shot"
+      }
+    ],
+    "identityHash": "459ced240906de286ca3425e1fb37647",
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"459ced240906de286ca3425e1fb37647\")"
+    ],
+    "version": 24
+  },
+  "formatVersion": 1
+}
\ No newline at end of file
diff --git a/app/schemas/de.dreier.mytargets.base.db.AppDatabase/25.json b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/25.json
new file mode 100644
index 000000000..980bc9ee9
--- /dev/null
+++ b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/25.json
@@ -0,0 +1,849 @@
+{
+  "database": {
+    "entities": [
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `EndImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `end` INTEGER, FOREIGN KEY(`end`) REFERENCES `End`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "end",
+            "fieldPath": "end",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "end"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "End"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "EndImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Signature`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `bitmap` BLOB)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "bitmap",
+            "fieldPath": "bitmap",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Signature"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `BowImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `bow` INTEGER, FOREIGN KEY(`bow`) REFERENCES `Bow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "bow"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Bow"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "BowImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `ArrowImage`(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fileName` TEXT, `arrow` INTEGER, FOREIGN KEY(`arrow`) REFERENCES `Arrow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "fileName",
+            "fieldPath": "fileName",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [
+          {
+            "columns": [
+              "arrow"
+            ],
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "referencedColumns": [
+              "_id"
+            ],
+            "table": "Arrow"
+          }
+        ],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "ArrowImage"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Arrow`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `length` TEXT, `material` TEXT, `spine` TEXT, `weight` TEXT, `tipWeight` TEXT, `vanes` TEXT, `nock` TEXT, `comment` TEXT, `diameter` TEXT, `thumbnail` BLOB , maxArrowNumber INTEGER)",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "length",
+            "fieldPath": "length",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "material",
+            "fieldPath": "material",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "spine",
+            "fieldPath": "spine",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "weight",
+            "fieldPath": "weight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tipWeight",
+            "fieldPath": "tipWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "vanes",
+            "fieldPath": "vanes",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "nock",
+            "fieldPath": "nock",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "diameter",
+            "fieldPath": "diameter",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "maxArrowNumber",
+            "fieldPath": "maxArrowNumber",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Arrow"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Bow`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `type` INTEGER, `brand` TEXT, `size` TEXT, `braceHeight` TEXT, `tiller` TEXT, `limbs` TEXT, `sight` TEXT, `drawWeight` TEXT, `stabilizer` TEXT, `clicker` TEXT, `button` TEXT, `string` TEXT, `nockingPoint` TEXT, `letoffWeight` TEXT, `arrowRest` TEXT, `restHorizontalPosition` TEXT, `restVerticalPosition` TEXT, `restStiffness` TEXT, `camSetting` TEXT, `scopeMagnification` TEXT, `description` TEXT, `thumbnail` BLOB )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "type",
+            "fieldPath": "type",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "brand",
+            "fieldPath": "brand",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "size",
+            "fieldPath": "size",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "braceHeight",
+            "fieldPath": "braceHeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "tiller",
+            "fieldPath": "tiller",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "limbs",
+            "fieldPath": "limbs",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "sight",
+            "fieldPath": "sight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "drawWeight",
+            "fieldPath": "drawWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "stabilizer",
+            "fieldPath": "stabilizer",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "clicker",
+            "fieldPath": "clicker",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "button",
+            "fieldPath": "button",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "string",
+            "fieldPath": "string",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "nockingPoint",
+            "fieldPath": "nockingPoint",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "letoffWeight",
+            "fieldPath": "letoffWeight",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "arrowRest",
+            "fieldPath": "arrowRest",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restHorizontalPosition",
+            "fieldPath": "restHorizontalPosition",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restVerticalPosition",
+            "fieldPath": "restVerticalPosition",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "restStiffness",
+            "fieldPath": "restStiffness",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "camSetting",
+            "fieldPath": "camSetting",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "scopeMagnification",
+            "fieldPath": "scopeMagnification",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "description",
+            "fieldPath": "description",
+            "notNull": false
+          },
+          {
+            "affinity": "BLOB",
+            "columnName": "thumbnail",
+            "fieldPath": "thumbnail",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Bow"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `StandardRound`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `club` INTEGER, `name` TEXT )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "club",
+            "fieldPath": "club",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "name",
+            "fieldPath": "name",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "StandardRound"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `RoundTemplate`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `standardRound` INTEGER, `index` INTEGER, `shotsPerEnd` INTEGER, `endCount` INTEGER, `distance` TEXT, `targetId` INTEGER, `targetScoringStyle` INTEGER, `targetDiameter` TEXT, FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "standardRound",
+            "fieldPath": "standardRound",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "shotsPerEnd",
+            "fieldPath": "shotsPerEnd",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "endCount",
+            "fieldPath": "endCount",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetId",
+            "fieldPath": "targetId",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetScoringStyle",
+            "fieldPath": "targetScoringStyle",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "targetDiameter",
+            "fieldPath": "targetDiameter",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "RoundTemplate"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Round`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `training` INTEGER, `index` INTEGER, `shotsPerEnd` INTEGER, `maxEndCount` INTEGER, `distance` TEXT, `comment` TEXT, `targetId` INTEGER, `targetScoringStyle` INTEGER, `targetDiameter` TEXT, FOREIGN KEY(`training`) REFERENCES Training(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "training",
+            "fieldPath": "training",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "shotsPerEnd",
+            "fieldPath": "shotsPerEnd",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "maxEndCount",
+            "fieldPath": "maxEndCount",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetId",
+            "fieldPath": "targetId",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "targetScoringStyle",
+            "fieldPath": "targetScoringStyle",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "targetDiameter",
+            "fieldPath": "targetDiameter",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Round"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `SightMark`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `bow` INTEGER, `distance` TEXT, `value` TEXT, FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "distance",
+            "fieldPath": "distance",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "value",
+            "fieldPath": "value",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "SightMark"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Training`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `title` TEXT, `date` TEXT, `standardRound` INTEGER, `bow` INTEGER, `arrow` INTEGER, `arrowNumbering` INTEGER, `indoor` INTEGER, `weather` INTEGER, `windDirection` INTEGER, `windSpeed` INTEGER, `location` TEXT, `comment` TEXT, `archerSignature` INTEGER, `witnessSignature` INTEGER, FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, FOREIGN KEY(`archerSignature`) REFERENCES Signature(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, FOREIGN KEY(`witnessSignature`) REFERENCES Signature(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "title",
+            "fieldPath": "title",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "date",
+            "fieldPath": "date",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "standardRound",
+            "fieldPath": "standardRound",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "bow",
+            "fieldPath": "bow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrow",
+            "fieldPath": "arrow",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "arrowNumbering",
+            "fieldPath": "arrowNumbering",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "indoor",
+            "fieldPath": "indoor",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "weather",
+            "fieldPath": "weather",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "windDirection",
+            "fieldPath": "windDirection",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "windSpeed",
+            "fieldPath": "windSpeed",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "location",
+            "fieldPath": "location",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "archerSignature",
+            "fieldPath": "archerSignature",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "witnessSignature",
+            "fieldPath": "witnessSignature",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Training"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `End`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `index` INTEGER, `round` INTEGER, `exact` INTEGER, `saveTime` TEXT, `comment` TEXT, FOREIGN KEY(`round`) REFERENCES Round(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "round",
+            "fieldPath": "round",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "exact",
+            "fieldPath": "exact",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "saveTime",
+            "fieldPath": "saveTime",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "comment",
+            "fieldPath": "comment",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "End"
+      },
+      {
+        "createSql": "CREATE TABLE IF NOT EXISTS `Shot`( `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `index` INTEGER, `end` INTEGER, `x` REAL, `y` REAL, `scoringRing` INTEGER, `arrowNumber` TEXT, FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "affinity": "INTEGER",
+            "columnName": "_id",
+            "fieldPath": "_id",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "index",
+            "fieldPath": "index",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "end",
+            "fieldPath": "end",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "x",
+            "fieldPath": "x",
+            "notNull": false
+          },
+          {
+            "affinity": "REAL",
+            "columnName": "y",
+            "fieldPath": "y",
+            "notNull": false
+          },
+          {
+            "affinity": "INTEGER",
+            "columnName": "scoringRing",
+            "fieldPath": "scoringRing",
+            "notNull": false
+          },
+          {
+            "affinity": "TEXT",
+            "columnName": "arrowNumber",
+            "fieldPath": "arrowNumber",
+            "notNull": false
+          }
+        ],
+        "foreignKeys": [],
+        "indices": [],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "tableName": "Shot"
+      }
+    ],
+    "identityHash": "459ced240906de286ca3425e1fb37647",
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"459ced240906de286ca3425e1fb37647\")"
+    ],
+    "version": 25
+  },
+  "formatVersion": 1
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
index d8bd00863..662e8887c 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
@@ -15,8 +15,11 @@
 
 package de.dreier.mytargets.app
 
+import android.arch.persistence.db.framework.FrameworkSQLiteOpenHelperFactory
+import android.arch.persistence.room.testing.MigrationTestHelper
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
+import android.support.test.InstrumentationRegistry
 import android.support.test.InstrumentationRegistry.getContext
 import android.support.test.InstrumentationRegistry.getTargetContext
 import android.support.test.filters.SmallTest
@@ -34,30 +37,31 @@ import de.dreier.mytargets.shared.models.EWeather
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.test.base.InstrumentedTestBase
-import org.junit.After
-import org.junit.Before
-import org.junit.BeforeClass
-import org.junit.Test
+import org.junit.*
 import org.junit.runner.RunWith
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
 import java.util.*
+import de.dreier.mytargets.base.db.migrations.*
+import android.arch.persistence.room.Room
+
 
 @SmallTest
 @RunWith(AndroidJUnit4::class)
 class MigrationTest : InstrumentedTestBase() {
 
+    @Rule
+    val testHelper = MigrationTestHelper(
+        InstrumentationRegistry.getInstrumentation(),
+        AppDatabase::class.java.canonicalName
+    )
+
     /**
      * Handle to a database based on schema 16 is updated to the current schema during setUp.
      */
     private var upgradedDb: DatabaseWrapper? = null
 
-    /**
-     * A sqlite open helper for the app's data layer.
-     */
-    private var helper: DatabaseHelperDelegate? = null
-
     @Before
     @Throws(IOException::class)
     fun setUp() {
@@ -65,11 +69,16 @@ class MigrationTest : InstrumentedTestBase() {
 
         // Create artificial image file to ensure the according database entry is not deleted (Migration23)
         getTargetContext()
-                .openFileOutput("img175420839671886584-0f61-43a6-bc1e-dbcd8526056c794370927.jpg", Context.MODE_PRIVATE)
-                .close()
+            .openFileOutput(
+                "img175420839671886584-0f61-43a6-bc1e-dbcd8526056c794370927.jpg",
+                Context.MODE_PRIVATE
+            )
+            .close()
 
-        val tmpDb = getTargetContext().getDatabasePath(DatabaseHelperDelegate
-                .getTempDbFileName(FlowManager.getDatabase(AppDatabase.NAME)))
+        val tmpDb = getTargetContext().getDatabasePath(
+            DatabaseHelperDelegate
+                .getTempDbFileName(FlowManager.getDatabase(AppDatabase.NAME))
+        )
 
         val `in` = getContext().assets.open("database.db")
         val out = FileOutputStream(tmpDb)
@@ -97,7 +106,60 @@ class MigrationTest : InstrumentedTestBase() {
 
         val bows = BowDAO.loadBows()
         Truth.assertThat(BowDAO.loadBowImages(bows[0].id)[0].fileName)
-                .isEqualTo("img175420839671886584-0f61-43a6-bc1e-dbcd8526056c794370927.jpg")
+            .isEqualTo("img175420839671886584-0f61-43a6-bc1e-dbcd8526056c794370927.jpg")
+    }
+
+    private val TEST_DB_NAME = "test_db"
+
+    fun test() {
+        val db = testHelper.createDatabase(TEST_DB_NAME, 2)
+
+        //db.insert("", ...)
+
+        db.close()
+
+        testHelper.runMigrationsAndValidate(
+            TEST_DB_NAME, 3,
+            true, Migration2, Migration3, Migration4,
+            Migration5, Migration6, Migration7,
+            Migration8, Migration9, Migration10,
+            Migration11, Migration12, Migration13,
+            Migration14, Migration15, Migration16,
+            Migration17, Migration18, Migration19,
+            Migration20, Migration21, Migration22,
+            Migration23, Migration24, Migration25,
+            Migration26
+        )
+
+        // MigrationTestHelper automatically verifies the schema
+        //changes, but not the data validity
+        // Validate that the data was migrated properly.
+        val dbUser = getMigratedRoomDatabase().userDao().getUser()
+        assertEquals(dbUser.getId(), USER.getId())
+        assertEquals(dbUser.getUserName(), USER.getUserName())
+        // The date was missing in version 2, so it should be null in
+        //version 3
+        assertEquals(dbUser.getDate(), null)
+    }
+
+    private fun getMigratedRoomDatabase(): AppDatabase {
+        val database = Room.databaseBuilder(
+            InstrumentationRegistry.getTargetContext(),
+            AppDatabase::class.java, TEST_DB_NAME
+        ).addMigrations(
+            Migration2, Migration3, Migration4,
+            Migration5, Migration6, Migration7,
+            Migration8, Migration9, Migration10,
+            Migration11, Migration12, Migration13,
+            Migration14, Migration15, Migration16,
+            Migration17, Migration18, Migration19,
+            Migration20, Migration21, Migration22,
+            Migration23, Migration24, Migration25,
+            Migration26
+        )
+            .build()
+        testHelper.closeWhenFinished(database)
+        return database
     }
 
     private fun assertTraining1(training: Training) {
@@ -188,7 +250,7 @@ class MigrationTest : InstrumentedTestBase() {
 
         val newFile = File.createTempFile("newDb", ".db")
         val newDb = AndroidDatabase
-                .from(SQLiteDatabase.openOrCreateDatabase(newFile, null))
+            .from(SQLiteDatabase.openOrCreateDatabase(newFile, null))
         helper!!.onCreate(newDb)
         val newSchema = extractSchema(newDb)
 
@@ -211,10 +273,12 @@ class MigrationTest : InstrumentedTestBase() {
                 val columnNullable = cu.getString(3)
                 val columnDefault = cu.getString(4)
 
-                schema.add("TABLE " + tableName +
-                        " COLUMN " + columnName + " " + columnType +
-                        " NULLABLE=" + columnNullable +
-                        " DEFAULT=" + columnDefault)
+                schema.add(
+                    "TABLE " + tableName +
+                            " COLUMN " + columnName + " " + columnType +
+                            " NULLABLE=" + columnNullable +
+                            " DEFAULT=" + columnDefault
+                )
                 cu.moveToNext()
             }
             cu.close()

From beb4957e0318c25e8703119658a75178c9125bd9 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Thu, 22 Mar 2018 21:46:33 +0100
Subject: [PATCH 070/102] WIP: Fix migration to Version 26

---
 .../26.json                                   | 164 +++----
 app/src/androidTest/assets/database.db        | Bin 122880 -> 0 bytes
 .../de/dreier/mytargets/app/MigrationTest.kt  | 327 ++++++-------
 .../features/main/MainActivityTest.kt         |  18 +-
 .../statistics/StatisticsActivityTest.kt      |   6 +-
 .../training/ScoreboardActivityTest.kt        |   4 +-
 .../features/training/TrainingActivityTest.kt |  18 +-
 .../training/input/InputActivityTest.kt       |  14 +-
 .../StandardRoundActivityTest.kt              |   6 +-
 .../test/utils/rules/DbTestRuleBase.kt        |  21 +-
 .../test/utils/rules/MiniDbTestRule.kt        |  12 +-
 .../test/utils/rules/SimpleDbTestRule.kt      |  34 +-
 .../mytargets/app/ApplicationInstance.kt      |   4 +-
 .../mytargets/base/db/StandardRoundFactory.kt |   2 +-
 .../dreier/mytargets/base/db/dao/ArrowDAO.kt  |   8 +-
 .../de/dreier/mytargets/base/db/dao/BowDAO.kt |  12 +-
 .../de/dreier/mytargets/base/db/dao/EndDAO.kt |  12 +-
 .../dreier/mytargets/base/db/dao/RoundDAO.kt  |  12 +-
 .../mytargets/base/db/dao/SignatureDAO.kt     |   4 +-
 .../mytargets/base/db/dao/StandardRoundDAO.kt |  10 +-
 .../mytargets/base/db/dao/TrainingDAO.kt      |   2 +-
 .../base/db/migrations/Migration22.kt         |   2 +-
 .../base/db/migrations/Migration23.kt         |   4 +-
 .../base/db/migrations/Migration26.kt         | 443 +++++++++++++++++-
 .../base/db/migrations/Migration9.kt          |  10 +-
 .../db/migrations/RoomCreationCallback.kt     |  12 +-
 .../mytargets/shared/models/db/Arrow.kt       |   1 -
 .../mytargets/shared/models/db/ArrowImage.kt  |   7 +-
 .../dreier/mytargets/shared/models/db/Bow.kt  |   1 -
 .../mytargets/shared/models/db/BowImage.kt    |   7 +-
 .../dreier/mytargets/shared/models/db/End.kt  |  11 +-
 .../mytargets/shared/models/db/EndImage.kt    |  35 +-
 .../mytargets/shared/models/db/Round.kt       |  11 +-
 .../shared/models/db/RoundTemplate.kt         |  22 +-
 .../dreier/mytargets/shared/models/db/Shot.kt |   7 +-
 .../mytargets/shared/models/db/SightMark.kt   |   7 +-
 .../mytargets/shared/models/db/Signature.kt   |   1 -
 .../shared/models/db/StandardRound.kt         |   2 -
 .../mytargets/shared/models/db/Training.kt    | 106 ++---
 39 files changed, 876 insertions(+), 503 deletions(-)
 delete mode 100755 app/src/androidTest/assets/database.db

diff --git a/app/schemas/de.dreier.mytargets.base.db.AppDatabase/26.json b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/26.json
index 413343ab1..d55ac90df 100644
--- a/app/schemas/de.dreier.mytargets.base.db.AppDatabase/26.json
+++ b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/26.json
@@ -2,15 +2,15 @@
   "formatVersion": 1,
   "database": {
     "version": 26,
-    "identityHash": "073ada58fac1a02407d87cc2562ed1dc",
+    "identityHash": "b6d6b0158fa45fc088c7bc0db5d85fb7",
     "entities": [
       {
         "tableName": "Arrow",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `maxArrowNumber` INTEGER NOT NULL, `length` TEXT, `material` TEXT, `spine` TEXT, `weight` TEXT, `tipWeight` TEXT, `vanes` TEXT, `nock` TEXT, `comment` TEXT, `diameter` TEXT NOT NULL, `thumbnail` BLOB)",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `maxArrowNumber` INTEGER NOT NULL, `length` TEXT, `material` TEXT, `spine` TEXT, `weight` TEXT, `tipWeight` TEXT, `vanes` TEXT, `nock` TEXT, `comment` TEXT, `diameter` TEXT NOT NULL, `thumbnail` BLOB)",
         "fields": [
           {
             "fieldPath": "id",
-            "columnName": "_id",
+            "columnName": "id",
             "affinity": "INTEGER",
             "notNull": true
           },
@@ -89,7 +89,7 @@
         ],
         "primaryKey": {
           "columnNames": [
-            "_id"
+            "id"
           ],
           "autoGenerate": true
         },
@@ -98,11 +98,11 @@
       },
       {
         "tableName": "ArrowImage",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `fileName` TEXT NOT NULL, `arrow` INTEGER, FOREIGN KEY(`arrow`) REFERENCES `Arrow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `fileName` TEXT NOT NULL, `arrowId` INTEGER, FOREIGN KEY(`arrowId`) REFERENCES `Arrow`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
         "fields": [
           {
             "fieldPath": "id",
-            "columnName": "_id",
+            "columnName": "id",
             "affinity": "INTEGER",
             "notNull": true
           },
@@ -114,14 +114,14 @@
           },
           {
             "fieldPath": "arrowId",
-            "columnName": "arrow",
+            "columnName": "arrowId",
             "affinity": "INTEGER",
             "notNull": false
           }
         ],
         "primaryKey": {
           "columnNames": [
-            "_id"
+            "id"
           ],
           "autoGenerate": true
         },
@@ -132,21 +132,21 @@
             "onDelete": "CASCADE",
             "onUpdate": "NO ACTION",
             "columns": [
-              "arrow"
+              "arrowId"
             ],
             "referencedColumns": [
-              "_id"
+              "id"
             ]
           }
         ]
       },
       {
         "tableName": "Bow",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `type` INTEGER, `brand` TEXT, `size` TEXT, `braceHeight` TEXT, `tiller` TEXT, `limbs` TEXT, `sight` TEXT, `drawWeight` TEXT, `stabilizer` TEXT, `clicker` TEXT, `button` TEXT, `string` TEXT, `nockingPoint` TEXT, `letoffWeight` TEXT, `arrowRest` TEXT, `restHorizontalPosition` TEXT, `restVerticalPosition` TEXT, `restStiffness` TEXT, `camSetting` TEXT, `scopeMagnification` TEXT, `description` TEXT, `thumbnail` BLOB)",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `type` INTEGER, `brand` TEXT, `size` TEXT, `braceHeight` TEXT, `tiller` TEXT, `limbs` TEXT, `sight` TEXT, `drawWeight` TEXT, `stabilizer` TEXT, `clicker` TEXT, `button` TEXT, `string` TEXT, `nockingPoint` TEXT, `letoffWeight` TEXT, `arrowRest` TEXT, `restHorizontalPosition` TEXT, `restVerticalPosition` TEXT, `restStiffness` TEXT, `camSetting` TEXT, `scopeMagnification` TEXT, `description` TEXT, `thumbnail` BLOB)",
         "fields": [
           {
             "fieldPath": "id",
-            "columnName": "_id",
+            "columnName": "id",
             "affinity": "INTEGER",
             "notNull": true
           },
@@ -291,7 +291,7 @@
         ],
         "primaryKey": {
           "columnNames": [
-            "_id"
+            "id"
           ],
           "autoGenerate": true
         },
@@ -300,11 +300,11 @@
       },
       {
         "tableName": "BowImage",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `fileName` TEXT NOT NULL, `bow` INTEGER, FOREIGN KEY(`bow`) REFERENCES `Bow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `fileName` TEXT NOT NULL, `bowId` INTEGER, FOREIGN KEY(`bowId`) REFERENCES `Bow`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
         "fields": [
           {
             "fieldPath": "id",
-            "columnName": "_id",
+            "columnName": "id",
             "affinity": "INTEGER",
             "notNull": true
           },
@@ -316,14 +316,14 @@
           },
           {
             "fieldPath": "bowId",
-            "columnName": "bow",
+            "columnName": "bowId",
             "affinity": "INTEGER",
             "notNull": false
           }
         ],
         "primaryKey": {
           "columnNames": [
-            "_id"
+            "id"
           ],
           "autoGenerate": true
         },
@@ -334,21 +334,21 @@
             "onDelete": "CASCADE",
             "onUpdate": "NO ACTION",
             "columns": [
-              "bow"
+              "bowId"
             ],
             "referencedColumns": [
-              "_id"
+              "id"
             ]
           }
         ]
       },
       {
         "tableName": "End",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `index` INTEGER NOT NULL, `round` INTEGER, `exact` INTEGER NOT NULL, `saveTime` TEXT, `comment` TEXT NOT NULL, `reachedPoints` INTEGER NOT NULL, `totalPoints` INTEGER NOT NULL, `shotCount` INTEGER NOT NULL, FOREIGN KEY(`round`) REFERENCES `Round`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `index` INTEGER NOT NULL, `roundId` INTEGER, `exact` INTEGER NOT NULL, `saveTime` TEXT, `comment` TEXT NOT NULL, `reachedPoints` INTEGER NOT NULL, `totalPoints` INTEGER NOT NULL, `shotCount` INTEGER NOT NULL, FOREIGN KEY(`roundId`) REFERENCES `Round`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
         "fields": [
           {
             "fieldPath": "id",
-            "columnName": "_id",
+            "columnName": "id",
             "affinity": "INTEGER",
             "notNull": true
           },
@@ -360,7 +360,7 @@
           },
           {
             "fieldPath": "roundId",
-            "columnName": "round",
+            "columnName": "roundId",
             "affinity": "INTEGER",
             "notNull": false
           },
@@ -403,7 +403,7 @@
         ],
         "primaryKey": {
           "columnNames": [
-            "_id"
+            "id"
           ],
           "autoGenerate": true
         },
@@ -414,21 +414,21 @@
             "onDelete": "CASCADE",
             "onUpdate": "NO ACTION",
             "columns": [
-              "round"
+              "roundId"
             ],
             "referencedColumns": [
-              "_id"
+              "id"
             ]
           }
         ]
       },
       {
         "tableName": "EndImage",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `fileName` TEXT NOT NULL, `end` INTEGER, FOREIGN KEY(`end`) REFERENCES `End`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `fileName` TEXT NOT NULL, `endId` INTEGER, FOREIGN KEY(`endId`) REFERENCES `End`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
         "fields": [
           {
-            "fieldPath": "_id",
-            "columnName": "_id",
+            "fieldPath": "id",
+            "columnName": "id",
             "affinity": "INTEGER",
             "notNull": true
           },
@@ -440,14 +440,14 @@
           },
           {
             "fieldPath": "endId",
-            "columnName": "end",
+            "columnName": "endId",
             "affinity": "INTEGER",
             "notNull": false
           }
         ],
         "primaryKey": {
           "columnNames": [
-            "_id"
+            "id"
           ],
           "autoGenerate": true
         },
@@ -458,27 +458,27 @@
             "onDelete": "CASCADE",
             "onUpdate": "NO ACTION",
             "columns": [
-              "end"
+              "endId"
             ],
             "referencedColumns": [
-              "_id"
+              "id"
             ]
           }
         ]
       },
       {
         "tableName": "Round",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `training` INTEGER, `index` INTEGER NOT NULL, `shotsPerEnd` INTEGER NOT NULL, `maxEndCount` INTEGER, `distance` TEXT NOT NULL, `comment` TEXT NOT NULL, `targetId` INTEGER NOT NULL, `targetScoringStyle` INTEGER NOT NULL, `targetDiameter` TEXT NOT NULL, `reachedPoints` INTEGER NOT NULL, `totalPoints` INTEGER NOT NULL, `shotCount` INTEGER NOT NULL, FOREIGN KEY(`training`) REFERENCES `Training`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `trainingId` INTEGER, `index` INTEGER NOT NULL, `shotsPerEnd` INTEGER NOT NULL, `maxEndCount` INTEGER, `distance` TEXT NOT NULL, `comment` TEXT NOT NULL, `targetId` INTEGER NOT NULL, `targetScoringStyle` INTEGER NOT NULL, `targetDiameter` TEXT NOT NULL, `reachedPoints` INTEGER NOT NULL, `totalPoints` INTEGER NOT NULL, `shotCount` INTEGER NOT NULL, FOREIGN KEY(`trainingId`) REFERENCES `Training`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
         "fields": [
           {
             "fieldPath": "id",
-            "columnName": "_id",
+            "columnName": "id",
             "affinity": "INTEGER",
             "notNull": true
           },
           {
             "fieldPath": "trainingId",
-            "columnName": "training",
+            "columnName": "trainingId",
             "affinity": "INTEGER",
             "notNull": false
           },
@@ -551,7 +551,7 @@
         ],
         "primaryKey": {
           "columnNames": [
-            "_id"
+            "id"
           ],
           "autoGenerate": true
         },
@@ -562,27 +562,27 @@
             "onDelete": "CASCADE",
             "onUpdate": "NO ACTION",
             "columns": [
-              "training"
+              "trainingId"
             ],
             "referencedColumns": [
-              "_id"
+              "id"
             ]
           }
         ]
       },
       {
         "tableName": "RoundTemplate",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `standardRound` INTEGER, `index` INTEGER NOT NULL, `shotsPerEnd` INTEGER NOT NULL, `endCount` INTEGER NOT NULL, `distance` TEXT NOT NULL, `targetId` INTEGER NOT NULL, `targetScoringStyle` INTEGER NOT NULL, `targetDiameter` TEXT NOT NULL, FOREIGN KEY(`standardRound`) REFERENCES `StandardRound`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `standardRoundId` INTEGER, `index` INTEGER NOT NULL, `shotsPerEnd` INTEGER NOT NULL, `endCount` INTEGER NOT NULL, `distance` TEXT NOT NULL, `targetId` INTEGER NOT NULL, `targetScoringStyle` INTEGER NOT NULL, `targetDiameter` TEXT NOT NULL, FOREIGN KEY(`standardRoundId`) REFERENCES `StandardRound`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
         "fields": [
           {
             "fieldPath": "id",
-            "columnName": "_id",
+            "columnName": "id",
             "affinity": "INTEGER",
             "notNull": true
           },
           {
-            "fieldPath": "standardRound",
-            "columnName": "standardRound",
+            "fieldPath": "standardRoundId",
+            "columnName": "standardRoundId",
             "affinity": "INTEGER",
             "notNull": false
           },
@@ -631,7 +631,7 @@
         ],
         "primaryKey": {
           "columnNames": [
-            "_id"
+            "id"
           ],
           "autoGenerate": true
         },
@@ -642,21 +642,21 @@
             "onDelete": "CASCADE",
             "onUpdate": "NO ACTION",
             "columns": [
-              "standardRound"
+              "standardRoundId"
             ],
             "referencedColumns": [
-              "_id"
+              "id"
             ]
           }
         ]
       },
       {
         "tableName": "Shot",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `index` INTEGER NOT NULL, `end` INTEGER, `x` REAL NOT NULL, `y` REAL NOT NULL, `scoringRing` INTEGER NOT NULL, `arrowNumber` TEXT, FOREIGN KEY(`end`) REFERENCES `End`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `index` INTEGER NOT NULL, `endId` INTEGER, `x` REAL NOT NULL, `y` REAL NOT NULL, `scoringRing` INTEGER NOT NULL, `arrowNumber` TEXT, FOREIGN KEY(`endId`) REFERENCES `End`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
         "fields": [
           {
             "fieldPath": "id",
-            "columnName": "_id",
+            "columnName": "id",
             "affinity": "INTEGER",
             "notNull": true
           },
@@ -668,7 +668,7 @@
           },
           {
             "fieldPath": "endId",
-            "columnName": "end",
+            "columnName": "endId",
             "affinity": "INTEGER",
             "notNull": false
           },
@@ -699,7 +699,7 @@
         ],
         "primaryKey": {
           "columnNames": [
-            "_id"
+            "id"
           ],
           "autoGenerate": true
         },
@@ -710,27 +710,27 @@
             "onDelete": "CASCADE",
             "onUpdate": "NO ACTION",
             "columns": [
-              "end"
+              "endId"
             ],
             "referencedColumns": [
-              "_id"
+              "id"
             ]
           }
         ]
       },
       {
         "tableName": "SightMark",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `bow` INTEGER, `distance` TEXT NOT NULL, `value` TEXT, FOREIGN KEY(`bow`) REFERENCES `Bow`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `bowId` INTEGER, `distance` TEXT NOT NULL, `value` TEXT, FOREIGN KEY(`bowId`) REFERENCES `Bow`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
         "fields": [
           {
             "fieldPath": "id",
-            "columnName": "_id",
+            "columnName": "id",
             "affinity": "INTEGER",
             "notNull": true
           },
           {
             "fieldPath": "bowId",
-            "columnName": "bow",
+            "columnName": "bowId",
             "affinity": "INTEGER",
             "notNull": false
           },
@@ -749,7 +749,7 @@
         ],
         "primaryKey": {
           "columnNames": [
-            "_id"
+            "id"
           ],
           "autoGenerate": true
         },
@@ -760,21 +760,21 @@
             "onDelete": "CASCADE",
             "onUpdate": "NO ACTION",
             "columns": [
-              "bow"
+              "bowId"
             ],
             "referencedColumns": [
-              "_id"
+              "id"
             ]
           }
         ]
       },
       {
         "tableName": "Signature",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `bitmap` BLOB)",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `bitmap` BLOB)",
         "fields": [
           {
             "fieldPath": "id",
-            "columnName": "_id",
+            "columnName": "id",
             "affinity": "INTEGER",
             "notNull": true
           },
@@ -793,7 +793,7 @@
         ],
         "primaryKey": {
           "columnNames": [
-            "_id"
+            "id"
           ],
           "autoGenerate": true
         },
@@ -802,11 +802,11 @@
       },
       {
         "tableName": "StandardRound",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `club` INTEGER NOT NULL, `name` TEXT NOT NULL)",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `club` INTEGER NOT NULL, `name` TEXT NOT NULL)",
         "fields": [
           {
             "fieldPath": "id",
-            "columnName": "_id",
+            "columnName": "id",
             "affinity": "INTEGER",
             "notNull": true
           },
@@ -825,7 +825,7 @@
         ],
         "primaryKey": {
           "columnNames": [
-            "_id"
+            "id"
           ],
           "autoGenerate": true
         },
@@ -834,11 +834,11 @@
       },
       {
         "tableName": "Training",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `title` TEXT NOT NULL, `date` TEXT NOT NULL, `standardRound` INTEGER, `bow` INTEGER, `arrow` INTEGER, `arrowNumbering` INTEGER NOT NULL, `comment` TEXT NOT NULL, `archerSignature` INTEGER, `witnessSignature` INTEGER, `indoor` INTEGER NOT NULL, `weather` INTEGER NOT NULL, `windSpeed` INTEGER NOT NULL, `windDirection` INTEGER NOT NULL, `location` TEXT NOT NULL, `reachedPoints` INTEGER NOT NULL, `totalPoints` INTEGER NOT NULL, `shotCount` INTEGER NOT NULL, FOREIGN KEY(`arrow`) REFERENCES `Arrow`(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`bow`) REFERENCES `Bow`(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`standardRound`) REFERENCES `StandardRound`(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`archerSignature`) REFERENCES `Signature`(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`witnessSignature`) REFERENCES `Signature`(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `title` TEXT NOT NULL, `date` TEXT NOT NULL, `standardRoundId` INTEGER, `bowId` INTEGER, `arrowId` INTEGER, `arrowNumbering` INTEGER NOT NULL, `comment` TEXT NOT NULL, `archerSignatureId` INTEGER, `witnessSignatureId` INTEGER, `indoor` INTEGER NOT NULL, `weather` INTEGER NOT NULL, `windSpeed` INTEGER NOT NULL, `windDirection` INTEGER NOT NULL, `location` TEXT NOT NULL, `reachedPoints` INTEGER NOT NULL, `totalPoints` INTEGER NOT NULL, `shotCount` INTEGER NOT NULL, FOREIGN KEY(`arrowId`) REFERENCES `Arrow`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`bowId`) REFERENCES `Bow`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`standardRoundId`) REFERENCES `StandardRound`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`archerSignatureId`) REFERENCES `Signature`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`witnessSignatureId`) REFERENCES `Signature`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
         "fields": [
           {
             "fieldPath": "id",
-            "columnName": "_id",
+            "columnName": "id",
             "affinity": "INTEGER",
             "notNull": true
           },
@@ -856,19 +856,19 @@
           },
           {
             "fieldPath": "standardRoundId",
-            "columnName": "standardRound",
+            "columnName": "standardRoundId",
             "affinity": "INTEGER",
             "notNull": false
           },
           {
             "fieldPath": "bowId",
-            "columnName": "bow",
+            "columnName": "bowId",
             "affinity": "INTEGER",
             "notNull": false
           },
           {
             "fieldPath": "arrowId",
-            "columnName": "arrow",
+            "columnName": "arrowId",
             "affinity": "INTEGER",
             "notNull": false
           },
@@ -886,13 +886,13 @@
           },
           {
             "fieldPath": "archerSignatureId",
-            "columnName": "archerSignature",
+            "columnName": "archerSignatureId",
             "affinity": "INTEGER",
             "notNull": false
           },
           {
             "fieldPath": "witnessSignatureId",
-            "columnName": "witnessSignature",
+            "columnName": "witnessSignatureId",
             "affinity": "INTEGER",
             "notNull": false
           },
@@ -947,7 +947,7 @@
         ],
         "primaryKey": {
           "columnNames": [
-            "_id"
+            "id"
           ],
           "autoGenerate": true
         },
@@ -958,10 +958,10 @@
             "onDelete": "SET NULL",
             "onUpdate": "NO ACTION",
             "columns": [
-              "arrow"
+              "arrowId"
             ],
             "referencedColumns": [
-              "_id"
+              "id"
             ]
           },
           {
@@ -969,10 +969,10 @@
             "onDelete": "SET NULL",
             "onUpdate": "NO ACTION",
             "columns": [
-              "bow"
+              "bowId"
             ],
             "referencedColumns": [
-              "_id"
+              "id"
             ]
           },
           {
@@ -980,10 +980,10 @@
             "onDelete": "SET NULL",
             "onUpdate": "NO ACTION",
             "columns": [
-              "standardRound"
+              "standardRoundId"
             ],
             "referencedColumns": [
-              "_id"
+              "id"
             ]
           },
           {
@@ -991,10 +991,10 @@
             "onDelete": "SET NULL",
             "onUpdate": "NO ACTION",
             "columns": [
-              "archerSignature"
+              "archerSignatureId"
             ],
             "referencedColumns": [
-              "_id"
+              "id"
             ]
           },
           {
@@ -1002,10 +1002,10 @@
             "onDelete": "SET NULL",
             "onUpdate": "NO ACTION",
             "columns": [
-              "witnessSignature"
+              "witnessSignatureId"
             ],
             "referencedColumns": [
-              "_id"
+              "id"
             ]
           }
         ]
@@ -1013,7 +1013,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"073ada58fac1a02407d87cc2562ed1dc\")"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"b6d6b0158fa45fc088c7bc0db5d85fb7\")"
     ]
   }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/assets/database.db b/app/src/androidTest/assets/database.db
deleted file mode 100755
index e616b3b4eb8fca1f8f885c1fade3c9b7028c404c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 122880
zcmeFa349bq*Ed?#-80iYGd+_)7D56HAwU8Fk`N%QNgx5j8c4#vWf@4w23dfxW(I+P
z?3?T$pd#Xmhzb}K5EWP4cTjQ1T~SfFr%z4y^eE5sKHq!qcklPzuk(YcKIebxUsb28
zm+F~5Cuh{Kk{Y*bdSz94evPXu2_lq|G?$AIt_vZgCHz<aY_K8t1Sgaf{s;Nwe^CHO
zr!T&gZ9Rx=NhZ#_9Qz&F@)<eXo@+~$&Rc(%T8SGip8#b186Ge^V0ggrfZ>7v<vrl(
zBwNCJ_oklNHTeZ)?ws885gF;DGp3FnnKvS1YHsH6>|yD-ng2rV956Z)P*-kx|6!S~
ze_`Z`omx`l${LZIIVf|qD|>X-@buB+T|+a+yVCP=M`n!xj^UXja^oxV%iXTr%yGH#
zg=Mt`YK8ccilWNODpid0bhKN-!^5e!8|&}jkt1_+ln+N>Uli4U+VZUY>T0*zLj0`C
zl8TyYO`PX~F%FBbV?|+QdAYlyhV?VQs;Y9XW{A>M=&pO7s*CejZP;5+HTE_;Jtrp<
zKjeVkqUt~GZB=D$h33!rlJfi+KDW8&<rmhdO~+T~&v8$!DFL7QTp#CYYh|vB!_MFy
z#t(ZyXHfN@cBZB(zoeq1VuspCe1L;$+~u>%^5K@u*M<0+{HhslT^|c8tDy4K>YBPT
z%_z>BAX>uX;^-}r{(fpRF>qd5|JifR@;@CywSRWTR|W3B_@WZnaTSGH-{Na4N_;yX
zCyjra;NJI(e;;Vcd_M=nrXrQ<nChE(B0g_K)~LM9Sm<HA%h$Cy*T@mB0V78Y9F{d8
z7v>}!o&z%DdQ0Z;k#UsZ?5mz#2Diae^J{BhCc|v}+p#<~G0=y~t+1$^r@T!pmhcuW
z=+e39_uSFxStGJW3{p!ez}KqQ73=!X4)3D;n%Z*zL@23&J&s5FTz7s=v0FRB<L5%B
zr&iB$yZw_KRYfIL?!uaq$_kC7tg<j4709FPsiOR<qN#xgNWtF^QLQ>VU@L0N3*5>q
z)bxP|O`RDJnx&)ADe0p}j~t61Vt_kP^`Fi-|Cz4LT`{AknE3(LEYOeqGA32eDyh&M
zR5GL3H|uIjW=);z_RDkfE8NwrMnz>|DccG>28&^U75OD)uKvSD_Sc^;ib~*&3vIGW
zs>J4{;?cO-CQEok1oiaAp^wNL-am6R`?LfMp6UMMnGkr|oReQxs~sC~!W3AWmDuK(
ztemXO(d^S4&?eLU$8G9o!9Nb_YIjYIG68TJxwJz(E}J)pckD>VV^@4fRkeF|tsBk=
ze-ljso%<UYtL*T2s2S(wI7@ibrgUj3a`qoN7XAqVbwTkTkIFxh3aVi8vjNo9&C>iC
zU#&m!6ze8VO-Wgqy6ekI$_spxsM<fZimLMG2Fx|(8dg#UguWS5SXNS4stQH!>cXm$
zS^mSZ=3mXbxUtk6-l-EUL>EA}t13&1rov3jhf_rU-(^0)Ie$l8vC28XcP4@JAN>8_
z`7l9!Yv6}d5%I&OY}t7D5R@ke;mSud<s(ATiON=_@)4zcw1EG{pWy++1BM3-4;UUW
zJYaah@POd~!vlr~3=bF{Fg)--!2>dIQs*@S|BOGw1BM3-4;UUWJYaah@POd~!vlr~
z3=bF{Fg##*;QwD9uuv}CT`@Hy6W9NaAOio4Kf?ot2MiAw9xyy$c);+0;Q_+~h6fA}
z7#{dP$OAVP(556bTnud+5gs1gI<k%D&(R)f1pFAkzw&eW9QY|aY{1(+?1%BW_>=fy
z%8%i5l%K(OO~}!H@jih4);+`jEBBSzBL>OV=2q~hoHaOOG?den{~`yU<-cF5go3Z`
zpOq_$;=7keULwRrvNF<h=j~d3a{TJ)gXXlGv$f&GpVv1o7&HBi5n<!cee`0*L$8lM
zK5*tS*Rl65iU%UjG`CG5k;_}zU)m}2=CagZUsx{ByOdZ|XRrHY`v&3e*RQ`geeTi6
zLf?*m;|ceeD|?pw_0{C)7r#IA!t+BOYWtGVWXY8GBCmb$X!{p`-`&)+<hzSj(jXF7
z97*|%kaG*JaOFW`d#+ynpfIfXtyPI;(lB^?<}Hp$;wq@i{);30)~kmG)P-(X_joW3
zzPm$k#JTg=l5YF+!k$4R2QFOrL1c%$PO@-b6Y|XUk?)P`H#}nP^8A)_E#%4bYiL>?
zJss88L_+=;H8&$Bt;y7bZKfqXKjcu%6d|)=@Z}F*cEs+V^+%fv$N!r6$U|LQ-YAO>
z?itgKBZs41pFi2Y-#2wN4PTy1JnAK`d2y*u^2w}rgna+~>D()yUtL&t_tJ*L9jgBL
z?Q{_d$s4sRns43A+&?A+yd5q(j}XZ@TX4SM{K`4oxyAXE^SE=rbER_$pvIr!0mB1^
z2MiAw9xyy$c);+0;Q_+~h6fA}7#=V@@Za-*o#$InH4+FXN_@D4fiSEhA3<4!22K+A
zaEcK};JtXWg>NcBgahYO(4dWC;GPMR87zF8CfLMiIKfer@6G*-kV52qQ;v`00^^v_
z=aldNIp-(D`2&0ye})GP4;UUWJYaah@POd~!vlr~3=bF{Fg##*!0^ETwjQu^W+Ks0
zXHvI>&fUuGlu1nzQ$SMI|Nm7K|Nm_VZgkx6fZ+kd1BM3-4;UUWJYaah@POd~!vlr~
z3=bF{Ko79@|DD94Wb`xs3=bF{Fg##*!0>?K0mB1^2MiAw9xyy$c;NpO4|qJIXfSCZ
z`~JM%D$+D~c%2LL5B~RG->*4Ya>V`YhL&N$+h;Uhc=y`;W3_p;d6k*JJoV}NHV>_c
zTH9xT*|R$$-u+JOx>bHARY-3mnWx+N<#OZ$f4-C&Z}SQl9<a~zd>t|S(d3<{9(cCh
zf*G}MKJmn&CEtE?t!#VnUmHIApu@)RTBn`7Z|;YWZQt<V!tXOPKKis`tPqqb1g8r@
z!6ayN14I+x)3#n&`d7BF^z^MCkBhs~@6$cszZA_q(=cx9m08<%Tx>EbNEj7Ta_{@$
z@X|jga?$%6>aRzqr3Gz>9%?!D&0kM`bE@~;)Ej>seRpof*WY~8yfCPqM5GbVy)Gg~
zTgQb&*MB+o^&MjR>1ayC_2NF4XeFzTk+g#uX}8e9Bw|~d`2O!f85tQTj`e&jw}11>
z+MkNXzwxazEx~>!X64F5@4R(?-v+T^{8rh_2fy;%{jbk_;@hSh7TmQdcx~h7w>2id
zbg|<2iKC|$-S}Yly41fez45}%_bXPsonSlK))i9_93%A4Z%rt5k!i=f(CO`>g|PP4
zwBzahLuk;nX)!`}y%0YnZu*!*<I*w&vU{NflRA?9{(lW|o^h`EKV^~|<1{>Ac);+0
z;Q_+~h6fA}7#=V@V0ggrfZ+kd1OK0TAeobisRgBC4=PC_rQ^Q*<%{~<s{E3Ql8PBT
zKf+x*J-@iB!d2idaSg0;msEq=b)z?hS{+5G#X;OesC9Dpy;?0-Nx3V-J^$u)$@v>5
z7%=DjNf~w%=kLy+oa>zPocYe7&Th_DPSNp$<6XyD$Gwg%jztc)W4NQcqm{!fUzJ~%
z8|Ay@P4XgnhMX<;l4E4q{)_#R{W<$l`!4%(`z-r-dw+YpJ<LvQU)o-^owVI)TW_0h
zE3%ES^{}~YR_jmJ_pMJ`AF%GQF140f$5_*>an>f%AJV7NOVXp#erdH-D@~CGOG#3s
zB#7ULZ;4NehsDj}VsVC;E%p*)MA`C-<+9~@%OjS3mRl`zEYmDQEXkIZ7K`~i^E>9V
z=6lUs&GqJ)<{Wb$b31d8={M6yrsqwMnD&|)OjV{yrc6_3Q!^7Md?maloD%L7)(Ufk
zsls3(L1-pW{!9KM|2ThuU(MI@Q}{uA0w2M1+*jOd+$ru(ZXGv|%jbr0UAZXEM8BbL
z(kJL0^j2C$$NOebn5V6sP>BY^?u3s)Np(dg^ZdecA<Pp4fTCkS9~B7qv;lysz(5YF
zn0-~E^;`p?iVC#Wa}CT^fe?=i0Vh?uAZ89MH}TMTh^LiaozX{Cx74c#B&q5asv5d0
z_HP2}ScN1?RV&=-igmW4j?}BuVpVl>RjrVuY9tY$mMC;kQTH2IZdZmH;%TP0_N&A7
z)_wb^)-b=IzK_JO4%J)tNm8vt^wxfLQ@wR>#TtjxL~rd^2kWhS#j4yvdTYPhskiQ_
zSR=PXZ|zshdh3*ys<mBjt*S#kHc(S_@ICmJ<-9^3>ahmsxg@3!@ko019(_QK9vAiO
zJq9v$sK=sb>F#GY2k5z2mEELg@2)h8?1G-XyRXqu53gtG=4a;u^nP}#XYZ!56Fqx3
zm3@hxBv~V09H7>?7wM^!RqBO$=46$5fu5qP#ymejt$Dmo&)n7L*^qg9=B^Wb{+_F+
zNYa?+1gNz>*Xo&*)IQhfnUmB$SL-PfHRh@Swbtj^dgeqQN60KabD}y&D)kfz8goT}
zT4OHPGbgCbWqRfWmAO<;(M4mP8KBmfOZ3cLROVtma~G9)hMuCc#ymYhtuedx%$?Oe
zSfpp}?AwDOg?<XB*oiThhZF>8*$ymkn(yZYTik!;O{e*3L5agC51Fd3AFr}b3DC0c
zmN%WOXN_kBO(*GD<8cV(p%eY}gT;=(YQ|H?ga9?rqB>-}pBJqAfL1xQ$N7mtJCJEZ
z$Lc9MXv|{*)ZhljoTq2*ptPqj=jxd|_}UB2(Nn}}%%cO;8uKVUbDYYYt!Iu?nMdj=
zVm0Ow0cwqTxSlyyWgezyj#Zh5>M7c5%tHdynxC`u%<X+14H>LwZa=~2=Rtakb{g}*
z0JYZVOg(cuwa*!P=5}hI2k0r<YRvru)LNg@^~`O393g3X=C<nGNYzusXw3Zr)EaYN
zJ#&o8+(*wGqcZo_Q?${Tdj+U9=AL@yHY#(9p1F<6+(S<htuc2GP;1QH^vu!f9!%CV
zNBj0*NLRhK^}uog@6eL;3@+usRE~&5y{*f)|3VW$tK9&!;zQU$71||0&G`=Qkj{GM
zR>~2mFn7{3w^C<Dyk6T<y(Q|XYL)xG7QXww&<>#0dJ(00C@w&)&BRzxYqxz-YJ2Tf
zX60ruN}Y-A^c0aAvvOmtH5jS+Ub(H-m?PD_s@zj+cZiYdURCa=HHzk%=ajo?znY6+
z4h>Q6r8VZ}idONQb}Oy)xw&sog(`Q_8bt&Q8}Ir<lsjpSA_8286xxlnLJ<LX<EYi{
zqZMs4_0BlpHac9r16J;$wc&;Nc2pR<iG~#htR}?J8+An%!E&RpJY2bp22#}1kdV3}
zyU7Z7^jtW*kM;pgtr`%j-AOA<O`PStiBs+|wL584TYc&<<xX1V7lVPuY~p}FjNMB6
z`V$20`t-`Zv}W%FeF%^C>}J|$@4$ZAgGwqwmAh%QhYwLk`##Vcb~g>?irOBbET|N<
zayPA6+rZjnR+cXTchlCE<;|4UOQ>=)jgC}CBsGDf(WDqF_tM&a6PuKW;0j2&lh(X0
zMt~OD3kkT9w)nK6%6+s(Y*rXJrE|({w5B$p8rln0?xHod5K(UBn=01YU9{3WUQr{7
zau=;xb4?Vr(rLJfmax-`wQ3v!x6trV0oF>eLJjt&!Do=Ct&(|xvh{x$to}c9UUI(e
zyy(2(JnKB=e8hRb^N{m)=MLv4=W6FN=VIqv=PYN5v%opgnd=<x9Oz7SrZ^Lvan5LG
zb7vE$%_%tkaQx)B>iE?0f#VIwOO9t8PdXlVJmfg+IN;a?PZ8ESRydY8<~n9MN*wu)
z@s81sp^gEL-i~BPCr4XH3rCp4>9EK*<X`3Q<uByR@;maY@&);fd{RCp-z(oC?~!kl
z*U2m7dbv)XEtkjz@<cgD9x7+ZedTU)C%K*6N`{;UvM5vgZ}#u)U)n#mziWTh{=EI1
z{gnNf{XY9$_PzGo?Cb3-?H+rby~<u{FSJjz=h%nB^NODKM0=dwWe>MI?H1c#wx4ZR
zZC7mX+g`W5U^{0!WjkiO*LH_(w{44Ujcu82k*(HNZgblv+wyF~ZJD;dwq#qpEyfmU
zYihIEIP34$AFN+kFI(TXzHEKQdfIy2dcXB9>mKV?>ssqF>mqBdwcP5qPPXP*hg&nP
zeXPmWcx#L`$_jJND!`MFAEmFPkEM5|SEUQm8R>*{R5}dLMRrIVrB#wgs*`3*B~rdL
zUK%B3N$FCGlpw`Qt)y_tDOtoD;x+MG@iXy5@lEk1@x0h59vANy?-KWjTf{ZuGI60;
zEtZOf;skM&m?fr*DPk9~z1T_&6J^n4`P1^V<*Mb1<$cTRmKQANET=5TEcaRtT6S7C
z!IKuRrOq<jQUcFg##%;N23h)9x>-6|+FGJ4O)WMHZ@zB+(fpP9WAnS_SIrm9XUr$e
zN6q(`514nFH<?$NJ?1*|Y;&=Bs(FlgxOsrNmpRcKYi?x@HQUS_Jfr!}^qJ{>(`%*+
zrl(Agn(i~*VcKQd2v2O5nC6(uOogTirctKBrhcYmQ%6%YJil?6Ou`?+kHVM2CE-os
zMd7UQxbUEGNZ2E65mpOcVV+PaOcy2#xx!GPzmOty5!wk+LQ}yi5dIqf4gU%ME<EXZ
zhHvB_;g7)co*n#peg(gnui;Di0)8Ank{`(T;k)u3M1hkyvX5?n4M<qBkFJ*lj&fu#
zN7pfIFI~&9y>t!3_HcAH!}icy8McS6V%Tnuu4LG5+Q6{gbOpn9adbJucF|=F+eL3-
z*iMcvW!O&YW!O&YVb~6i)-!AeUBa*(bTPxWb952Iw$p_S+fElSY#T@CGi)2JW7sx2
zk72iQbS}egqjMN`8?9y7R*u#%Y%8s1*j8G_G+XFwrrAPgG0kRL$uyg31*^Y_r{%sa
zj+Qa2O|+C*ZK5+7wvnSH4BJSH8McwmVAuwpPWNqb)Xl6m&?08Fffh1sJx2=|ww~rQ
zY(1UEHrCOpY-25*!mQWubh2-Yqmx*@HFP4gT0<u=Y&B2E`?febj#;gyW0}=zI)-U(
zrFl$qE6rurt2mm&uvK(4!&cEz3|q<5Y~L0~M>4CGbOf_nNryA6fv3ZKTO1wAtQzPL
zX4OEm*v1Mvm>DhS=pbgaoDO8za+=9DmeCBhaSI*5te5h%zi*49>8##Tn#Qb_(p0wL
zrTy53hxTRG^&IWPtm|oShSk$vqChFPgr_~(21ipY0+qNWv<H+Tl-&_n%+qdcgQLl4
zv6yy6i^Vhv<wZ0R<wZ0B<%P5h$_r^{lo!xWC@-M#D9@)IQJzmbpj=1eP_Cn~D9@wq
zQJzQJp*)wiMR_ib!H&$~X&bh|(P*@oLtCT89O^=#mZz=Q21i?>MJ;WC7PT}Aff}Ah
zvJH+lM~fO7ffhBi83NTj4QCr14MU4+8j2RxGz5Vvo;GD09BqOYRWukas%Q|(v#As1
z+0=pZEGnZsi`r4Hq&Ac*sTJi4Dxq9KMU=~_1?6&T#)isxYGNB470{xL@@P>;IRr|1
zxYJU0Y$-<xT9lF-Xi-Z3LSQCO{$v{*`2#IxlIv(Oll+cA2~U1w8yxu+ElS8Wv?w9J
zAW+PcpV<aSenN|4@*`RllOM30LB2=*bn+d_)5*6eyU8~wyUA6Qi^$g~7m=?}E+k)~
zTu8n^xqy6*asl}a<$Urf%K799c3>JuK0#m_`51v|<Rb*8a^x}sQ^_R+rjid)o<crA
zc?x+S<;mndlqZvSQJzHJL3t8+8;K@z<Shgyk~a~UNZvqs0(l+f3FI|29M6$g5g1P{
zA~2r3g7P@>GRot~ODK;eFQPn_ynyl;@;u68$OR<I<H&Oe<dJ6)$Rp37oJ-E5oJ*cY
zIftA>IftA@c{DkL@@VoD5{=@>lL(9=rx6%M8d1(BPoSJlPN6)KoJ4sfIf3#B@;J&P
z$YV$}oFk7SFq|AmU^saMfngjuhQKiLFapEKQ3Qr^<RJuxk_QnON*+L92uJQmU<kPn
zfg$8x1hP1C1c5Aa4+2@_Fam=)ayJ5l$sq&=le-WY#F0A@7)0(sU=TToz(9^1Kwu!*
zkHA23JC>PbAC?(pFO~zy9xVHl-B_lRU09}(omi%l9Z*VKKe8R=eq<ZUeaUSo_a$3V
z?nAbq+=pyNxi{H_a&NK`<z8e1%Du>XlzWnODEB05QBEOiP);FmO9BUP51zm+iL$|w
zRcO(JtVD|*kn~Iey7OcO+u+D@wCGNjp+$Fc3j*DE0{0?d3Yo~fXwi*$(4rfuhmz7{
zehDkN#by{KO<n|rNRt<$wkyAYmE3$pyVfDvbslPy__?g)<{+9>i)c~}Y7_ZtR&rH{
zCeB7QaTaP5_)1oC6^JI3Bbrc#+Ae%4E4i77b}2!$OEGFY^D|h<O-Hn|8_~|NiiQz&
z;tN^H6(HIvAJI<JP#e!rWhFNS(fG-T#!o_RM}8tJxe17N9FJ(naj5OUk7Xq{2GI_A
zh<3<DZ5*G&N^Ufwaib88%SLT1Ka!Q)2t;FtBN{slwe9(#tmK9u+CB@>_JdK|jvvHI
zZXlxVG7)W;f!enG09JDS5pA1}XxlW@#_*}E<oY2R(-+a0KB#TO_hu#63(+<`5p9!#
z+GxH9E4l87Mt4IrIvI=BT~X;uLdlhgrmgq{R&resZPgjkR-LeD8IMJaj%X9bcVHzK
zhqh6%h(@(XZ6x20m0VjyBV!PaY=he7ymHZ}v^m!r(dI5ho3}!31lJO^5iL*~5rsvw
zNG!seV-XgCMQAfDLc+0V8U}?#n}nj&Bm|4#rdR|u!NM7gg(C<H*@=bSfrU-R!fMAt
zvOytH(Tb8NVPO%mFk7%NnXwQ|SnvWC%93BX$&fg>x+uT@7n~P}^JnK}=NqtL{23lF
zJYaah@POd~!vlr~3=bF{Fg##*!0>?K0mB3TD|<i^EQHEb6uBgcS2q)za26u9f;R((
zR+g8$D{Atq=yMVUoy@^+1fEsa|G`cH^Z&v6|Ge{2=iTsq|E<o2&T{7z=SXLoGZDVs
zZwe;HpWy++1BM3-4;UUWJYaah@POd~!vlr~3=bF{_}|(Ca<G|DBAEm_?wj1(M$17u
zarJBP6}%r^kt92GqBla8b>hNLWxGzCdqTD`kyn`e{VZE`V*8h6Nhh|6l0}^ua!|JD
zL~*%n_KP{c$H*oo!cR}HhCZAl3p%lQwVj6?e?&9^*yQpU%>M`DQzTC^=Ko_-@P`%3
z`hSAyI&psDe8zdix!zgr90R}UZ|;;KC%}*JJO1b3?f-R-Do389ha(bxnSU96jeiIH
z0)M7FT<#(V+kdpbZhzFi)4td~4Sqo%1HYU95`Hazzior9+BU}4(-vv{)B2(HN$WxD
z3Tufq$J))>41U}Gq4cD5Kw2ivkcLQ|rC{+V_?`OW@auH1=oSZy9Yu%bd&_I^X8$(J
z0?TAenx&1!Wd6+jocV}(ow>@KYwlr=fKD5Kh6fA}7#=V@@Za%3)C37$RkT=SLW8-+
zv%~K@4J@e--u2itC{0o0{V3n~?8S}sply73#C`=8BF6zLvbv22eO1?;ufGH!A2n82
zHT9)+^fYK2@0pAgT;v!Pm4eNUXWo0DUO_)fzUG25GEW7?U_SNvFYMDmnYxFE;Jt)I
z<*FbJ;!>Yr%G5^(?zse@DKZC83A+^3=<7=3{j5tu)M#DR#)jj&T~MX*+1Q=apyZ=Q
z`B9<q$xA8q3VQL5pB0pg%vMn;h;Mv(P2bZBdZzRt1&ti3f?^QYxH@$m=t$#JPjyqu
zs1YhioqXdfKHdk;oxB8~DRMZVti#U6JG$JH2Fk{Vet*~nr4TjDUzO83eDZ-ciWMI<
zREMTc^0oS8_Y+E8E^>&9N=`0y6YFSW;~4KgKqIqMP;_#Q%Y4nAcyaw{1sn_@>yjf?
z_2Ka%+~=mqK{{~9f~_v7(0G`YLgYX{*tpQwp<|4lkIdA8YRw07pV$WsT=NV7aVklU
z#tm%tH6CD{ZazT8L`Uk@9}lJ}P5Oo#*<Zz|tYNjRMN?$D)}oyHi1$vYM^b$)3z2Cz
z0ey3Vk4)9ksxI*D9j<vlwWcJib4zVIvM*qGIEgZ!dLNsejjyl)MfFiZYUfiQYIb~|
zGLnmI(wm}s2cRpDT~g4OXZ@81r4ZFij~?~y&R71J2Ovy^o_>@|Rnez|?>Y@A7n!1>
zlKn>Nx3BNp2inx{kG<`JvUv{x(et8Roe8NP*5SzRfU%iiQ?bU!*zsbD>ZY<%o6xw0
z`8@Tt&@KwQ5R$B*qH<obajDO4->zu+sIIy?sZUn+N&{`<>$j9#f|83&Qc=lvBlWA1
zRi{Cl`oqh)N*S4`f})LU^f@opH^is}6{J>E>cdam3l&J?+iZlUs4jk#Q)gA`X?6??
zQJwv$DfM>W-20FnD11~WJ$l49r{8J!<}_%5i;P!M$;vgJU?;cKV+~UkG_s=#idKtu
zj{BJHx~L8+2tUDX^qmb-&lPu2YMP?r^r-LrmHG(VpF&iuA2p?_efnVBz<p4ck8BSp
z+i6mx@8C<_#!hxzWIMI0B$-luXyb?M1R2>@1x4vb>KFEjr-3i^$H($rP)5b5Anet~
zhuPV_@ygq=`v5dWweh2VNBGW!LR7RLwKU#$<(6qsr}2tu=p`um$ku?e%ZR95Mtn1n
zi*%_~CDEL!o>M*=5Dqm-WGfYf?>kd{r;XI7PqcLb7}Zh*;dpGk(|6wZ<ejhg0ceV9
z;YYc~qrMB!sn)mF11dyC`B6)%TK7uR($j$QQIUSsoO+s_$s0dn$1@k%Tty`d*XUzR
z^_}P<BUDfX@F{kXr}|D<QO#74ntAPrdik$D&?xjc+>Z*WjVDs-LEHFx(0CV=LR6R^
z<x^id^BX8h<DG2A@KK?Dl+%to-$BGR4*?WsjAU-~^+mk~HE*h7qPg)QUw?h)wWuZ<
ztLaALm)6@ZDQ*71PPANPu!>5i8>!zgZR7Xsn2!unK@q@j=~<<_so$|#73EYxDhR2*
zt5fQmy#~0zh>LWnD7<s1UiMObSK{U}fb480q;Bz@lYD1&n_a;~5l%@wZ?l0QF@dvL
z6-q^r0FhKd<b^0v5%7M36H@oFU7h+7yFT+#7C&lAz56~q>{CC#m(*iN%_=H!X07hk
zlV1QxB26kNayQhAQtA)Phs^~E-qOcbwE_ArczkmnFm`x1KEaNp)Lrbf#5Lyt!`{L<
z<;6Z0rJ>aAZSW%9oT`|}H@-7<Oud5n&UQ-tKkED)K1m3~|Jwm?`Okv)`-j0ZfLM46
zU~~ND_}uX(JOkL^@Hl2W#ya{qIy+pBCJr9n(0@@rBCnE*<?(W+94|}u&)_Zl1Mpsb
zAv_6yP#U(6Z6|D-ZDsIod`s&!cnkhscm|Mf?QM;aewE&oj!B!PDk)p)EdC~*71xPn
z@FsdYk%xEBufW>>Da-wq-Impsg_fz70haa_oB1d62j*wY51DtFSHLrX$?*1gZ*zNd
zGqYs+-Smy=ZPPi^gQnf4Ri?S7>F|ztZ&QrPA^awMEIcnfEbJCm2y@{*@LXYl&{b$D
zi2V2P-uKh|VSXLIgs+4Me<S&Hz6;-q58^5J6ZZ-C5_g<Cz^&oxxEWj?H;7B%A~-9(
zMn9pi(g*1(It3Cs=>D2|nwv;_DvlVKp6=?NkkHFDptisj=ZP?p9KY5zv@E~6x}>_W
zxJyQUX=P1*FV~RTijvAIcZDm))67J&{;jP-*~$}cBB}qz%;oTenMezrMUW@dL|RjE
zY-L$lWyK8m#|3#pP?cLbx1xGZNm-ejvwNDFNCXvg>WV7dbzF$2iHXF4SX^0E;~J1(
zQQ)qs$_I6@PMu!lF3T?|a&tCMkcos-G22~LQ_ML%P7`SbJ#f!0%&)Eia;L|En&IxU
zg38*e3O5(*kxirx6^B80T)sA&dhF;#)b+0_sV>MzOB=JyudOI7c30O_R&WsH&O|y=
zk$KPGy(S*XMA}j@tD?qTRqie-$**y9vPU$LNGcAltg0@~FXyZti;09Pa#;-w+l<2=
zTv?D`rHCdJ2UX=)%uuQdSap!wt+)=x!Q(g}`eu24g)%amhr^L)ROOc{PNY~pBfn~H
zNd@Qd5Zo1-`y5M9*2d;ojI!p(h(#vS)#sGq?wYESLRV}?KKyPcPH4W+M7sSA8VvhH
z!J01c`^{Hvj1V#(_Y^wQr_357gw~<s0<>9KLdd*-8fOVj=l+8?OK{A=K5OkbYkj*G
zy9-SO)!^Jx+XQxJb$|(QROvaO`PsTzr7?%j!oIR8sM3uQ!YWOqlR7h1HMA01aT9ak
zF8?Pt46O`@HaNd*x=U*?q!dl{O2uU}kvBlAxUA%##=u+r4_+Am4BxD&tgb02sc{Rz
z({W0}0pc19GumBMAq2bqDrNQ*mI_UZa55`aBl2rXDl78KgeHZk!~LgLZBn4q`RX>!
z_wPEbvUM6x{PC4lrGh*aXZF~VilXYuDnXvYL|<>@$xKvxG6`GAsp;$*QBqi338yh3
zXd>=rMK{P@SvA8gI40m;)tYNM9{a%dpW0B<aeAe%xu#?FN?)TPV{|)CBMr$zt?$TJ
zSwnIIv_9I9oB*wlH*_@aPalIu+<X)sV63-)qi>#l6U^60^N}~fd`(4;Fp(bWRQ-E{
zj^XGoIEdZTE31kG=P;Zl%E_Uovdjes(opoUs(`5&JOn3+rh#b~loe<Mvu$ty4;*cS
zu%YyFH=I!ND+K#MJV~XO6~LSlT4$O_Iwy`zcV(89l$TWCOmmHP7uHtIal3jXl#}|_
z8UN0tJDLpmcP8D?r2oG&Nlbx;x~7|m`yYMDEUB39E}QGFsVQ*JbypR*22_^Ms;sRj
zav^WmwEwY6$x3Isrv8sr!tS~H!L=8=mr*%umb=W=BPl`gkSjJZDXFkLj?}yQ-oyeN
zq_gOA6AKuJ-=bA-6Y2Z+R?s3Pfi=?WCKNC#9YxQZP@sj6qE*UG47w^5Y8ySU4Ls?=
z)JRNDPH^Fs$d%((?pR2DOm`C*#ECbt7!DVGcNI9MBUp9&FRZ$wRq}sf)lIQ#-4!QL
zK#S}WsCBAs65K@nty4Y|eXrUk{#Rz$t+omOl^OP{ZI^$Vv4b7%>*l&k3d-P|N$T5m
zHj$x!>zig)e&%3B1+#10>7R5tg~ex1mVr}sbn*YB)68^qksaaugwyFJJF!&<bsp$I
zy{B5m{c8jCQLEU0ZGhg1Y7gf?fBS#iVXk)ST*eOEWM8@3{u>MIf-C0VSYRJqZ2~Mb
zulv2(I$AwBVLvnrog>3r!+i%Qjx4JypQYTxyIrH<9ONeTO<ZtR#u4V!<X05sR~3<Z
zxfPsaQ3rSJa9(Jsc0fCKjjGKrE16zWisxIfXz>pV^}JVAQ(G|uETU8k?4q`>b%Tfu
z7=&h_8$=MSQ{d;|a7g#BoD27`&{J5Wu%7lzNFeogScZh7K@UZO)drKgD-x_MnA8oV
z2v}BhrP9E%l8PE1n=7lLsIs!k)eM#wiBwWnLtV0zB~e#(N#uZ4Mhk|xlHu&>fMtdv
zr{`oVMnTPCebJ3dSShhvf{zfFQ(`PEGDh75%dDE4Uszo2u5fo5Qai(4Q6xHX0V0iY
z&&aP<Xay&(KcumhRfTxj7J_8uvMFW5>ZZE9vbLsJkYVu=Nu~Z(`E@S1uG(SM5uu8L
z1J)bRP1wKF@mk#k)){R$X?T83VX<qpaxEhDA+XG7&q?4~_^o{b1nq~#5ctfZ_)O6z
zK~RjQu-a&gQeuiLwmUnYH-$BaUzyC5GORpWNK!_6)@WDPl!Rum@Bojd*H+h5!Mw?@
zaKUM?%<W3zn!y6(W=JB}8Wtl10_ylX=7Pm5ELxTC|L=gH_0BJyuR+AWJB|4NM*M#x
z{yzi+h36k?a7`tus1g64#rY5QD1l400Jq&Cz%6DS2=OS9OSMR;M*M$e3K{YLgT(}h
z&&+0s5&vK8#10oD{=X6b-+vBmuSGC7;{OMWF`74w`2V62|KER@81et%D{M8}lM(;l
zi2o010sedO|1oESFIRxF{@+QniStwE3(kk(`+twK*f|2S|3x`D#}|&59gjG6J8p5z
zbc}MOI9fVP^4AcN|8e<txk0X!$H;x;HnJ7s?7wAiwBKo8W3RDKu&3K&?M~Y-5I6s<
z?H=1k+dSJ;+dx|<TL?tNzYLM^?}rHZi>yV~q1GgL7vKhD{Cgf^+wXvw_Qldjsk_ty
z^8I}!UKAe__lYaTDsiGX0Nw})fvEIXAR7H6mc5o0mP*SwOS&b_5^Vk*BF$fb2=lwl
z%ghz#vF0>$oVkhVy6F?s3z+L~g{jgs&XjJ7GX)F3!><7@2uFoo!ZM*;$P@Yr?FA=9
zfxpB*%Rj{L<Zt22`7wMdAIk@GzjGgR&vVDPJ=_Yek{ipVadBKQ{f%Cx&(a6zHd;@M
z!EOKe3-v<k8%|pXk)>*`7B3{f;k4tIELC%ycp>|ZPVa45?!;6~Uby_}^qyGIL)MWn
zFC@U>wDlLMS2K)+dLajnuHkxLj*(C=B*D=U)%&uHgnE@MI2zFsUddDfi<VHYk_X4H
zhs!bQL%d2R9Bp7r)MO=IB@>P|t|gFYQ0Zo<SILB<u`Gt%Ek1T77mi<#y;qh>-mZG~
z#cF~SuaXW&V_&Q_s^r7b`m#vP_2N|$;%L^3)bu-EB_WPxy--st32`**g=$(JuaXf*
zvtFPi)lss&cmq=6EKn2kc$J(un)Q55tt7?KxaX_McDzbb9L>5;Q!7bvH0wGwDUMgk
zilbT2)6_~@9L;*3Hh3j1j%GbqQ!8n4H0!x)0vxZB7f0I<b9gIDbrb3h$c!_Gb25F1
zS4oYdvCq-GqNK*r*ypH8aJ))x9F4u!&mNE+r<U_&EDG@kq{pe%ycm!lr`G4LP_L38
zM`N$iviEqE6ghsqmiWl4B+1eGUZZ)PWy$d+kF3!SR3%A{#!{_i9r7wUa{PLjxh#d5
zS4)wjJSVEw_L7z&2i4l)-c-+0<!4u(Hfiit+D))mNs*)Vy-M4wEJKd3?^W8ARubfB
z*0X&(HN?vj<oK*-Yx`75kfT}8(yRj#<jm6ck&+=tv#!+CN`@S522?7$4v%LgMUG}&
zp{WCM<Wy)rRFdRq*5#VDmLx~<VY%X3JVPmunlxXP!R%s*FTF~Z9KRmsE_?9cRW6en
zdszsm@rZ^rIsTrPDd{uu%msOJ{4Aw@b`qe6x$ArIwM5Te>Z1wqEY`D^Dv!w&cF!U`
z%S@QNtnZ$M0eYCbKK2EA_L)AK5YK!)`%GT~$WV{+#7Xl&3Cu1Z`@8@>dkUdE<D9E!
zFH!SIdgkcaOMD3xLp`;6mSR79O@JQeuCMRadiG*9FQcbQ&t9x1RrJi(t7ky+Qzb7`
zm}eG}u;fm3I%K#N6-PoE-Ac4qfg(Rpp|9bF8iKEe@&pQI68zp1KHN}41<Ld_igYzf
z^)-rgZOqiyD1?N(YOhN4H41gzE!Nj4fEsG!GxRkIbd68f*T~n^aO-R2Yi)#kiU5GS
zJ2t>+oUTfto@<&`CCpQx=b8p1#5}x0xF=uFHI<81QwxWArs=t+>arA1)pJdS*74E_
zyK0KQ#uTWbdTX-2#uTWb0+aMLCPNL?TNCv)ChJBxL0@B1OMm0z^))8JI9MCuo^b$Z
z-kPX*OYQGiJ=a9=mI{o~b4>(qsX(5-#spn|bM-YQXd?{w<N%<xKAzKcc(k5tyw35X
z^jzb0j?dQD7^e*}%rjD7W1P<MBlI=KLJifw!}T@B>IO1QUt^4}#!!8YF<Kkpo*@8e
zBh2F<0h{VA_Mpo*PxEv`AFSuf(+z!)zV%$Fp-z;6`Wm^qp=auA<UkE|gc<r8Il6%i
z(AOBPtI=OyW3<*rxF;O|ZG@vZCE=a#R0FF3xa9aoI7&BkSO)mdL8Ej-hjoCzMmE$?
zM+gf6e~oP2&|xLuuQ3v8s3U}xfWO8_-9TU|;IA=4S3_9~XlKR|S{vaWwixh@W4Mx%
zTy2Cc2UJ9x*kK;FAW#7~c+@irTN3zyVT!j@E@e@md25(%?8>S@>(?;om&&EA3pCFU
zRpyq;#g+!XR)%Ur3G=YUfeOH0RJoMpfyOmNITBSaWrd*iYlybv!#v6wLF?BL@QTW%
ztP(V?Eaj}Ja<PSiulX$PFbVUprGg58BULVCv7m7c*85&rFKGQ5tn<CHV$k|ESm%3X
z&7g4&Qu>AKG(lPauj1Ad$o%&r<ony>T<)xJ<~jR1+d5^)<oB-QjN=~1Mn@fF>&tQ^
zIGQ<#{JH$Hd>k_IEtf0gJa_^SBirpi+26CDvEO6gWS?)(w`V~fJ-E5HeQtZn_K0nd
zZMm%iVgdAp+;~>&_tv+pPgw7;uC`WL$6M2^?X0r&lk^V612`nDm1?93QmWKevWee`
zZ-^(w+r<X4Qp^+kh;2m4@}1>P$VGP$a?s6&^?xeloU=o&xp&M@nh!x-fI09^K!&*^
ztp0y9T{4}A+;Lk>3n63N5L2S5nQ%k+RCod21lS2V;Yx&Tp$EJLVB){#U*#X?Z|57}
z9e^=>Up|JnaX)ZxbEmmO;1uKU|8)<9E`_Ux?lH#skaA8*t{J)%t{Lnx226a3oQIoC
z0dif2Erm-4)5G)@$<sH=WBD-1bsDx5E*U!D+zm+d$pE-y=zy~dAY%=<Waxl1H{ceO
z0dUFC0Z;jBz$HTmJn63imkc%v?A2*M0GAA14IKbi3?0zuZv(CvI^YRE6<jfNz$t$X
zxMJvlll~fT#nAQYgdcz_hOUMVfGdU$c--FxTrqUOV}2^QV(5TJ{Wai%p#zTlYrq9V
z*Q-bT09-J1HFN-6FLX7I-6(em67E5`Ug&Bdpd`KxTME|;U5$tRHQ;igtDytna-jo`
z-Y9qa+JMW24tU5<1y>7Q8xJY~YaFf?x*9qFt`<7r0i_LA11=Ui;C??9Tr6~L+@}B{
z4iGLDx*9qFt`$1qUZo9I1FjVeP%aqc$PIWR3`~63Qn*&=+PDYW;6t&EwrUNW)H)z0
z05}Y7_-eEX0PglvMF+HTNNJqy!PWsabbu=WxXWLoRRGnUN*f{A-If70bU=#$;0~p`
ztVUD-a8RWRUm6L3difN|0S<EvE6dZR%>hv_#el%g13u^sTN;5}?6M9(8y^t96t0Xq
zuKgS$u%r!J8Xmy4zmxAG9kw(qfNOsb9}vDYG=S@NTt%3WD<pvHcDUf18PGI<>vp&i
zK_Gl-lK`%LcsI+c1P5^KgPScMS5N@gJ{Y`@%NfA67gvvr%Mrk}S8YCQsT{zy7j9~h
ztJzY!j*F5#+8BlKr8XTIK<Xd?vFg|WQJWE(EtLZ3c5B0gN@4)rZgrf1SOVyFs{;i(
za{%2gZKP1i6hOC2>qGcbA%Jd|I##H|>*z$X6K_VD<2W4~Aj+L31E`J+0B8n*@TDYx
zYX{zNV-@d`0InU%-7^Cg2XO6BZiN*f+`A}%YdhYInkK=d^)3wH+K&A~U_k)acH{ye
z+&e#jYa1IQR;df%+J^l?U|s;%Hf8Ccv>xuA8^CoNKJsAwniIfv8@dI#Y6G}#Q#%~)
ztqI`TiZ}1fE!6>BTU8f_d8-1rw!)4?e}#HyV-4RESF%NW>^=)CXnNn54x!%40Q=3_
z!{~|t`^~=RzhT~T&}$F+$R_;uMmg@iWq|;GeFH$Kw=|%IP1@H$GXq-K<og0A%v%yb
zv=N?2`o7sI4j|g-%Wxm+oe@B^(f1Wjn0I;r(FS<r$<B~ocOZZ*;Pc(0fEG4rEffZ{
zut95~Ab@DSf6Vy-MC-LNPYWPguYGAXH9)^Egnj20>YWmxUpqnlE^adD{d-{zuk~nB
zAi!xYPXs`F6iwD>El&t&Va){Q>@e^60HW2{f^yyQjtc~^1$5rnfEHG3EsP0hVYRP?
zP;Xv<{jI)d@1fq@0Q*~g58uPQIiUBCc@;bd_sxsZ0Ys~``7$biXq9hohIz9Ch*m;Y
zdwjef<{cRbaBbA*{v!ffSlJ2mIJJidw6L-V(}#J71rRm(TNoM$sNWQYdIJ|94NA+{
zg0}d8dnJ)HXx~I>ix1SVNMc{!hIy5>hu=xd{WDTod-(VNa&7NuOAjPkuI(Ld<$?NT
zebgDLEj&<vi}I~89{$R@!{6{y_4}nTud?pY0qWOR%KCo?yvpu;-+2Zj{~PcB8}I)c
z@BfR&`~S*2P{#ZJF5~@wj6`6(|E~n!2#gJ2y#LQa1Q_rC`(L~_-v5VJ-u3T~8}I)c
z@BbU`{~PcB8}I-BFZTXFh7aJB^?xVnB5_`EUV!-j4e;&%NM}c9nA7a|#_@*Z3C9k{
z9LE&LK#2P1gx~(3lkb+-$g|~Kxrf}`e$9T;zRq4??`jup&)9ZAq`y8kJH+|hZ>_Or
zSVN@i(nmmT{23lFJYaah@POd~!vlr~3=jNI^?>YwXpa$`bY@opL=EFem<OUgLb%jH
zRh4J<x~p9|vq~UvVRAxRm<Iws{sZXRJ*|@m!aa`15MTqrw#b!NQJ!B_s)Vz0B_;QQ
zXrE;TZddm7vNMkqmO}WmP9BK;_%G}elm2Pn(F1`X^K|^f{~dcr55$DLsrAjcdwL)k
z<ZK;xVv?@=T|iPB`)9v8c_1d_zZi!y?*3)@wSnV?aFGAPUg_K4?K^rPIOI)7ax?ah
z9tae9Q|p^?_w+!}$p3KMfA3ek2jWSN)%omi`+Ia{jegki9tbY^FU*y${ms0C2SQEe
z=-AaAfOF{|#t?S$rp7m6PVqnl%1RyczuDJ+Ysck*u$1X6Mm7sjhcms);94bcw5wb9
z1Xptp#H560zWx|?0U(5;ycr0w=Ab47p}ZNGl#<|z@IdHE2=VNvWyhG(WP}IeP2L1k
zNFzKDWb!7M!WrX%$dbO$;cPUS^JXbWE2AD!%SPn#Kw!y$K?j&AtwebssANypJJ&FX
zXzi+;?y7-Ehhr-%i>h6r9*89gVYe~Ld3r@jd48FzTS^M(A&lhT^a@?52ck#*O|Nvg
zwFiPm4$wOR19r2}v%sm;ZS8@$k^ja<2@V+Qf#{LIkI@3v{&Y_eLp=~P@^5<J1U*EG
z{F@&7Bg!6#4+#;%bCYsh5CqZH!~@YFA&fZ0?aqf7;uWZD?Sc4@YKPQVx(cET;vVIJ
zP>??VbqTalg13izASz@R-?;TKj1~e!{)0RvF_0WWME-*uZ5TPkhx`XQz^-N<hzptM
z+ie(}UJGw&g=^7k(thH+?)=&L4ZH<#$@#YPB0LK?3()`{ao+Dd<h&iC0&H@whRgtq
zopT{OKndgrnCQ%P4tEZ8rb3>81ZSKx8gd0RaoU`M;}3Xi;40(|`~aRFyySSs@ucH%
z$3u?8jsuQejxCP0junn2j=7FmjuLpIV7z0rW2j?*qqig3(aF))(ZUhta5^lIW$;(X
zF7O598hi($4P1bXgD2%<^1YCEaF2YOybiJt*2{J96rw~fkSEGH@=!TL?kjhbJIU?j
zR&u!Pltr1^e}lLLU)n#mziWTh{ybzRIAuR(zt4V`eXspC`+ECI$Wu^fud<gywt|WF
z9Q#nnS<n;STZpr}?BRAN<T3oq_OtD(?Fz&(cpWktp0k~@9kbnQyTi8Iw#Bx_w#>H3
zR%<J_xowkedA8w@<DjoC*%lA)I7Hf-+H5usq8<ET{Q@E$ybVu8p0S>`9*4*WcUkv9
z^n<n5We@?O)>>|LTPIudti!FD);`u`YrHka8f6W!+N}cQNc>UyO8QuOS9(>tAf1s;
zK#YXL(te1Ouu)nCu@dT}*;0v=FO8Q*Nm)|5lp-Zau~I83Tyjbl@rHO!{8s!-{1Eag
zz9gO(8^z<|{o-AaVR4JNMqDN?6syHju~3{Kj)JTU>0*l5MQks&62nAUG(n_=pDkA*
z+QR#m*CFD<Ie6#dnB`u0?_#HA6TExjwba4;7bTWyma&$RmO++&mTs0#@GeG_rK!bc
z;mz0Kos6#_D#N?xS0OUP8S@E<&Tx<UfO)5RlX;cdW3DsLHW!<xn#Vu}hXLkZ=0tO>
zxs^H8Y%_E4=EirX&rI)|UNc=VJ!N_n-r=~zw9B;7)L>d-nqw-1w>c(2Zim69ex_to
zM^m(^naN=?34aJb3SSDBgg1p3g|our!h^ygVUMsySPk!b%o8dh@55xs{4iALFQf=v
zgmyxd&{VJr1R_6t!+!#KATILH@QwT<{1N^Dzk^@TuizK+HGC;wz>kBx5Ci!>d{@4M
zC~y)-_R$TnAu1c|AqffP$X<@FW7uB0mSKD88iwuR=xT=Tp|>(@4_(Eu-5g!Xu-&wQ
zVY}%HhVA0$a)#}q%NVwc-omh*99_z=oz%;)oz%my9UQG^*bcgcVLRwzhHdBQB8F|J
z3mLYZE@0R;j?QP;Hd@E9ZFC;PZsX`&hTTTzFzhy3%do8+tzp<!TFtPnw2EoA(AiA0
zh0bD{&9stfHq#1Le-ls3eOnwYV^*7JDYM!{XEJOfM@tyCkrp#-Bb~vp4LqIh+v2F3
zS#6+2%xVKIWY~I+7BFl*&1cwpI*o0tqf^<&S~`VUui@!r-xfzFv3hIhL}s;yPGHz-
zo{slzK@wJGwVIA)R;%e4rn!~oG0m+smszjkXb!_x(a{WBMMp7gB~P<`TO1w9tX9$y
z%xWba&aeia4)bksbSSfGphK8d1I=O^E9hWmw49@Zn9*`NkYUSdCfis>GuXy0bO5tn
z%G3V7EsmzMdP`{<vsy}1*@l<)V;dgYms!_yv=6hcr@a|gPkV_1rQ8yp_GB9zO|b}&
z^=b+20i_6KcLWymv>V&tXfj$Xrd`ouF-<~w5luvS5lujOA?<?lLfRSS1+){&3urvb
z^Jzzv=hF@-*U>nX>u4;>^JsgN=h1d3&!ufqo=an}BXfA#hHY>(8ZG9~)@U(@x)7-4
zX)CtD(UxdYOIx5tEsa8;hNqEigQLySqJ~DGMGb9+Ks8Up*#<|$(4v}#qD3_gL7<AK
zP1y!Vo1jG%4MvM98iev}>O^@qb)Y<p$|%pGc9bir4dqH|MY#g<Jt@AgfMiL^z9@&R
zL5f^X&Dc;GPfcutqXJr#Q64SID2G5P4=<Q2JGPXg1T9L*4YVjFe<3iFCx5aHj{JcZ
zGs$(dm`Q#|poAyCu?>#=iWVj08d{W)Ul1tf$<J(qBR`=<G5HZKipdXH&LH2TemeOM
z<>};Gl-=YTl-=Yi%0=XBl#9q$C>N41Q7$B3pj<#cN4bD}hH^gn6y<z!1v@Z}BcC8J
zjeLy2H1ZJwQ#o=OfvMyY0#nI{C{H0Dpge`VkMd;l9?Fx+yC_d0@1Q)1yp2Q?Ir0_)
z6UmzhOeAlhJb}E9@&xi48jk14s|buI7ZDgwUO{;rc^Tz#<Rz5Hk{3}POI|>E40#^q
zG2{Xg<#FUW1oFtU2;`AxP|hXiQO+e#qnty|p`1g`qCA?ML3uQJ3W-K><VgfZk<$o_
zB8@0#lP6HlCZ|vyNlv0XlAJ(!1bH0g5#%u>8qSeN5g1O6BQTsig1|7297A9jc^H9V
z<R}6|Ir0z!L&<{(3?&aBFoYxbBQS*AhrkeWF9KN{If6hIxd(wPau|WZ9Jw2T!Q>DE
zgUMY84C2V02n-^3ATWp=L|`CC4j?d)>_=cAxgE<)vJcA)vKPw%WDl18$!;vu$u2C@
z$WAO%$qpzbt{>TsazC;S<-X)Ll>3scDEA>-Q0_xEquiTpLb*5Dh;lEo0p(s~J<2`F
zI+S~owJ4{MH7KVLxFvyuw+Bz)mPFa$$SSnxK~|zg4+8fi0CeZc3bw(K<!I5JEJKU#
z<Q4?F@dWNgz_c4jylBylc+dhuokK}!GQWhC++s6~k|r;LLZrzHQQMVYz)EgDqFw6{
z?K%&&N&H+^a&r((szo%Z2DOQNH7mI)L=$Htnm7x!34A3hxe7!R$`MT{Lv0tnl$G2}
zM7xwA+NBt^o%tE8<fbFq*^OxDBGh)`3t7n(AlfM((N5D)8_!Q=B{v1p_{oUIPeN@+
zej+Qm35a$ak7&nnsO`XyWhFNT(GGctcF09-9G}BVZZx8CqY#bDMr|xVl9k*DL}P~|
z8aoWN?fIds<c1*HJ`2(IgHhX#AH+&-AfoLu5p9=&+P3@vR&xCjZJUm0+ceb1@Tsii
z`XL(A7txqLsBOddW+m4P(KbC1ZIgo9Xubz4x$cNYcSAHf8H?6kQRzxT$(4wvt@s31
za$OK@)fv%Nov>&bk41})XcNVEU?mrawo$Q&Mzu$6B;SseTw6pVV-SsOgWBf2a?z)>
zIoBG|<}O5=w?b_M*Alf6El?W~g+;SSEW(>(5f*_(XfrHA!m(%?28BeMgrd|W1dHIN
zSOhh}!WoQ(BM1xGiG|&Pg-yo7YR5vdK_OAmijpW{VG*$~Td**hu@FpH@B$VbZxSSl
za)Ka<lCu8)*>Wp!{_6Y=R{tM5-*mp@Jnw9D9*4F6T@Vjot8*=^{1-WEo#jrqb27vR
z81Br3_yFCUoghX)3umZPhE@M{$B&M$93MH}cD&+v)^XZ#+;P9-F2^2N@vm_#b1ZaJ
zJ4zjej){&O-+I5RqobpZBht~-VRcaXH(2d|E`KP$DZeB?EuX@*{y}-Cyh*-Q_WD-(
z`H*FBl$<4}%RS{pIZkdZN65jlgzNn8AoJjd_BZV>!Ycoy{iywJ`#xCXueC3;FR;(H
z7u%=W$JmG42iSYT`aag)(jH>B**V*<wr^l{|DNrl?OEGt+i}}{wuA5+h7Gm`+hSXd
zt<+Xv8*j^o$c4(fzJtwW3%5CJg7rGA>OZ%BV13>Cy!DLraqENDL$Idb0`UyI);jAf
z>vUMr=URtY)2%7i&epcDo^N6WFH65jSEWxN&cQ3vGtv`~`|t>?<+n@grRCBhh<Y#+
zR`TPd5mKhqM@o|7Bp0mX9g<1>L;O+vQoJm_1*`a{#Z%(L;yvPial5!)Tp=zNYawSM
zTf+|)Q^oFLCox8h6q|^WNG#VZ-@pp~J<F?>=PXZJ9))a*cS1hJ&9JMDKf?ot2MiAw
z9{69&1MKO^dHNiCdUBpV%Ql{-&#;Yi^gP=*OP^*NXXrV$@f1DFHlCzsU;`dho~E!q
zQyx^FrcbhsMtYiUJV6`T#wq#)+c-&2!3NYiK~FNx33`HUJWd~H8;?;~rzwPw(ns0G
zae5p!pw=T4R%#0L2tCF$$LPaMbBw}TO|f~HKEyN+(+AncQ3|UyrPf3AerEF^y^m=g
zq_AF7pa<v?wsAkbhuPdmVa29E_tCrA#=Z0q+c-jD&8D<<551FV?xA<Ejl&dHZAz`X
z=>cYQi0)^aL-cmGaTndkpgZYarn!^uVH<bQ-E89^-Nhbv9pLCrW_^I}VAuh=oniYq
zx{YD`>1_<#Pq#Acc8+dg*zI&P!)~XW7`Bh28yRLiWrkg4JY|M&7mTOO%28`PW#(#)
zr_9Dv=1cJSLFE3Qe98>BK+W<B%>DDGP0#Dw?5oRvUP=Fr>-BWMRyXFQe02ALYg><2
zot)V7kpq^k=dIj6a`?(#YrS{tdCQ_~Q(AC(-s=3b8`}*zB(Ab#EPB2xIp3boJh*Uk
z+>I8iw}g<4Tehb^_tKBzjw=yOJo)KqNf|NwG8$GjjJtR!YE0bW53aY_9~;%@$IpLW
z(Rk@p>gNac#(XvVzTeI*KjfZDT$v;-w&zC;7fFW|gZ6z1FDBGq`SHSEY3tf=yi~mF
z{9UgGb#NWBzIqvc9hR0C6#Vw8!5^KwqwwK_v0Q_F|E17|ae3RfZ{K}wiVz%HzqVx8
zfF`lQi*}{89cm-1`fTmj;jSCa-rRiKw%ok*^gd+8x}P_Pk?h5N>RV<lT`%=<?K@hO
zD?PZ&vTmJZJ^ulBKIPiyS7#kuy7u^ik-hdG+IV>8h7r-9{_yLeEq`!i(oD;zBl}!U
z`Sy>Ge*1XG^^f~h?fT96L}uua<!v*+TTvwo<e)(654P<@qP&H!`jOB5^5Gjl^l_ef
zAi3Y(X6t_Y_0j_m54rMf>u)#AZyo*pl%vCjPue&zgFKKdM{`qxg44FWeb4-Fof+S5
z`#S2uGq0Rk_tNX<f3po;+q=n<>HVT7&3^umX45h@Z+xSHbU2)mdo6okFLU(%!mXDZ
zzB#;V+?3Z6>}#a8S#Nxt)$RO>1t(j)Ih=cn2-(Bh1&vwPvgT|Cske6E>gy-G_zsoU
zZn|+}?9r%SmMk2U)uzzib!neFtCF9;F#e|x-u>uO;l*Ux+Uce6%m+U^`rO4MC1Y1^
z&*;~^VZfJdez;7dw;f1~%G%k`EMv^Fi$5$SG&;7Pb47J{|MY;FqqdKqwQJq#;e!Wc
zuWMGnQB3UGY-E0M&%v8--DY>S$t<&Fgr>JYSiisF^IbW2rQc4nLzZ33ltsE~_A2sx
znWx>E4NavML6_!j{B%?Dpd%THE5pXWC>)#6=|a-Ciw1@~9qgK3xAmblAEh*Hzc0O4
zQrE886RxfMZPL0W+lSt^LVWvj;T=<~TN}iEqq;o3ZDY`P$G_l$gRL`q-P-Q%4v9Sz
zqk<o7esEOh=&<p&b5XMkKe<?L?>YF`Ge0~WYyRNPrA0~G4}}x)h<s*Na#VCd%W<XU
zJMKJeo!#)pCm%eRm=(1%hPtdr?zc1>H+|Li{-r4oJW~|3s7XoG`R6l)EiW&p6L%hZ
zE5Q~0(7@b3Z~WQKJtq1bFaLb2(7(^6_TO`VJb3@&BL}5PC6|VnJH%B@3JV%_G5SVv
z@4a6aq&X&ia%)4UcU;wlp|e-f2XjlupY1$t>C<yM93FB@ezU>N^3I%IF!JeN&+dpl
z+$%hDgYB(mIc=h&C(5>OpM7AEixjQx#J9H1%WhlKA=KLUkSpY)PU9_*y1CheqReN~
zpWU`$?xe$^-?qPgz1!~ejI@}AWohf02XC3W=u(f%g^3pO*{*9-@?`4$-19<a%KrPJ
zHobc~ZPn;SKWyGpK4{$|-9K1x*PS~Y$;+dYJRwuoXT18whrb^C^NTTU*WI$};)5YC
zlhtF}4qO-1p)UB$q(k1@Kgxck=%Y3A*_E`)oYnd#VT5g|d3@LK$geUsxnh=`dVlxT
z%kRue`TE-R>gwu|{i+kMt(DSkwyosu?4U2hO<nm7(VPEzXEyg|i<#f;`|Zq~hwnU?
zS?B!z_Q|QAhPysWxin{M`0Zn6%&57q`iHYWefm}E9oO%9rrFHIi_vlWpZa#h2ak>V
z^Sz;ckN0@z>WuMEKcAD6GpRgi!>XicSF^%h)fu<^^|ILT0R7fh@Z6J;^0uBon)YuL
zh8%i&-t^axjNX~`REJSDSH8Ty;Ck=UYpvFQ_T2N+qt1`t+O7E-lKjx+^=+STu^};k
zTjJ5^r#z;Z{Rh_fKlW31QyQVCw$7lZ@0tJols@FUABSE&-#xU|yOaAA4JBz@@78NJ
z7Q5d#u=2o=Q?G6qc<)>99D6Y?|MJ81>*}}L%`Gi0{PUGhr=|R`zw6QJva&BuZg$M?
z8F7C1z{1rH3%>q!L+j{oO|QAUiJzVxRWx}2<5%jX6T9DD_})wH4ve_#m7zx$H>NgU
z^T_ez=MQ{el#p>@al-fCzF)j|>YUIE;=*R{E%q+xclk0oe0bisyBe-J(oW57RUNYK
zx;SV??v}L44RdyRQ~FPAc6R%S!pAe0ZfIQm>fxLLbyL3k{f$cl-YQvsVaDFi=bX4Y
z=R{1#vs(s@dUwO7@lDPx7`gD$7Y*Y6UZ0I=)u+HZ<I^334)*!!q|1J0!m%CK2EBT0
z`hf|hM~*ZM-f?H|-n}P&@#4}C_C54^@yec)?{C#}@s$PZdY?WY^*KLd^4Yt;^b}LL
zq(uKxSvG9j(ldVron2u**{l1&QFrcr?19B!O<6zxOtNG4^!>-)J5}>r&a+=Hj5=?*
zysYKC=i7d}neSUQ=<>__EoYi#pKH2Ye4}@Km&EFxZ?rl8=c$gV%i`~UCuZfup+kq(
z?O8YQz`1khuD<{NlW(kDbKs{B1~z_JnbN-hq0vv5t~mNv%IGeS{c`%pw5c7YPfdC$
z*wcrSpe;|f+5*2Q{do2}w!2?1NcrWAw>OzEf6C@=?|wg{bNGh~7m-Zi$?l*3baB;0
zIBMrSJmcQ0T_+ZN5?k}ux}$0PlgvLJj(z(2dlLqn-M{QXVPD!u8;0F}VQ6*F@EG&K
z^(S3YS+jjE>Fcj6oGstmxG?uE*N+1(JpFXLhto%e{P=3u%zLipy*23Vk*N!l-}!1?
zivtrv3WsHdl>RjM`OsBu>Sp8x&wjCFr6VDZi}*{hWMxgO=Uc4FeM<5UTmFi3`O76i
zt%FlO`{u|8Z=aYu_x3UJ?*}Hw_8*#e+q)|!9;j?Qb?Uf$^~<lX+|_Ypzith?_+jn7
zZWDi3+Y1jl@Bd);j*8Clb2j{t9sO*JXxHKPl|2u?GjquUrF_U|3l=Qcy77%kCvJJ-
zV)6^Wy!k`AbM?7pVM#qdJGm-)*upzq!uoZCio7G*%pACORM0IALn7MGYMa?0CidJ|
zV;TMUrx`IL>a(TY^QvRkWE^yzwOB=GYcbd~(7L8|w~}w}NO*d6`;UMA`RCUc%$@lD
z7sVB?{Q2FfAscRA@$8xtXTIujvdfW>lZlIeUDN9SV(%-M+TgyYg9i^3iWWkkxVvj`
zcP;KvC{Wz31TR_~3dOy6AxM$pE)TASqAAdj;{X1>#yju%0C(=3nRDju&hB0vVbj3N
z`Oe}zKOCZ|*8=|Hg+Xw6Xw8->0uBg*T*0>vog1sPsbqoRgi>e6kt5|%5`G`D*B(8m
zf+Ea1Jm9<(7GgTd|29nY4IA~$>80kXhRF526J#-AHD*=pFRJlK7{)(G=|cr$wxX3m
zUXurljNs1?5S)P@`z!zungjm_)em+G;60D+-qlm&T9&JiW3TwSri{g_2AMwxC6xIa
z!}8Sgqu+thus`~}US(bHAWuJy1%SzXTlZj~7UxpbEbOnKZw8M4$UZ|vfEWLURoInS
zLIfF}0aOuP+nRWagG4boBU;t0+K4YNb=3X*>`fr*4U_=8I+=0ZeG%N;$)bd-DnxdL
zbCJpp&VqgB!&cdu<#W`*1Vd%zzyMw7Z0ZYGKOn+6zKYHz!0{++1N3#|kSHMVz31De
zrBv#vpl+d#9#Ak>QTX`Nu-Qx9w%?{Of*gkCW*z&X4LXOABfk{I-?=<hj$K06jw4@@
zTft-VHs3nh4f8KFc(|PHxtd@HfqC&TV})10*N49VGd`3k3zP8U_&Hu^Fe^GIY8^o>
za*tb`Sh{JtySwxA^V8Lfo4aQ7MkED<KWaoYFH!+hbu|n~nwRN@YWL!+Sn&+W^>k!)
zD*6bC@67XAWQPVUJ&|k3xY|_r0?E+Bv-h?6t_*ecEtLsJ#lLz(8Ee6xDVVIM;Q}K}
zuBbT?F6EAklur$(858>EP4pMxf1hSV`Ij6+JzSptaLiP*W4$DS1I;sH&`4C#4C-h?
zy0ZybRx5EUeKc4O;%-e67o+uZFuPt13gL!7Es6YK7PwAso&)<2Wdq}35#uI%FIF+3
zts~i5Mr>WLK?$(e!)o0wVI+G)sTe^xc`z^m=a-<PHNt!Y_AE82B=e<qkk&)z%KB-@
zP5GnpefovEu!e4Af30YxE*XM~GFZyt#rnEA{DN-dm$4R)l-DJ0KBjGdMu43mIk{XU
zAqE5#M6U3;*;RE^%<jxG+$!$Yy0b-wD(xk{dZnXw!Jm`SU1da{h>!%lqs5FYmLDUc
zE&EshP6+yBj6&rZ@DvRBeeo+@2Fi>UQEYx3vUkYHFU9=PbsFSIcH882Oskwmu^HGZ
zMAu~m*Tv1)4SPO!Gd{E62xyw-qX3j~3hCOr&*q*kXKTCEE)YkLS<>@MKDrgV`jWzG
z9F#tw%|*U0i%2jr!{Ow5T?KJWQ7q<kPj-K$`1s}7*@;n$od<qJ%`){xci=mM5OwQ*
zG`?1YYezbc^)2%4V!r^5PQSwJ5g%y`^xq#|5S*YP!k{E-?5ZItSy=+C@)5ly1;cv4
z4lF}{Ubb@u@j><ac;TBwe~{27?S@rwYZGrD{JvzH{*2(^VYOU8b(#HO#nhGPY~KAm
zYsQUbZ|v!j!x;K=Z=x|MK55K*?Bi;D$?iYtA5R^?mXDMKQ_oNcYT?uy0YtNPCp9Lc
zdd*<SV-@D*)1oabwOTj>Cw7~X%*qW4wT;xTJgL9i&`Dny`l>4}jQA`1sj}!J8JXel
zS+Ca+MgZVnu-wC>ULs7943JBA^lsb_cEwQ5o_^!AP`G!i#aLH{>z3@A!<5=ix7B&A
zOH0X=?usc~b&;H5W}ZGi-}1?yf?8xd^k~gL>=z1~C;Sp+mdGMS-3T>c1(Kqp2ie+U
z5vzO&z?^^tV%cCp+YR1?xBi4{r>p5zYfeo@q^WWJYV97KJri`BT2o>1;N|Y|VP_c>
zb%q%l8R>B8%fd>)Loq-Vl@c6NHpzhFH1qdEUJqy9IAkDPV(styDkvR#G?EAf0`G(q
z%@%%om|?3|rit6vkoj%;x`ukA?_b0vUJ08C{xWtue~Zo#{PSLBS~xgaE1$XznLIGF
z4JQQ_nVSe3ENy&LB42OS*n>l;_R1vlYRnX{lgdSLU3DlC3(EO!_LJ7L9chFRg>06L
z%crIenKR^FaI|~K)sP<lQiBw2Yn`3~(6o6{?sE<3MMUNg2wljBD%dz?0y-E%q?$&i
z1BjuV?0a=aoDiWRzlUvix|CC*dx}ZM-Z>%<H_xr<sIc!4IZk~Il>Xk+2G3HmX%bTT
zws}0E?MHEVLLI=``VNJV{=0m-T_Ra8bRtK)L_<h;lI7}75YN72r|@DuPbkek0I^(F
zN;$>7*uBse#8@qoY&;`J{!za;OF&Hny9uVDQytskhlBs0Swl5ml>Z(v3thoPa{PFe
zlq^*DG6gMmN9E6NUVkVwB(NN-3a_-J`~#;DdH+B$J2(x8J`m}WcJ4$|-D2}L+~@R>
z!*i?iW_P4aNWD|i7Xt1<4$OGIfv*+h<p<y7W>FM#I7;}72qU(7W&S&6%+JkrNGMgS
z+?3`sbX$rxi~1bzs`_!rGPI~NQpj2g0Qt{sBXi@;<LyjtWKxG$=k{rBv}4;`m46a$
z1bI@Fq#wADLo~_M=3#oKwx!v{SXK{5zSkP0rwty00%HK|_Jmm~4L0ci@IRG-E~c!k
z9TzP#^11$@g#V1yAd`)H+#JyxdVUz^9`V|_&1~Hb75)JClsMApuRmUXsD6R3T_ELk
zLy)d|l6=$HN+%W6+T84g8i4C3I^`Fp)F6maiQ|z`6W0afU3<U?!yfdnyXWUqHs55r
z`SXv&_$|YqL*2UOJVuQ^<j?J0p#vGKsxTtv<wWEFrB&1*bM?Jf382qlKorcx7M<)U
zSB&>1*-#+(bu>ipD*>bwot~;!=3$ZzBChh3m9oT_bh%?Prtptpm_1=q3)^21T*AaR
ziqfkscR9IH&NADRZ4CJx#t`=N;CQ&)fjJTUn*8qZ>F#l=diqa>wzNb1N)Rd<%qk^_
zOs}{N^UPsFDv9t9fjirJ=L(O55G)zEByD>EdS9{}xf-B57={~W+qA^W97iuNc|(<A
zB1R5|x1O(_g}GyT^qdee1XUa|LzMdHk+1#x8Ek({;^~x@OeV#x;vH%$U55uVV#Vz!
z_Va2o_sZakx3IrvD%}%`Kiy|CB9b3oIO4Vp+{dB$TVhr(Qc*zw1pGIvG4-Bi^Uyi`
z3W<2qbmzEtL1Y<Q;-c3^O#XrcC=q~2l3c<`p2=x{3U!ps%(egat*KMHxu~W)D}V_z
zO8=Y+z#1(<LZX9i%`}z3+7P6pgQXh`3J_qUI|#~|_}eRq4fy;+l;u+vNCOrCSo<VI
z{==(oUlXK42^bn5(su6SF^CY2#1J(!d|}N+ORDK>-on8mEG)cyv3VivMh%J@)6<P~
zB^{}63cB4J85wzU<(Xiy8G^A}*G#FknaT}Cs2YBx1P$`OoN-yUf``i>&OL8!8N?JR
z0roKQKG9lBsgh>a6983zG{=WCGu<I1Y_VoQmdMqHsAN5z42%i32VC|q(sL+7FcG17
z6>!U$hc{i<eYIFw|D_}j5`2L<yWmXVvN`zt{F4iRDp__fkHvor8zQD}xIhqFhFqk>
zpt`O9s<X%2K*N^cRdG?--_hXI{x(;s6xXf$kE>><a3=y1)_nV=FYOBm!&+Pjh8pgz
zXjWJwg&j?NCh#{PWO-hgVPKa&tmoBSBnUQYM)Tpb*d*R7@DJs)YuvLNm1zO*0mqq4
zEOcr5WTo;HURn)J&8+@6^;;n~T@-a~He@7xfC6#fuQB7}IUjT5DRm4&tI^`ChK>kz
zR^^~jTK(BmLeI?}t1ZiFgLy&U7yi!|(ONBb6<i$JA2Q79(Gzw)k}PR+zA)F%%n~Un
z$EX7sTmehb=?uhamFRvq2b}J#?~4j64@tQG#qS!#&@_N}Vt$kHn-)9r*y<FfOC{l(
z@fjo`nVOzXfT1s)Xc{`$5ous>kbW+$p|(qB(%rkXHyMeC;Z!H?^YD*=A?UTBC@vl<
zyOHD0)f$6z0eIoo$=Z28GcxG0QYKIecvkLYX>F&oWM&?4lxx@{2eG#mcg5l67bwZJ
zjg1>C!H^bb`UuN;diP$Cc~Se&fEbJ(NbuQo9{p;r4X1Y4dUhMRH8agEcv7!cx$5dy
z0MVzUCMA)@yktl-mg7Y~F<o^Ns4<TIMuA75`M|oc7=fib=zzUh6@*318pS}fo%e5;
z7U{N<llYQYr^)fiaypAb-XWvQhZPIRCMvZIYL~pE`#Wue_dnC)octFk4E-x=`n&n}
ztNxGat{xiT>@H9fp#PVNqU@_u{(N2Cy?Z<W+NGBZRF?C!qf-=8N;c&3tu3gLUZ3;_
zix#J^M9XB-%eihaj4)jsED0lqzYwfDNfzoI%_XI2qopoWBwa~thBd|VrtI+&#Iw!<
zRN*{Vl7$*Uu?${{yDVPy<0F8G&S?2@*S4U`y<sr$J1-{!%l1;M(9>5!=jAsNN;_#?
z8}CJayg_+QGkd}mp&DWFt$W)I|6g*6fLBo>=I}WZ7u8hjH4Gz}S?Q3EzH(5GT~k=M
zD!*@7xn*OVjS3|=J*fJ1TWpsic9A_5K=cUYRgj|h2|Yq(+MQABztic%&0vv+rI$zS
z$u|b|uRf3fn)vZZsSO<L&|k2B+i=(yoLZV`<Xke>L<0`aicy$J(51Sy<q<|>#A2zz
zUb0Ok3^@N+!c05Z9;QphXj{HhSZw(U9_sefKb&0p(Ja)4ie#>we```HI;81nzS+yU
zI?3Sk;vGFBh)$LsZ659WAwZ!bNNCrC0sso|_xB77dpf&{b+xb&<VKb4ibJRgu%jb+
z)Q@xkLhAU8tKBk>TUjD~3^osL+7Ho=EqOWra00*@AUsm0j5&x2RI;P_p{s`=9`TYY
zus^QqSUG-wm*HitQFN4S2A`BNaWh<s{xF33anbEh=h=xJ=>F3BjfQmR^K3{HA<v<{
zmH2MYYe*t6S-|U6jR0n8Nc$W0x_YGo%&LT{gc{6#tyz5WR7>y6lb)AE-cDme`odnM
z#cvGIFK?Gm%C1?8^Ny$g30{#*z3*%&vE@vv4U%xb&RJ5cRN3^l2mS1}TD62P<(TIr
z#cB8ab!91-N5_QoRU}1x1f~Hn(_(Vd2y@i*5?!<6P|I#@HG}e3Js#iRaMvjG!EZ|D
z-oD(?3B^@A8BE^0zzBxuVA@6xIVWM+8d%F>U`OCex_C^UO$zuUwzD|=gN!}3ZiH)E
zxHQuV_}ISC<8tJfaWP;U`f?Lf{sbW-?1bn_)c`8a1TPW=RB{zqtVcmpGc!bY-2kWE
zl0CUSSA*<1Qrl4_T*4iDyZw4ZsLZH<44u^42Eo2-&QIY>Qviwb&p+Zv(s#F0U0u1y
z$J_uDH0$4(UbIK+!Fz$tE$>kEBFy>z3zEG59yjeKGAP7zC~;K;-2i(~)*=OxiKJcb
z^P~<X3=0omb_75!GE%$Zp?QO2Lo0PT%tP>rqJyqMLhyQ|;M+H!Q}bt^(@#Yw1tvXq
z0f%kc)e$!PhI7G{2{C##$Bg}Qn2JnB*oLf<FsCK7&Vb4lkd6c5I<6Kac>V6u0js0C
zBkS;mEmuNm5&{oo>-OdEZE9GnKPn8A7u4e8x?3=l_<UXbbcqPNC4R|W$aT7+K37y+
z?AbAq*~4GL$b==M#nPS6qE+zg@qzkr7^P)tzTUdl$l~;zxV<lmt*Zx;H?VOWm%1SM
zd0r$Xg|JgH0FdyC`gw+*#|?G}pVAsd|C*bwA3rO9WjVNs291AS#mS(s+~^DL2zp%0
zid~*~ehe?fEv?dh7i4nm4YH^%iCQU(P+;Pb&H4l2nbxVpDgJ5A#b&ZR*R-;}eYZ2{
z@2;WBh5j`FD96gcN);R8#v)8Dm^bq@P7x#CAsujiOTjZe!&RG8_TGc?!zL>Pohc4R
zw944jKbYzPN69=ka)kfAuh)qRLFD=R*B3m@^d==!AzEF(!wU;bjHrH=1(lBv63|~9
zr+N&~w|zZsIvFqrW35q6ON}lWwah_(L}wW}{rs6o|CIWiPsoJx-+J%!mbv)C#aZK)
zX<k>IzW&w+2Jx~KxVS9VjU@*F6iW^O%ELe{yJ6zA-{vz|Ct3$>#cPf&Pi~Yf)a&Bs
z)6|34!*7>lq{0uYdDUpe{IIZ$WbrST&1b&TH3>Or{N2MZuI4JLXDKXCto-lvX)UOw
z>mV5u1o~<RR69aX1H8i94*$DcZ$8uaFyR?~INuTedw1jP#mw_yI3l?*<au&ohO<$!
zvfYZ{K=<3qxu1xL2x7Yvc~#r^8Dplal|wuWbDBcf+ok!su(%UtWD`u912%R^4)kvL
zIh!BcF|7;FDHKN%hdoDohP`>7tNokBJR{gfZOBTN_;3*N1I!P`V7Oz#V^<voVBQAI
zekuhL&_DokA9-6hwFJP~kCK)-#NC<{{7GMx8~g4L;#Uv%&P2h6r1+Mx@g)5vB$#ND
z*F*Z+7Gam&&nLAreZPBLhRciZ_8UWkJ;In9L~>%r1n@q~$<LUWyr+5ee>#+);I^vp
zYxBPz!Osi<y!U(+ae_XOyTC%&sf<GKOz|Y$+%FVf?Cpif@pk#OkTA-KaQH^Ef_T{l
zizM6rtggJbY4ANc<DIba2T|VrX7S`cyXe3WxF6~o55F!h3cp)b?r5KR&Umi6QRhJo
zGL0F&KBCZ?0oCa8P4fju_o^tTYctWuejsE-W2izYmXofW8XA2{tQDU?Dh1e9G-dwx
zj=g5Q_}O}Y`FvB()72w|^Ao=3Z?N%?NjZbJDsmH3xzl?gB>b$_)+do9oMuyjo^8B!
z1`~COug0gr+gm84TCgL77$3&Y;MC)()&0PfpqbUe=77D&E+*gEInv3gHvGmZ+^BZx
zVx#My)(Oe}25v|5v0-Q=SZKsH2T^e<vV0Nx92)F)G&gO;KmI2CBXQi4oHS3~5T8(f
zKe^BG##Q+dSshThn!?NO=HWQeM;EZe+%{@Jlf}!cm>qTZpKb1!D+ocaWi9kGxs{5g
zbN_(KlG07Q1NH&y&hYdpq9^pJx`jo1ax1v?WliW`>-sGZwhSA2Wn>ebY-jk<g?8AD
zUr*0$UHhU0egEWp4(AcXbK)~2@BQ-MA*i{`qx1DiJ<W<IW?@jRP&pDC((v?C#NqR!
zhbJ%Xil&r{;i=mxs@rFQcF1Sq^0t!uy;DWyp<{;9cj(<d@mFj246p&M;_lAja(y_G
zxwm_5mC`GmcZJ3PHDdQ(fvrd?Toqe^xy%Co98F&oz8kxxC*r4<gFdI3MD0nS2fbv%
zCAhN=cgoT7He}kf0LUiG+a}e=Y`GX6Y^jqeDwV*x3WES#Ivgn$AWq9~1%wvF&OU8x
zCJEWv#jVR#ENF=DUk){h_BZPvhXsyKg)eg$(H#d0rx4t2+fuh1j)#b&Z=$SE@BDcK
z_w;!R>qfTj<zc)n2lwz~0sLZDt;Vg+XI^?`Mt#7yRilur5GjGjoW)$oypCbLv6K5F
z(FHl2<nnIqeD~D2QlQEkoR<rxw3)V`A-Aq05~d@%PUF$AlQauLlA{)LD^ll~+PDqo
zZN~KP004SoRj8Z+FdjqL20ZPRb~&v?59V3nsjdl%-ii8Hn!_B6vP>+6?GHJ0Vf@BI
zB(*!?5kvhOHeoew#5aG(&2k#0U8nqvLSQyRpOSJ+qeU|~5WVV9CmAHIyzJyl6;b1u
z$MX}B?Hmt{oA!mxPhs~K-Rtnbx7ut`5xkLd^Sqqs&l{h@2aRjhInFz_{~DQukfm`;
zUoLVKOCvfv{e2!!?&>f8EI!0%ycEP?$(Vd&?t_qAoB8^dYB)vV^M6eg|Iusad0oGn
zTIxCyqq1KWB~TUIL~uPX^W6Vu_5}~q^%iKxn{nCH(UPx8>jE%%i5CS+f4OAlt{aj~
zPAAKjvM;D<D$5n8`_WltPy?ge`>?fnx8=URHW2Y%FXtUEUEUawJ$ckkx_M*ri<eDr
z?t4A2G+Yv0MZk-Bv^7<S8a<?DS^JvcKm1RvGDvHeNCrWZ{Y;G;Lj`}L*bY3Q4-2#j
zbgaOi-G;?;%WOgfZ1D0EeLl^P-4%yPNCc)nKRK<sSdwAnZeSRXh3w___|%N<jx8KX
zo0z`}zierI9OtmQZG4KGnhOw~KnPAXJ{>))n$&(TXStT-fot-5lcoK(*cl>06TmYk
zYpk)ZuQ#mkMDHQ%(y@*P)26ZjoH4<?Mx5sqbK~f3uHOaa;5Ub5ab;V2IpYD_iux!I
zE170NJ5|QWx%zdRj>A~ijNK<#P6Qc-tS74duB&1uoZC#g5BL%i^imE3%aBdwKa5EG
z>~B6TAVru(l2U=@22=O%akmAQ8GzRbwz<_UcPOfm7^l`J93eoM`k3mW`SLXSNi?_0
z>D5<ZfP5>lKWgRc+y?#QMabf>f4n~4i`4fg#Lw1;6VF7&lKYf)kp%;crOu{r4-5A3
z7jPMx80^uHbcOKT$xIO5fYHL1&q8vNx%ON5thyjYJi78dHWv|xFtr?XtGew?b-Jxu
z*|k^N!X7=yA@_yFch6478;91XckqLG(=r{MXV0gD;!woBRdrm;d6&y!yiH-!&cQgv
ztYq?`i*kR2Y_Ci~-R63t8(*`Kid=oo2aNv0%_nuMhw}^$pQ$bB0vVd%@dQX6blquP
z-RdcX(Z%UQi)T--hzNOM4yt)+Q89rF$fkD3`IhPL*i3ux?O@)Yg-(fQ`ltP$JmEGV
zud{e^@_2I7$bNFg=B~Ck0lSrlL`H}z_L_gBceFSp=6jc@YEoN<po9gP3U;opk0G7<
ztg{kFVx6evChJA$d*Q|8CAY_|J9h~_V|q^b`_+OsX)ifte8WhwUcPI(-FaNu2E}zq
zKdf$<c^)rz@w#wo^T7CkJ6{W+nF`<xZ3{{$?XdU99tE#2v5AndcZlWbsU`oXtJ9gV
z!xbUHV2^`!-B1SxEmtE9gCYOMB_5g3x1mA`gzLy2>i&S99d`*BKQrR-!rH|ASJ4AY
zxV_AELV7&DT`Z<l6zO++$=<O2L(!>Pq!Q)p!+`l-QsZ$w6Ov0j)pBfD2B-26>EyK*
z2_I@2Eug(u<WH=E@Z%=@#b$0Heb2(BE)QzAX?s#*@q8%p`g3=cY<#Xe(gWe{j&`S(
z*%PvAM7^!OvK*}xOsZ~hn`&4Z<z7)y6E!WkrzW%A?f*C(=IQ@!eR^SRlV(L&WQ9wO
zkB(cD=TH7XA+pWPL2R6tSc7te99G7A$=)$?ai;$%-RNkF{^_0Xb%p9eo{*%MX~d%=
z7xb%n*+JR)cotV6vtSolCW>R$2vg^BSbHl#%EhnZNLw)PEsat|OmQ-w4W(no97(e%
zLEL_P+e^UbMGc2Q-(9><-Tio<iS(fxGc5WOiH_m&*?HLAg&qgLBF_rC0xG%_Q!gHo
zDQ<5%f2()Tu5RX^X)E!wTi*Q<$X>FfKidqnFRI(>dg|jT4rLZVHsgDsu=g$JwpV)t
z&&RDhrD)GYPK6Y7Y9(G67Vr{oL{H&JZV%0l1cJ1N7h*<ol1jn;f!T%}Qv_||0@oZ?
zclA^GBH>peR`hRg^sFYG%f*vQjf;4Xvgx0YB0FvP%$g|W!B!QQxb`Sk0tJ#|R8W1_
z3#1Z<8ap#E`I4JJ0m3=Lc;o}dWPXvSO61P@*`ND$5>f3w134N2qzz-bR-()iPhcr!
zxplcem`{krZ$(&=1(p9%GH)aN&(lS)OpT=bjhVWabCjevW@hY?BmPCoO`qi#wt<lB
zQQx(7V96uT^TQh)-9t@rO5+?!XR?@c*UVATYCk3REo-AWH3Ko<%OxX&){0u7nC(FU
zwVDsuTg>P`+-8T@XGIdvw=WWDo@cD;AAfUgoEx6gg}8kR3-SHAMDe!#=BbU?&qL;2
z7kx&|7x$<VGvsvEgg`ti5IuuQ_20tRYjCrtiLqpgM>iOoPkUW!Vykds!7%<FX7=Ip
z+uZ*5YuLDR)1h}uk2wCTOi)nn`<$b;;}?IA!%>T8`lnvd)OO<{@q72Xu5S7e=-Ccb
z_|~0Wk&;u$^J(lZ>*3o6xxvNEgs>B4y>|whID?K-e{P{kj;2N~LihW8B(Yv?OBa#>
zze|Ge_~mzKA*77dnHyc46VxBz*D#GQS+0+h;lEQSKlL_U7q0kkh4gLGtU1m2hTZ!_
zJJz<ZboaI;o($_~9h?tU;jsejO^w_H(fSVpEw4VHwy@K1>x>Bp{{tZq#B<fW?1`w8
z0u~6l<hXtERhm1>*CtZx<)n7VlX1)C6YAeOteh69px)XaU&S|N7gMPpbrnjPDWbYS
zI=Uj`-=BH~ALb%$1p@<u@6T#=-u4DOGi<?Iijl$zrPhwZcu?#&06baKY?nOoqdLO9
zpvtu~vJ8gL7Z+!nJzkzJE-sft1RSEVMwM^(fmyP&FdVNhpJfd5rP^{Ho;=+=ahxhp
zdocymQ^lgbyAMmKEk+*qjM!_ZZ|aGYenE~eNeX?KMJ+^lAU2fj`~YmZ2$lUy9SaXO
z-u~(tv{6b7HN8wRQO;BR>q05~7^37(65AOkkrfXbqVA<*_|)dP7HS%f)aqWVH@eex
z#;+g3JEvAGjt)`?dJby3-v3xxR^Ig`xOw60+Ije&yN=N2;&&uwuS?BnDLJ8|VxI`H
zttTf9?!Pa5dJCe+*bR`pc<*+8(*mpd*t`arS*272yv9Pmg!B`nF)BFfRUfoD0<F;~
z-`Gr!$Fg{C!qd)CobPgmKp#{sxV#oiSvy((&cC0+!1m&2PXP1FIUBxKXUW57sAUJ2
zh%4BC#4Q0aD7^+m$BU@?uuJ=^Wya{JVnqDo*%xLc3%l~(wle#7Y&{$*XFWA_b*Aqh
zYz=Bk%%AMpic}#JMW8n&LT|M!`I7}U4{{41cRQZ`SaEU}hg{q`X^=G_w0Kt>Nn_9s
z_ZVt^EJwxjgx&ch`Z&=yYz1D$SEA_7g)1s2zKc6@eE7W^ot#{MGv=U(hQy(Ayc*xZ
zl>|hxCg31clNgfTwk*Jd@8#O`#h&N!J$q5tkM%aYv{e%<gNV@U#$@HTkuwCUuI+PM
z1M62#eM5PrAwf;Fer)HYOD%YKPgfi&tn}8|(^CmE2SZjnMin`!|7q*#_szOUSWtK;
zs`_UZi!t*W9JQ+;V!54P-X<p=d@}4LI9BuY8aGJKzG5DCQe)R;_uw{H;2dXVt0(kD
zanNzw^Htv?;wCtHs_p(hSVFaJ)zZTKAL~a@=9)~_!SXo1NHAo|cINPc1WEeZ>jE$G
z2aO}GLof{Zr^!V3HAQ2@`Em7;%=IyGL(jUaU>_3MnC$ms$&rz_V%>ux&^7A6!$7*&
zWlDYfz-$K`(c1C38cMf`uW{ai8Fc58yGb`99r7%JB|wwI3Z+3W#MWR&;#m2Nw&rSZ
zDjiYNR%(>s*qbQ&GwiIPML1BN$VQ@l_~!9mWa}XV8Rw>ox;;0C_dD2U1o?ZonY?#$
za%)LE7LDrxN9)$_E+s-hlD@}^hAD2JQHrJ@IVeM}#t<b&HVK_^@TUdSY~w0mgckD)
zTX6PALOz~CF`@3Jfb%tE%LGfG&wVfmbJOqW0v=aot@o+gAK1@+(j&)?ALs4glrur8
zfa#EpPAr1PW=^yP84W;>9Gewm$hD82dip+ukm2mTrJ$ektED(Bbxlv*-??9>*~}k^
zn~S3iA$<5d)TMr&JB&OP>Am~$ym+ubN#M}=5kkRcM2*bgI5L}ZiP>NrR^_Ed>{$OX
zwz@wt?z_hzMU`(q*3b0Zxox@C(<$m2G|>OvqKSDgs5BUqgD#<Qep|+5n=8>3_IMY-
z&y-4%E2<i$B-9|3(E8uz>Io{?cAu$%JrClKjjw1eTnDW&xTx5Hel+M2839G3{-rd!
z_2}Da6w%k6e(FE5?veRrNW;bK<}RLNk7^HY?v^3)7MboqG$^#B=##uGi=&DmJ;X+Y
zzPEdt%=LU2-nIxiyrqBKF;{4`v3NT|Snn((IS~K0K>7!=ollI{)K{f_-gK?k|Fm%{
zz>WVmAOjJG`qB4v+Bb!*NL#9;3jn}&(vo!?lLN|P2-v3uYBJl<W%0%V%h(eWm0Q6G
z_<5Uhl0)oA>ijwn&v2yMcEHW?1kK>q#YK=a`rv?#BC?swV_avyzgXIWD8K;AYp8jW
z09?ehea^sM5<&evfZtD%CB;^FJ--e4<|KKj5I8x$a6Zz1{KBb7`gU>n=Fj(y`He0X
zZRw59zAm`%+8g={&vS(I)jpSM$8`PVi0%$ns}81$a{l(ixXk+MQ<WH%!BvR;yU@_b
zr^ovM6WSY-xd@o3x*}_E)P9t=lVBS?kG>q{kQw~xiledT_qckSQOkP_ma?>o1v4SO
zZ0YN(i9VEsm3VWLPG=I&G;=^_CdQwVX$>gs@;^uVgn!u&=yboD{v*a^xM|-kBGl&2
ze*JklCNM3fWfKQQpTn6PE4gU(^qt<9<EU85=lG_O#;4`FvF9ewKV3D*Ht=>XIym?=
zwUqU0S*?xhw#l+(Cj7=H`4~&-CVRvj?*H_&I5qsQc*xNs@q_(@_ugWn)tk`Yt5#31
z?fwS5oFTpO*xcy3-W@!5TP>-=lp|v*F&dyRUxX(_Kwj{zm`|y_?h3#66Q--o7}IKW
zs>>}dS_=8v+v|7pkZWuicnmi2o#tx^kg6eO{=V;CUIU?vsB2qZn}<X7w9`>{0iE<&
z&BOl~vWxmWH)BLmIPziZaH}l&ajFf64~r@amBE|;a8@s(A@|8L%q#u0@e#gV;C^1v
z{cyH1_S&7xm+$=ThCuRhA$;pS+~#AmnHyK*q+zB|bszF#+Hs~iJ??a+vG4imen$F!
z^2doUSpsLH@mqNM&u-6#hG#*c<dHw}j|b|=Ab2a6Y@9hTBEi)^$Ti60=4PqZG>=-z
zO_OpJ_<8PFtIZsBvAJ7GaUvTtX}YU}rUT0|MI*}I<!=$^Do|#Av1V4U1U1bTFujCD
zk<&A4%T!00W{V%aVOUQU?#bxtDrc=O><Z~(W%Ai->iV;nSji*V_ik_T&sbIhbLJP_
z^Tn3pFt6i>7lpaE$42n2<LODRRi^lTRxq|ObL&E-wsK`Lt#Ix0UE{Ob@Z3PQ;G**~
zk7dZ6oe&M}p=Ym9dnhkt#DHCu3z~sIYz6q--z-ULm-#U&MZ?fb+#_JXPubZ%NOR(4
zJVflT@7FWalY)MzcF*mu1y?}=S`Wbp*!w2A>?*Y`kF?yx(s$EXa@K=QORnUWbzk`o
z;5g8@uy9X*Kf#ea+^C4$`nJmAu&c>oe4NWX+|(WQRNa?E-+Ro@LVmQ=@3?`^Uc_SJ
z<kwW6T)YeMM-If|QzQu~y8&vJPW~)HoI%Q7+2lijl9h%x90^gY*$f9>626OS49=KE
z?+P0Gx_g7kssG`BfO=tW`P!cZeS*cbboQRV-#O~5FK%uw>LvUsj$Rgr9lEe3)FR-I
zaL@3>;+%vO*KmS)o8}_Y+^-iSVmL9hm{WceF=$cZh>104MVoSFCVUE>Ril=q2ol{$
zL$9~zY1h<0n(1nkPDcipI-)PT#e*0Z2=xud(sNwJxZ>($&w~VT%e?KPuQF>s$Q{5p
zI>RskijQY!XP!@o6xxO2Y;=Z^W8jZ`70=TWAIXUL?eS#+nMWQ3M)6}GkbZEt4;kk;
zH2yNQ(%%$SCt`HDEv#pMEjk_@^1KOg^m8@hqN#8*ZY09NP=NllB#{F(MSPl<ku;eO
z(+N~F$!5m|kYGll0UY1&VJY@Z+&wyn9XfBB00831e}dnH5+Hg4AcMDx+@|QU`Ltjk
z9vlo0xBL`Nt1%UMsqCTtS`ZG0gYmMGSE564dr*qfVYgXMwM)*vNSj(I<fOo-Lkh=#
z@&Wmsg4+M-!+us-)NpdLA;{BaVOUqc5=wuq*HnKun0hh(_r^acg~@qE!e?r@vJQ6@
zTdQBExvTkcYo_r{ci2RLu05VS{*Dh%1i&3eHK5Lrtx=@D0prNR3viGZL@T98QxiHN
zoX<3T!?(7bjI>skRnlXGGB*q1W6OeQ(O*FKz0yQDGR_mT9wkguY*2}_;)HrtK!Gw+
z;J3>r)Q{(tN59HV_ucOgSB*XHb2^kUHaP~=l`{nx0BE~4Y*;<d&UyHTK4dZA#KDcV
zK;vsRnKLIt0Gc6N!B3rdoh*D=KLC@8EOUbwfptC2g%v#TsD624^>|?>cZ47y?_@gs
z*gx!OE4mw-B$}6XWq{tQgDsYk1}1BwYPOk@T|+OY2;u{xBj8j&(bHSVy6=_wtsD_b
z(T}`Ig@!f+-}U0u(hpQ9@;DaC9+VB8v9j>-mfzLj-2WPTHeP8HRQ4v@4KXmBQJ?Sa
zNp}cdp$P+o#fS}(b6bdBbL{S644~!z#)`v0&j(ta4G*o|FE@NibNtrLE+A&_UtLbf
z{yv9F)8E)B?6&G`+*3GzYTuL2gZ{0$g7Um&DhqlA0b8x&O%WP|AF~{wBYfI&wf{+5
zYdjj!x88UC<o%4ySojq1-(L;joG0E7smW<pq0A=$Wp(Cv%*0#QTV@}hyY0qjQLBsT
z#_+4P-9psX?QNk1eGDZdq(%)Wch#iaoSFVm1oXVvmZzhp_&9oup#Wrv87>tI4fNJ(
z4t=O&b_e|4d0L2j4g{;b{jz>9BJ=R;jUy&tdF9=$g>`%0<3IqRIEEqk#;}MDy}x5d
zi$<m60{$4_qbFQ>|2Cf#AhIAxt~uA5Hsx;>-rM^;b^D-GE)jIMkQ}|9IP9K?u490~
z5D#Rydvd3VC%`dQw#Rn-)k*>Lc_I4WYGV8f%k#t2u}t1(G(0~pI&FpPqU{4cZ0hW8
ziiVms5quq!g$D9!Hkr(;V7M^7r}#lG_jWz(cB$hHJ)!Z@e5?7f1fQY+iMY6Q`jiW=
zl%pz|*>^3Ql3$m;U-d}w+_>%$+rg-gJ~Qr@5}D#3s?l|J4(9g5!*7n~jKjlz{~8Ob
zl|SB1l@Sw3sL>FPNG6nIbOI*TixV+I*%b}yt31@U84CQ~==CmrF@N8FyNf`p#&kq2
zm`y@ek_f+<T5x}AR<(8w89>7xjmRrcO<O39Piz&t=vtpYH1Kcq`k?g<B^?$AOVQR2
z3q+iEHzIVcF?9quZMp*^6JzIn0Zi@$m~6@n)(Jkm1&>eu^vJ%z@U}cJFg`Be8z3IU
zM;U>}kPcBeSdqC!UciY{p08GHua>7CGbmE?C{90Nlj@f(3&5zr=ouNTIVi1!6($hj
zgvvxTu%ZhWZCF+pa-;VzTf6y1PFXJB550uys9Y>O+PvEk>EdoWS|bd!kIpcAC9xyf
zp0zhOG%g*X;qSN3Hkc}w9@c))*Mri2Y4U%Zg}oR-V_h2<urYw;u3=(=$fE{?9hBrT
z^cas{oZMbk=baTfq2k}JH>l|>`L6H@cr150<NRLTmJaWd4&5K2>vef|zeZ8~#5ToX
zK8ER7!9Sb4=ll{vs{ADpHZV(~xAJ~)PmcX{Ar=(7sTW~Ls2Bl6zph)|+-yrzp1Y+9
zsjc^{d$n1_ZG7#g-R`t`d#w9iL4i4g4ucU(0h)KbOp~WxtRB4O(f-y-nB}x{%j9B(
zCxsd!F5xM%F1zSyrj$RE-*UaMxmozbphu=G(_2#8!%B0(-c8`r)VN6MZ#%IUD%q{W
zbJB-%!jztfqJrf$Z(e+!gfG=p{gtF)bUhKxh@!Kas+x_Xyg}Nm|LP}14Ydo<&`X-k
z^aJ*Ts{T7E-6Y-D0@oL9ZvyYWZamvasBgIXw-beK7rrgw$(~rf3xt}{!#8rd0tVi!
zoS&U1z%Bp+Bb3f_qxEDi#OOlrUx`wDrK%I0<rfq?YBga37<xuB$lAZ*(+AzYLr@SS
zWMsZ=c@Vo`k4h}QjJ6AxR1oIJpN)Z!;*;-X(L(x2ejF>lZ1`}1k4IQvL(U*eIyqF*
zgqP@{?>))w?&uL=YtMwi^9v0<mQx&G-OfzNI|#!n<hk(()#u`fpA!EP2$NJ7+<zxE
zl4<1W1>@s%O!gFEjB>1M1=v#FSApihV$*DxU^SmFnUe%i-WUtD1;LLUFiM5aVAQ#w
zxpd%F9qSY<2%U5s(;19i3XX6eb;VSHT7y7_cznUm4UVx&HKY*rV?tdx6){6Z9s_j*
z7J9^qznU(DT~S>ZF(Su=agb)rG4jh@@xLJ&e`0d$HVXiD35bffDMt@zAXq_$w$>gS
zh{q<@sb8|Df3SMfv~3kPE1+|m)H*Dri5gl{=VL36j>Zts=VF*_C7UQjXPE5|Q2$aR
zxq8h7nbti)`ufj@ZdZPM_X}6x=*>;n<;)EQAR-bUjjz(Q3?R!5v+@0c&hUZKPH5+I
z?*v&vE4w$7I@|DnU^~1t5C)h^Ct+HYE<Z+NTJf#5EqetSWg$oODCq9&0vT16qNJ4W
zN)2OmV0GbdiJFXS5PZ!$RanEOtglN_3Bg)$wQ!W3RI&eL{ulV>ayVb;XVffh1iGCy
zfn@$vO=*AC6NC4dSwcXQ&r~ft2PW3(R}$|$4n;Xm*?*~DCP@GVS#({{l0_41d^37{
zV6D2Mj;>eWv8XHe{!ezCX<+1MkDnN`2LCSWjey!KHc4|AwF47WwoywW#INWelV?z*
zV0-<~g3wRuI`T}DVmw9@fVvu>Y=khs{s$01qwWtDD-#$Sibnz<sK?6Xa&)djkJ0P5
zO{&5IENVowl~CvrOxAtL`RXV_FE|UatZCvGJUpDRc*lFSO^6>0Qe$%@h;ob>u^uHe
z7}i*n1q^YT#PR;cl;gEC(vRHmRf2sJ6wt@S=2BBJBkOPc&i>Dm2IcxLY7~+^@me5}
zjX%(*X(DV~_DFxjqoYky9x8-s!1c3$1GC2Lo&6#8-Ar7HI+91j=VQYuZ1mW{&Hl2C
z9pWk(HTIj(M!!d6zXKLfAuZ`a`PvdO*JvnbR!QAs#0&M3r}_1}-%YT=Rlw&SDLB;l
zV^RzSB?GCm^%53~E|)#X{%|eKRiA3+Rf^V|=zZ4(@7(&5%#^UyIWoK$3v~6e`~4%R
z&HM1t_h5prq0o}z?Kl0(i&tiXnUNv!?$|I_ib+x9Kl*9(c6IPBB)%vWuO7o+{JwIw
ziwe^$e6Q}!yTB8BcE?R~v5z(nhKYIIx90geCU-}Ty*I8-NZX}q!+7mz1t|uv4D2oE
zS5#<dqs8PT?DBl|DO2SNc8h|MvPo!sIeNMVO8k6~ll!n5T1pI8p=K8^e8Ay#*Gvv?
z&YkzGa!ShT2)0t{`&8-C%<mLvWz=Q->?^z?<W;#;WN1?*QV_jg<*ZdE4e9&>Y;YI3
zcOKz6-%c2!Y|m%93j7!Eb>WLmrn~yS&W_xlIA-%}I;bbWd+`mlWD7Hoii!h^3z~E9
zvE&vIJ>nJ5^|+sSC{KRYtP2Tzi)yHLxa+IHHBYYlB&%{zN5T6|fueY3D_K`LU7c3F
zir1^Qm+x!BeS&OUZ_DNF*Tm}aH#|=1PwfelsrAlq?^NHvg6>TFF{+-DS$cQ9C>)wb
zGrQ^48FMu+qGa~GyRLkZ6kj$}uYQif<NeRt&ccl^kPfrb-gK!I@0G>NC4m+Co1B#D
zl1E>~_lDYrgIVBOyXmRP&j<o+KYzh!5J*F;#E}VN<sZ)wOBLJi<@j`p;~G&?MP@Pu
zOJ~ayi`Q4GI~W~~tu_O#f+XXV<o)5|q;>|8q!=YN<WND~A=#3W^1RRLt>cLxpKW|f
z#>Kl4MNXRQNwgIPyqs!sav_ywG(LSo4bzBRXlxFN?2v)n(1%y^4GFyy(>@jG`r8I_
zZpb*Mr_>LIOBhT^yVcZ+<Z@G=Yl&*P3|_BXujKd+b2ornEt}2YZ*J7u8cb4a;;ZaV
z3`dErqWO@cVlS}RYVc|($mGSdZGHJ&iT0?HbCIEl*5QQ{IZZ$7y~PTFe6xG<z8w~?
z)0{7M6gbPR?-Ho<hdk*GH3YeJ-atMri)RS@^*z<wkLpi?P3n+;VFeh5V`dC}E}C<&
zn1cR@ThwBFqb*7%$P8YZAdr;Kr`EK{STOvrwybm~q2pWnrLiY}G7W@Z(?Z$AVp5q$
zU=}v|4A_2=Sr<?(^7ntZPE}D0+8}Qo<?_~vPee$NpI1~sOjv|ZR8&|<RFI3;QJ9ZQ
zP{2l*%hrz1fy>_3&R$fAUzk@&*iJ-DP(XxNj9-M?^_|oIPWu1#|8NIrLD25#7qTR>
z{U;rO{Y@v+<x}K8F!tSyi^`>+M|I&541uH*wFuHAsO%`Kri%`fkjTfd42jQE0c-%A
z6JJ+OX)n&VI=%J>Q@8qjPY*B07!2vFv$=o-Q9#JqQ_&_3VAvE59}Fpt0F(m2?6R?d
z-Xmq*y2pO}2VR1<tI(MR%aTmeX3PY+I<ES**XG=sX^w$K*@~ZkR0z)d$qu=`7#-Z@
z)zrr%{~$-Y0*HXYMpd0SDIER6=MbpGQrR!ONnyjJKXL2po<I?bIb!q#em8y>oAB#7
z97OodYMashsQ2f1s7Z_|AWi9pXb*}RRRX9ZM=Q@P0Rk9+rB~=O3F&4nt4VIETrQZs
zi2EV{8xz0?X2B*A(f@Y}$O`@*bwH%`U(}N!M&RDqwWOv#065r`y%@H6w?Pb%hdP)N
zVMl-E%$oP2jkWnT>G~k)lFk_goJ@DPotxXeiw>p_`Tg{RKD@QB<A<#xL8&bX6bl^l
zT~b;e07fGr!z4N4gO<(ff`qB3#>S3=%BX%c>p`p1C}Sdro0^v$6)j&nn7&-*Z)scp
z>JWMIQ>99UqrBCq=*Xo$>jv34G5l6^<~l4KCR@~aip1RcRCjDVly?-^x9#Lu@0-rl
zi;#E>(sL*x12Mc*Ts}oDuLw)u9+VMpha=_&aU4vk?MO({M$+UlNwDUknmT=y+rO*C
zl<3?iuMKT%Yzz$<q%Ve8>6Xtib9_+DBaDj<>k!evaS?7E$t)-LqV`n8OatMf<#NqC
z4=mx0*2_QNosi5?E+9~`!`F{Y4QTWGFoB!4G8xVUTh2nWdLzYJE2CVi%U_RS&j){Z
zZtC+r;mE_IVyjbB(0Aad3VH-OIwuSa5KWNhmSlh=g8!=4cky-zN=X<u4&%jV{;1%b
z=vhB+O(9;d-+!{U9@iTZ&tQN!DnX%G=#v%m)J~4TNdoQ&P-F=f{^X>QOqUI+rLBGa
zoWBKe?=jf-b&LhBo$c@#Mo+RCm!+qr2>kJxrYJMHZT`4*d6_Qs_cdzk{#at&oMxFC
zkjy%g`Gq8cgMyWn6}|mVNe=rmI>6D<CNQvT&Yk@yKAA92(BQ5|xSPozqLq|#GANp(
zE)0ln<iZ7+%v!J~p{-Yk5_|&eWGBOnFk{fLl<}X-rx@eg{CFwN+_Lmk)02cB)NS1A
zl(`EqA`tig)b+SD?~B^5hU~^19sF9u1Fo-6Wdc#>ZY$Ck$Zw3trj88q*6$cxztj`J
zfC-t1mGt5AtgfzG(WLm<%-a$l@Ao0^-oN{g{wCcp>`p}M+@q1r+-@QUc($l5gKY_z
z<b<eD12A>_zkM7^f-(W*VGtrJG*XBw6w@AL%LmROigPe!FE7%GvkEQvmg38jVn@+b
zK$I$j#dvh|Wfei}=O-fb_<OKpD`bBlI(USv%(q*H#2P^DlKRgHex+D7=UyZp>gC~K
z>1NG6;U4hbyQi;v!G)gY-@K5#Iwz<z3C~NM(ujA8#3cbJvNQE(*@~OEzS8rhEAEW)
zMF)tQr5p6E>_M1;5Tdwf!3hv+irqHqN8S|&y7xR4Q5;}L=SuW927tlLvGhmUwAs2x
z2V$%HajRP<5V6^@R%mBe7x58a5dg)MmG?-?a!J3+h_Ci>nx2`Qx?gKyMxe~P&CR>J
zB@|8ZOoTs>eM6S$ZkD0NP`Q546Z<Q=B?MrF_?4#3$ru6g3fGw-0J`B&IWPzlu(3fU
z+G=@Nv2u#0MmeII{(wgmawSvvK1YmTP&B1&xo^)|Y2-CbFZ<`%+-34<ao^J*eaOx6
zzr28W-o#D=g)e&I==L~*k-Bc%sm0%ZPo8b)k=-fs(Y`k~H>U{>?jFhHR`n{bhorJc
zvz1p&mWbwFy-cOg)&Zqt4%AP6HT+UA__FTcJ2(b&=O7x&%1w@D-OSA`M$a^o<2s{D
z_Tw_cBjBMWc>F6ZQ5=NygH62=&GYhY5(`Etualx*Q(yRg%S<l{-q+)EWMrCImf>4`
zKtc_`M#F@Z_pFUqw@h%<+E6mQ>+o%AYisWAe(TOKDHzrVj>xoCy-aL;^Ec!90ul25
z^zQja`#CiO$=JBXYR<$+BPWYFZ$<?+u%`kEIj52UW)mh-3NX+~I3~XnOtQXC7@jJW
zhW&|)mYixkS~~H4oQVIGp=O_S?AN_)#_|dWt1zZ0Gex~~UT|}3E#UdF7=C$&T3KEO
zz44BjTz1d~?1iv(nxq5;`R#7pRx;;jWNW4o{d1bVYwB}zcUd*s1`N4#q;f>bU80^6
z`(APNkJl!{A9Q?QK93bYCJxAjHzj_=iclM>1Y^n=$<=-TFO@nh=dT=kSj@P-86z7M
zs@M;)9nQ9Rsi^y(q>yRfXk2I8g60CJrVpC4aDLIz;67L{e#C)vasz>y`1(h(an4zi
zYG>q|@Vq(IpF8tY8pPAzb9(sg-P6;>ueT5wf$Ve-6ljsq@W9*qZg+m;L2sv4^3~bJ
zg=9#;jJHejD+XRPfDI{$yce4V@9XD>`e)Y{7iWLk7wQC5olfIEJ&is8mLWFt6O}w)
zsc_4{-yJI0&iNDlU!v<8vG1>po6&1IhBQ5oTNUn~T$&6c)a`oN%sd)K&USSZEK%Sq
zNza1@Iz&jFbo4+8YXTT}g8a68*Zei<qi!3{&VY4OSJ&l5w`Vv?B7BSHeVCN8*Ehhp
z7-K<RUU$gPuAq7%y>=qh#dcr#yf}7~ERfM6Qsqii1rH1^9eeBlvC*HNENFHMarUa>
z=(KG+>^%SZ{`nTp(TD74@?!T`>=D%sE0H9Gnz`w%MLA$IfhkBgK7lbxaAMF2qN4gC
zBPUx;Zd6gTjVq_m;j1r`zUs_e(~1VoJ9Vd;dgTmPL=QZ6qqf5C>qWK$;M=DOO#nPz
zscg-1XVx#R;TLDIOZrZ2mGd^?K95f~H;$&+DgaqXQVA`dSCa|}6*eICGc=Na#q+^R
zhM0!}V_mbSTIWYFTw+68a#?@EtoR$*M|3Ef{lCB>06wrJQy$I6=@1i=DkUyK5D&zY
zOUnzXxqbNgDQ^rjnRm1?zyUh>l~Yq6lCUodjI#3A25@_(+w}P(E;dChpP$wd4^7*r
zV!Y@uZX*DI6c3Dt9@sW=;4{<H^wk?LGL;DBx%Chd?)f7=AMj(%l#iE{n+<dYDj$kS
zzg-*88aW#uck#TR^Qy`#d>XLsTkmq~7e<*YR~FrB$|VEQvl>I>BT1CI@B!#wf#6x7
zuJl&#+ON%m+}zN^d3;tn$*{qFmYM4T>wgARGDY1#U(Pr?3nK=LR;@d4cD9JEo}ap9
z!rcBtkl18d;EBV~MkAOaph13N$KzSGFQ(#qR905#w&4C8+Hnb^x7}&zsVU<QX(eh5
zpJg>0G^CJw^Ve490Z$y4^TS{B*E2F6k;o^lqu+UAmh{+`A5jucy?@hn38BinNimNH
z7!l-Aj1(dV&4X1$N}3IS=`DjjFBeZ@1wN7BMs9qwhDH!#V^FlGGkIC;{a5!37e`QI
zp{)(av+s5!U*=A(Z~Ijs(GNp$ycZ<1QQ(uMrAqEMA;Ng2VSS;fEo5Obmz&xTv2PTl
zy5!Y5l%Pl|LH%Ev^%_<ozL#Aq*+tLue`1~TI5^~d<W7gJ9(K;-5KpC&2{<f5fX823
zJd*DJ*WNY0RoaK!ottWE*Tl&-Cfl|>*|ytxYO*=mwvB0W(`4*y+c^6@*LD7j^L%_h
zKKNbtTKB?yiOtn3Td*LBE+>*ok|eB%=BA>O@Q?`AK}f{VQNoTRy3G86XwY@{!v<*o
zsZy@764u5KBtCcX5c4hPpgr%M!lbC4?q`v8M}5zI;bOpLAy?0aLoPQXJOz#|0UahR
zK$W-4>uLGsAcrhi^X2e4#;{2-7AiCu1D!+AMw~<xDDt^TM`BJpv-5R61t-Aw>PhQ>
zi65-5eQE1nEFcamq?=xb00ytNwlc!DFf>WhtXkXpYiDM(tI58|J^{w;qlZUh)Kp-}
zFi9vxhE!<EGz)BIiJ)~EK$pXwH3t6H#_#MddtC4#BB|!GDv5JV2O3_M6YkMNNjSgn
z7xp_Zy6&FQdRDE8zo2vffD-`}kBx~dKN-6`T_elM(c6t@XW!{@2~9W15Ajd|soh{n
zfNm>Q>HJmGiUxk}cfTE(_&-uIkkgKDTtOH?|HP33F-b8P!rq4aryVvr!VFB{ZU)>s
zkFL)9W8&7^pSDgi8+;UAoCg!3js6ryNQXJmcc;*a1UV0*MU)M6SV{on<2QUBCTson
zPLl3)pc$gNgm3}Em|-fIF@)3H1?1>}<dUV;)u+pY3;z$_0B09JZ4H{W2ky9iMAbkR
z*&2Oskb}ca^73%u%fkiO#1>uBFFJ};Jdh+Xlp>JRhEp@=yVv=NoZ;ixX&8M>7#v}E
z8K&kdF>6HLb&;QYd#|12`>AEF8L-fBc122E>Q8pn;=$I{LUk_q_0rcjPB1%1)+Pp4
z!%U=*3J|r4*r<{%p&!W}X%m6uFD_yPZ<O##ebN0=z43GsRO7x%4LE!OUBfOT6}o8?
zxC2_i4gt3_2pexxy~`{50ly}9mil?+NSUP#9tUtrsVu5!FTkBW_3uvd^?*RO;j2%8
zf`q;-UXF*;MI1vf`}b?PFXQ99KNI3dz8%(d1p@MZ_poY#%txgcgwB`s&^!l<bW(?J
zpe;rk=X7EE%o^6;yI+VuF7Kr_2wNPL<~fcim`AX~XpuO>7-Mjw>_oK1fuXPw+Wv3N
zi$pcGK`i+73?c8M|1FbaYCjw@@X2iEPGrlec?i7*#(cWp@1})b);-_1@2l|_QsXEO
zJ!D}cQ1U_!kLS~<GLs|{Hrl;S9X+FdV_3s}Ep0}@4u$#|k)F7}jHB3ly||z2YyN!N
z?qwosjV2OL2WMeK0tJP(>6iF6c_3PQ%8<j$hKo|;|Lm<P3S5vi#g7?vTbgdnul*TA
zDc%%z)*8#{AozItxq8g(IG8r9y1s-R0(ZO<O3f2eymj}zGt4D&DvO`W1722p8=FCY
zZ62}>&Ir%TNV;5}kYy6BRGEMSU;0))S#cB8R10{$`EI;D7NQY^$P^Y8scINg>^;pi
zYUSi+WQ;cUzxi@`KC~|DDm;%`(HV&de<Ab!tF7C1-JHS<GClv7^8ES>XE@~#`QA1e
z6pb;QAVBdcL<r<OhJOyD2c4di$uGFJv9!hoBvH1OtERy(A<=wN|60jTipc7kQ4)<~
z@O(0+lzcB^UCjTlsQEzJ038TysXA79Cx&R-dM|(1TDIF&+3SuQO<HmZg7(G@1-ktd
zXKI5j9+J)58@un$`5b%S7UKT7ZK8<Nl}1a4BGQz-JsyoSGfYjTNPr&BC%dy1fR*e}
zP`s&YDJ((ae^n2s4YZ#ITCoiuV}82g42)8F4@nD0=DC<blaat00c^M*J#(|u56Ep@
zIa@|%i?HExboBz9{8*I@Mxt|w8z8&}p;PUm2wZHaR7L#tZh2)|?==D@g$S<o#sl>9
zjlU3z8}QlqFgyt75rkXT{<MsIFfHW&bPRc<*;(HOd3lz>%cfZ$yWO6k2hR^l0c&0&
zOjzq8*$F=vzsH%Ei{AHV&p1?1JpC{LZfGEELIfsV@td5IkdRO>jmbH<v$?x_&rTeG
z$U(x22>m4xuE9WG&wqbTF2H>&LyKzq*L5N=f}k8;8u1iqK9H%0w4kd4ky&w16*VJ<
zHd@lG<zOo3+&%7GNFN_HL4Beqv5gelr#n^^K+{v(RIB~F_v+#m>~#d^ERIk&>my7l
z42>9C^hvs0*L81ecqVTn<5yKL1VabhWNkzaJ|hTy3?(ls3Hp3EzQqJ=z@SMwEoVc3
z^xNx=t<dATClP<!iD>VOC$@--Prmr&np&EcQmzFj+Qo*!hL?0G$|1oQjddwuW$~Xl
zlLqgTv&;duN6X9$*av+#1aZ)t*T{Pe`jUneWfo;0zSCUlJ^;J%0s@$&0_o}8@5|Z{
zMMgVXMQk1vH{zg3Z7wQ&PidF1UUA}lTF({nt2L<z97YhZJQCNGU4a5%12QgOoaW+u
zfN&iO%Ur)V>3gqIgx(8<&YL>99R2qZW{{b?phdaK(vg#Dg>+wL;tW0@5sNT@MiNaP
ziTOto(E@C(>0biA=zR{3Lb`gLhIk0vUOWGYNdb~d1?5i%JuR2N7cH0t@D=5gphF{T
z&9Q+o&@~Q+e_;YiR%^2tEZ;cm>s!=|lF0zZ<cQjp^V_&W@0UACim}Fa)e=SAGAmNy
z(hCJS-uKOrx%Q<L#(`UE2b(H7HYf29CLBwn&t9=s1N%5qW55!4eI2TPu!-x`(*Sf;
z9B}av5a1c$Y5t^+`8yPmWWvwO=@LTad|cjLe1`YmRFU@-(XANa;1KXU`p33%bN|o^
zIa{rlX<U}n+PO(WrC|es3ey4)Sy9Y>{`ci_phncgz%^Wv@+%w?vPKdX9ZiU`sgrjn
zg?b=ZTGv*TA;wr3Vl7R@u|&J)bX@nQsgN{4ktR{b9%N_ky*>Nb%?dc^9et%G{Zrea
zCIQ_2v+fZZ5i~b2FmybIhs|_dFsrz@_`rMSfbk-+Fx}t>@_@IaYx%pfn6r4|>A2DL
z_WaP(SpR-me}k<>0&&WV2vrH)tlc;h+;yDkwF)wi4fK0qlepny!<orcuDq^62C(OW
zMT=>JzcMi@JQk|Lf9KQM#}Me};>gTNyF)%6Pb@8;fc<o2S_<EWan(8^Ys`(AlnlB3
zZ=Ua}t4#^#-~=dsWn}WZ-w!-#edxCNz>Q!H4B_#T@k9~`$E(jHZ1>#mX)%GjeND~1
z+j)4h_V!p9@6mKmviOoF;br^HGd}yAEo{ASaRQo@d@j1)?!$?@EakUU)5g*e0g&nb
zI=9Eq+{dP6q!B+i;2*IY;$I$Jq60`Z71DOb@_*mWz+%btuUQ#86#_I-(_Bq!q0XK!
z-%4;%;om?szgu&%KHH&<;!q5>n4K;gl_kpG8sn|;_uGbVS@2NLDuwqC&2)ESE&^#T
zMS<3>E8{r133UeD-vK~v;Xvhzm45C73~~35_h;AX?{p1GcHG+E1ss*5>%sSz?}Z8!
zRg^u_v<nR!gP@n)-CgGQSLTlHSUE(3C-@158nV(<EyY}29!9%!aIe2tm(V{01T*D$
zba7hq!O^4f-ul}Ctx~1jn{D1sKy)4eO4zlch+V!6ahVQQFSBcrz7bmc?*kD*iJs2w
zD3c#ZJ~w;wkMH9;Q%~>3+jbww1M%VIN>OEFyr99^#`{k7;Q7x}o_&)gu5vjmzAn~8
zcK1-=NObT>Fc~aLUoiHNC|oG41SW=nS6#;5QCKN97bnrw^wjj^)E-2&Yhij*Hh(^s
zq-|@$QZj+JS<MwNaXQu?8+0&slvKk(mD_V$wcz9HYihcaz=jHd78RaDm4Qw+VD-Kl
zhgg4xCzfwOg+H`8Yyf~@tWD<J`(Dtn;i}_7fk+;Kg-(EWYM3f-4JD{Lr=eA7DD^7V
z)m<O9T6GUI<?vuL?NAR9HyQX%S*CyN_V!-t0!gLZ4-$fPyHfoW#`c%_@-RIPb$3@=
zQFqD4wUoR&N7i)&sg5!V3l?huy12`OuhY}f)T72gschEad;2R&gqei1TcV&>)0c3S
z?sIF(HzLE{W}-iLBD?@>akDZMdEYIz>8^MRnNC-~gDLlK*eZXoP9VBWs0xhR-6tF^
zgV%-A_HmKMDbyC|oib@jz@WncJx)mpKgcN=72Z43qVH4+G*?#M2Sb89me`P21%#=G
z3D8syln!FiNO5PUd=bGsvvX@%kO$(aN5rE&t7DcTfRP^rzZ>*6wz*qc-@L!xzqOx*
z&#t23^Wk5;Yu0rlgj2VG7lfsY$e0uU>A&1=4G!Or*Ydj_tcM>=>1StTwL@Ihe7Nt2
z*>PMRnmt~31G~u^<95<pb8E5(UK>v5=sXJg`nuMf)OHDuRYEk8@>(c0gvIw{eeg6o
z?G2Y}izQPAb1_4)5l{dZb0b(*qgeUJr~A!glx)?r1!eMMme^McSPBtHPmf15$0rge
zI2FP{3&s!)l=zZ=M<yrfywuFo6S{St2;HFSQCZr7v%8lxfdGetDZ6DDbhsfJ?0#t6
zTa+hFI2|C`K!?qQLR|zF;$VCe(d{@wT#HV_)6@Rd)oA0iV6MfWfsg?2S3l6(dN?u2
z$L}9AvX}_w{8w138-n<Pm7!TBp+ffaGrJ4B>ZtMIig#%#e;VYKEZy&ZR~wnV*EalY
z5;+I}vML~e9Wj=hZoG&uJiPXMX70jZw}&pQ0&{FUKgDm<>S)<NG}tPz?IzN2^&{OL
za*k(n=U|<Vm#21wMMa_K-)l1~vIRt^7pMaxCV5S{dpzQI$ZCzQ*&&Ek*b62wKtpbH
zJvQ$_6nt;b0?(p>QC&=qljhO2T@j#y;&d*b=hNx3<#7^Qz+SE2&cqQi<nWg5ojr5+
z4MP_<^ra)dMd&7?Q}T5es<Ez~&hBQJvAgxn?(}p>rXuDd5uO)^3YNY)y+-bBzC5jr
zdD2lQibc*fg`^Tuj9^Ef{c1846r%6W{#kC-9Uc~0@y=}~T&|oA003#}g`wm3{n{=z
zx&=Nihs$3U6$PGm=hi2~`rn(5*xP<V_U+()7PRd|{%f~YReKM2o|A<!B4~12w@@C<
zBf3Zpq+8;TtquS4<+Q0BzBsEADho29>n5d8G8z(-)2S(omq#xLkNuE1K_2S|DAEe9
zYq!5E;L%LA(Or35#jncNy!yV6B+RN%e}ee_>e++6t|p#vN|`|UEp@OxmSDxo$kUx1
zou+|Q1aM95tnKPWz?J&a+EF(P-%V5!>laFKR5NmnK>BH2?1lD(!a^%cQ=g0e*Y|xl
zOKK)w4vR48J|rMOAeDKFopX`X5k)cf1evNF8Izd!f?ptjQ<u-Ktqvwu#_cOz#1Ppt
zTEItK0c15oMuGt!rV*2wE*H;Fd~R3u@mSr;*}^$3=>BbqkC&HMaeSb5o|H?cH3jwg
zi|csY<?f6k4>!*Y2^oB!n3q0T{iehXBy<hrzCGtX{Sc&*FBXEjtfePOzmRU+dNMw<
z@k;n@hEGV*H>xpBs|!=6yH~3bS1Xwq5JF?tvf$D2zVduJ)m;qcV>_F)(1F*d!7wv}
zJGF@=8BiVHYu;<`pAsAx`evMy?MC^wJk;1YnbOu=^Oq8&sVzy3fTTix$by0n)plLH
zy|M)Ww)y+Hoa|3F--UbU81&v713474b(g?Gr=MLeg9GbEW|OjGL|WO}>-hcOQ<Azl
z@J_upUkQIAB9}v)>;sjvm1(a<@Dba(TL9q@7X>0aU|)0R%D<|rRL-Z}{dWXR_IA8s
zk(2kcTt&sV{`$j;S1NHN9*Ak*^ZC7c9-I}0V5_FX9NYjsgc2+-3R~zySrFc|d&FGL
zL}2GgC5zuc*ZP3Q<*3B0a2I=Aa*;`k$qV{R2xC><d|-{Or@~AAKuTt=a(aHM|8hFZ
zPDsLvWC0->s@eD&fpDPGwA54j=`Zvl2A&r)5RuvIZ>_QZtF4vK8cjiLCM+V|-si`=
z8J3Ahv?4|p>btT$R_zVqnAmt8KIR5A5*UZ!FMQdW9d+z+#rEdi`!)@p7p|EvbhcV8
z$=hXw)f<Keojo1St~Pbqff|9>KSRTcE7DxdPgzz{#-9F(zZrPBl(vRXwnK^W;CA6#
zjK>t0DiRH=M&#K(yEf54RR}#v1(Y=ZP$}W}sG(W1$@ROPk%BBls`;lYk`aLt4aR8b
z+uWSPNF?+^mtwF2(hy!uIamJ|zdKY21u<#@PdZQI?W=9$0W-V|g?2MhG;d=Ce-vB;
zsFz?@S4~|GS3`i;Ztf)^hSR~Z@zV>VtINygW}V#xgD!nTuaNV>a9Gww?)tkQsQ_x*
zT*Pj=J2ph~1%-z<M)LxR+cdZHZ|MOwY2~$yCWlTYfzU!W+0%@drSPzLU=jba+HO2R
z1uBm-bGd8l5fBl9JFdK2SDi5kudW!PkDTIh{La^&c6K~UHxzUdm(7JTxCPgI-QH$L
zi|6-GU&|{is|Txx|2>t@BO7%07qXV$gko_)lLb>v|9G1dLn;_Sek~|d^O#{KA~+{N
z>F7|BT6!S%YiVr10o6Ypl_MKgU!4Eye7U+Fl@ycB&G^K~O4`2Q205amD=*I3G4s$X
zt8!>BpN{sW&J4aCHp_Bi>f;~F&8Q2UJtk@%bpuE-wwRkwV?T(|XW2JaR@wqSTH5l%
z>vN#nSr^tO=C)tg)+TPjtBam5QfDCrf~KXV2eWQoUETppyf#cZ8HWBPoSpi)>B34-
z|Jo!hh9r>z$=<w&w_7$R2><{I;D7D=Gf|>gPuLPet7{pA4&_hJuj_+Td9y#|{nj*n
z9~?X!-cQx;rVVuXHRPIbo-?kqWJ4IC0^7_0#$TYlB{gbB6n+2zF4p~ImfkvMd&?GQ
zinbSR0Y$;liRGZJ4+=zTw}v(QFWgE+?6k$nL}}=`$>@zo9(ri!U>-pp7slM3w>H*x
zRUeSCj&1F#pmlR>=1;D2H(jE;Rcr2gmLq0!aMIh$B8ferT@BXn%L!z|d#V!cAd-&Y
z?{JBsjqkv!`5@G!I+ti^F<wH&*E6n<y8uFG!^-l>7LN7Z>lCf)q;B6<p;h`Cf1!Bs
z6YVw`mb35}T^An*51aqy!<OYy3nCQg1?Ul);^fq2U5~eCGU(7|hxg**r~4@t;}lwi
z;NzLU`e?Q>LAmKY&<#K2XrM&i1_NGmg|>d{<3OjDXa_uAPI3h_b#`;m3H3#+3Jcq@
zmue|iM_z(oT5sH}qMH|J7zglN%ilV3<r5D+$38scb0Msvby8Q8Si?FKrbt2XKhcP4
zN-qgMN|doAQh`r!kE9fT6vuF#mThu%T)?eZ86!TpZWuZ*GHaHtu@gT_I6kFi+R5rH
zwb}FKP3it2pri9`|2>3^Sg@1|%hcLlx2Tw-nDKiqH@dY%k7|&r%wdK$@qI^eARNsS
zZf^?){EazYG~FMv%eGmN`n{O2VmQRR*IYg6j!ncB9^?Kwa32TTf5Wjk&KF!W*fuet
zvwwIyuwr!WW^cmE=yN2K=>QfuCa`=t8E5Wkal0GenhOO&1u~Ai#bXEqr3`?$7NX8U
zYvhENkl31Q!#!U;M%AR!+Eht$o8ox)*MaeXy%nhoSfV_5vX}|kgut5lV49+NGHjN&
zM3EtA^2Bh+3ZqD49y2HqDSZD}-&E)<H6(x6z}kF~xdyJkyy#m(3%Lsc43Mq!{uo^!
zV0_fV3lV=>xySw)+uNp$s*5-XQ&VG`xIa8pw);e~^Zxla^izCzb(Lp2s-8UVG?S`6
z{j<~?zR>rV^ADdL!;h#Wy<AsLK)hc(Thze|h(LEsMFATsIsA?5eJ{ZG;MsB;f%&_@
z>_$70Nj?^BKS@OTHa)XnHO+`_i`_CAuK0cdjYargBZ!R|*;Ec4^{-r0?jxwINhwk|
zKhKu%Z*a56``DOEw(pm{zjEVUG!7|#i&04b5QU+?s=STnzLuM=NC`?_Ls)6UfSs5N
z;?oO_>~^KEq<yz*1KR_tsh=Uxda}gLL5v7NU3F$?V73<aOB9bD6>%3pS}f;iJ)fYa
zne#krz{_|@5<rn-7w@57<@=MSF1xvP{Y~p*N4?P7X$kMPQ!7{CVe@^mPEcVChC*24
zP(fbt^upl_z#6s~bGs-xpvlj?+|Y(p=|tH#r<8*Psgq_}8P4=9v%R_+PH=9};{>)U
zt%3%beBAA8v4u-`-ki{5cmOYagd%nb=%UfK_wg!jW2)h{-bz0~QaoZRw-fir%;-#i
ze}8O*v6ME3?s$ZeG-RUCG<ZEju6@6sxK@)KK?+utAF`XslQ`@4J27_r2n;Uc<inZ!
zBIT*R5O%t^`mrDI+!*$ER<ORglaCq%m^Kt_Y;IP|N^i`A3v45qj@wzeS|{=;kVs{G
zEyc;{)Q3k`DeF>3Sef(>A|dTmtKzN4rSDM^$>AtDv7b#5F_z<)<HaKUQstEY8@i6j
zHX_T6efZX=`>wg!pq9MQl7SrRZw}6%Pg&cCPPsA0^`VhL8DT)3P>nflZX5;1lOjRA
zN+m|7i&`P=m(zppYy{4T@{6pkPsBojTURsd{>v}$eoxI_AiQQWXwo^=u7{6zHo@f^
zs*-<XQ8xW7^NTeC7*R^OI^CV_ojp!aaNjQL`ksEzf)dgYY-<@ALG26LG^AA5Bc9=o
z*&E`b##$ueTI6oU4ge#~z~-d);$;g*C+_776d#r{=GOtA15#e<VVuhMccI5WWMoEg
z;!9uE?Cc%7-WKq)vhZuB*b*_25n(1Lt0yL>iU+q=R$y#D$I8Q?>!c@3-4%z?8)oyq
zG$BD#z)s7RSd^w|jyM*<%VN`S(`%sW&hdqUo2TweBncHKjB%6FT|S;yA&yz42#KHQ
z_`jW1c7K=$e6(RBlwwoIqM>pe8T1lMG_w*iQQnOk?=%qSNL1LK(JMskcx{(`e9MA1
zs$7GYuAn064<4i$v2EeQm1YXN^Xb^v^F<m5#ytB5d=SSJ^66z+E`vKg*S%k23~Kp^
zn*0VnKUG#*ZgUIruJQ4%1^mj3PA5b*Fx?v)NYOgEp)b;ZK>k@rO!?&o5_Hs#;cl#<
zBP|@dkUR)e+ikpXzF*x!ycn$enD#LqV6C(urxsdIOx?^s*-cWmc--ya8F1odPS>U!
zH`}eLpT*B>{p6f2j6hkevrnJ%S(H+fPdY|}@#fP9Pv#32w%g9+scb=dT7U9aBPtj<
zI1h%s0eUm)zlYAE>glSaMT1-C3k##8_08BhUZIfM(D+1MRm`WY(S&CBzX{mNqliJ>
zd7J^fIqA;!`vcq0$9O@(PRDC%F&R&1%PD7_xfb}X-AQLGTHsrX)lTD%m!m=@8)gAd
zzYj5uU1I`l37t$(<BZ)IaeUCtm%9|qp0mkcP}9CPS4n~&WaYI7RA0uD6}va@>n^S?
zW!Xv~r7h(ZnW)Jad4af#<*I@8M&dy;sR=5iBv$m5^v=VCYu3fZ4p`5r3GLEH^+_Ut
zmKKQS{?wt=`q}JK)J=w9NQMkiLg%)F(IQHkjK78mDL9h4aMT=Y0k?=(aL9RhgltnP
zrue2~!EQ2}xBX_>>A)jIlrHw=C}_p5IOg+2XAWvq7vx{^t?>2Z&cM-18m+B1;HNe)
z1B97-JtD!mqfp0tTo*J+l+P)@v_6BSM~^7(pVFp3_p!2xi137?sL3k*uE>Aw2o|QT
z2L5%z^PN+QCcHn0)63kk7t<>vLYqT})DfJxquoEq>H%rWywJIP;h@zW<!OdMoDA3c
zM6TpDa60Mb3+Yi*2i+`Y<24c@03hCXr60e$Mn20zvdMkCkDQ#%AD$;J*AJZeQ09$~
zKi^?mZ4lo!wh^&4@>;)Xnx5}9Hm0#4$wkqi&|o7ba~?GmML3JSg!9rwO-Lyvfc^@~
zjOs^bLVWAm(1Dbh6ZGDhR<uZ3$Ng2r@)ErNFzL$lu_MiGp)B9FW@1dzGkUZ?wXzoe
ziBTaliMDRl3zzZ@C1WV;p$$InftF9~pqjUBwX?2dz!6^iMU<zEJ6#oeCnHfq`xyYI
zq8%D9jEgIuX<O}%3)^gUG<K6jPmfT_d}jFKeRY`Bw<<@KWSps}H1tJqD&_jD5hr&?
z*Y3;;NdyQBRlU?jV<K_jMuegK!+#HM<g?-GFNan|48kfO5vyt_T(9=*{7rpwKf0f3
zHY#kIqzMQ4Cka1}S3aRfNz?bA7Be$Gtm6MB&)WBj_l={*MxW7MwQ1%BPtouZ>eQ1&
z&G!)h2!aT_Y+<g;Xy@(<0f=Q~=t>Ns&fPXDE@@a1SxvBjI&<r4I5Htr>B4_GIXQ8L
zId%*=%P+re9-j4-+z;oM*#^&5;`fqPh%Qdg!;+9yFv<fZ-{O8KOu=DTQxG4OYeUn-
z{j(dflTd#BdL6QmpOcwQEn7IynLd}BRaMJr%l7Fpk6ptJeo1AAfDU#Lk%YJJhM9r*
zw29|zThRgOulW300pfx8`k6;#70H~mwt|-?e?02o$b-PRcaAyI{8BXuNh2VSSm8&E
z4l|1R91&?W`Pa2OEliY}ptLG1GAMDR*U?$aZAp7ai~A|+3yN;=asf^L>eh9Ky(dpE
z&E$L@XR)nrG7UqZ928o=l<I&sW>gOudARq?7exP!)DqiAkJ2c$^?~`Yl_<3<Sw?B-
zVi_O+w<1BFV&GdRZx4SVPlA4jPe)?_{h67OvYN)z7XZz8!|YMA#L<Myn(F?q@0g1}
z-E@-8RYs)ShZW#c`FnZrIZNlPWIJr;jhwSrC-ku?*${e!uHQpNq4W47_AQhs4P$KC
zj+B~v?=x~$tY@K6&YgSB?c}a!d9%=tdmbs%WTnxqRiTB0NpJLV5pn5|$m4wyu$GyT
zk8i)&Ybh#~iN|cB#V!0OjN+}J+1_uIrdPLlI$c|4_CTP<&$i1$|5TsJFxgl&Ya>LI
zMDdl}n!<*Ynt%G@fp-{JqNZMXjgUTKXslL&`B8<ixkk|xHV=`mr7yWy^p@Xo;@3}g
zaAHKBvJyau>l^wsGvTi#j};>5dwHL-2K8kaMdl@wb;*P>ZOWd1n-N^-W-`jD!J)98
zY)46supBSoCf_r#6kA#;c22HXwUM}7plvAup^3(dge1TiHnFZ`+E9mo&1Q8ypK31F
z9zL0W`Xyw&4E^hHWMD)zuEaO8qN6^ECRrH3QZoXa4C}XxKO8gcUx~^qilK!8`r4S6
z{Bg;m$`MmdjAX$yBKvkM%j>;M-t46>*+<U{feU;XtfdQb<1Xavv~G$gepn_Zk;<f2
zH4g2<uqZm%U3GwS94q0fQcP-aVN&k<Q?uigUwJ)${+t#3mh)rUjLNb~R(IPQdr4BM
zf%f@n%iU6}{HS&6=kRj2nm^2<q5v{N33M`ZogWcQ&M<E4aIhn2C%o1^&IQsjUd&Bc
zUJ?M77Fcvu4Q)a+Fc}#PIkG2T%>B99LWOA#P(iXkIA`_rW!1ZMatXng#=Io&<VHuL
zIK`qI=9*rI4JokJYIs@!R?7b{1rZ4@adNd9Ex_p|#ZhQAy%q{10`Rr<F|y~8qXQ2h
zpu}9InBCs-DCg;EW}S(uM#k}V7#D}Q?_rPyQJDh2XeWdCPZDA<iMKI%je?JeaHJ$y
zDsQu%+0r)UqMSupw_O!2NPX}+(B!kbZsTB5=1Hw&G**r(NKI+dY<)kkGxyFn7^Xgs
z`(pUaL7nd;{7Z363>pS^k1OIrr?OD**YH*)569x-c{rcI=Bx{QpP0?PULV@>KhS_Y
zFdW~2UA3MV<=5h5^&2}?$I#N;oW&`^sJd^Q;|&bclD@Uc5zEj)#6NUxf!|81BL38u
zV2~Wwac)VuPd^YF_TI{Acd^3nSsygcTz#B7P*~`tmo3(Oj>C!+JyTAG&$x6eqW(IT
zE8RWW1r|At2mfh8Yaz^RRB5v!C2}D_$7fF}@$j~}K0ZC2*Lm-)B?gbw-HHTvY3T<X
z7`sxn-CiHj{DiHapq##GV1Qk-$HdwuhZedVU=gM$zMWW0b}gGy63hG?)#X%loWzX?
zRY3DEC#|%+*<-hh{#gY!zA0D!sO^VtXH;@d6^VwbB!&2yH&RNLYrhJoXhccfOkVb`
z037yOT}K3*aG&s&>KY>d8JZQdy%gE^e8Fq~qh=Dmq$M^P))X?Fh|<AB`9Vi`A60=H
z1RTd#p@-NSw6pjx*Z)j!u1+4@3Z@MV>Q(oP(bLKz-PJkR@CN~j2NJ1iG6V=9%pXNR
z_0_4M#u^G(;IZ2E@`Vx6F`;2#jiV3sRxK@5bJST8n&bh+ss{g*MIthV(c_ZDp{VU-
zD*42dRYhrv0D)C{1wg1hYw|NHPHItfm`(oPlR7D?Plz~$&qc(92jCEsIwkY)P31_?
z@>ltl`JcMvh!)J8iObSYW<gowlgzK{dwi4OS;PcKOt82f4?l9>AB~Mq2W)1M-Ed)z
zaXUI~era(GC!1#+cpD^#9Z7*QhMf0`GM07O2ucQ`^VYDwv2^fBLOmMqT02%nPFXP^
zqO$;w`p|4elJnq)Rq$XdR8=$>#l@>bftVUwp%saV7zK7qG_J%|A%t<@+*wLtsE8(^
zBg!NYdxrZ-OQ&Hnb)Uc{U-h~3Y>q635?TqjL}AK56iyu*{YNme`mCPN#*`xWa9gk8
z`a8s4*L69O0Z9Z_twD#VHATF2Ukrdh-WUi`8@7zB<SNmBL-0Q!$l7!ak|qeKv;d=*
zh+-CTN2DyY*uV!w-zdk2^+k2DsPs_n#mI%Qj0F*DMMV^0(Ke`dOZ?pu7e@bXCbIId
z%*`sLtPG6Mhss!{gMzvi5F!z}4wl?kN`KF}MdcuD;IS%xV<q-!xjec(wriY0EC@tT
zJUT32oI2|0eH)Dh<7p3fjia3t41Kx63!se_MK|_b3_dZl5E<Z({dAYdH*zg%%25z9
zoX$R}UDakBq+%Ev(JXI_S$G|7KBqerOC{HorxLmu&MVV5D~t$;q@&6UM#eG_SF%+_
zlI&KBKx9BMSw8l|UCMXq0T$bIRHSb4^8O{qfQG%5R{Ei4Oth%8cq0Pbl9BH2^13XW
z$4~zA0xo4@m|~V+wD|@d7Gw1E8%_h~`LxWRRXyL(Bg%J?lVfIWtm@w1h^SV@R#i4%
zdGo1ds$0>JTyqhOYudmbqLNW{?1CU79=7{JivHCUh%SQMfEdlx0(0v(9oK{dM33)m
ziUZ@r0)`;^!OSKMQFLWfdQlNiki=G2B4&IirlfSmXn@PvuDEz)g!0mN_HYgj<d~Wa
zMaBz9-#wA44t;|22Vd~*W!b~+EIowDmpOguDfK6urkqV1zZCx55r*!##CWl>WVWAC
zZ0#A9&vwwz)B+^55{?XJd1(CO7T(M`-l*cSO>taD2{E5R%A1EX2-V$Lgh}9)dFMnR
zdwnt}xBLM1L?}hoBFyK^WS@zU$de6C03ERMcV3~wnzF`x@a8_^S`3afBqz;Qyv&`u
zm_tWNhO4YUUlVMcv;Vp|BU72eG{Lnql$C8iCC?>6VFwRE$Pj^QmddBMB)7Bop6k1T
z>t7eXcFVd<3Znzc1*!l<8K5B5MAcrw2ypZ}&%v+yh|RKjVF<QV5N!WwryvSbwk{T{
z7JwUy%U233qPG=QKV&+>gF+NV_h1vwl=wt$<s{ap-EH!#mJ~o5$O7e*f<g)v{Et);
zB4gVLHmDfiKc86#_0CSCp}mAli5cf)+2#mBM0x4y+2z!;pPn*3&^yW*?ONx-UPb;J
zwu%%HvbNR0Xmd4e#2VD86f_r=iDdZUb>lhlU07jRsK9U7A|h}C-vzMJ1Dhn%#Q3*-
ziYhwVe4X^UMi1EvAsybLm>41!1RU;yvC#AGu!zw#+;k4H=&5xPb-3*BZmiDEstRQ*
zMTWJlEv-uTsNvZ?w=X3^{3f(-BU#ywKKY6zrs%e#={0*OiuZgEP!<PS&KPsYGS%4R
z1>fL>lgTU=b_j-WTQtSBJCjU2@My{7$*S)jGieiM(8%!;uSe8`wZ9{(p8*q;g@<(a
zp4|b%&y<D2=i7l&c_Nr?v?O>jnzUNc_#&u43Ro&*bWBWaO>FUcN|l5Pg*nA1Oo<>I
z;0}7evDz@lneU2JHBf{l0y+nieq`?IM+@Ib?1Qg$FCsYy$HuRWTtxrr<cS~rN>LF+
zU%pP*Eq4h1a29-`_*(OInkf7-GV;ftvvj~_jUpc2@*%14OQ_A}mjFmmx=Q>b_n?RQ
z+A&c}WS&vN3>I8pjaJ3+anmX9!2ox9Mz)i;DrSq8qC}%>QjpZ7g}AIV6zOvU@nX!k
zPlJ7I9k|%tAWrG}`N`P07dEzL?)yY;7xMyY$89s9R#_cWc=FZv^0*rVkJ5AfK-XPp
z?$|Z*`VlW0RH=_pCAYtq+?u>F6wt*HIc@P}Hj|B}oRR6~>_(7&Q%?y702Hoi7-K@9
zG|<b{^^W9UsitLf2}Nup!+6xd4SNDfq$&`yp@r7{+=y*fY)roQu{ht(&gDSh{JH^V
z10cpHGgQAy|B_0nY<PO#AZaDIu9BrJU7G5z-)Z)sR3&5SbMr)H18^B%QPoSMSUg`{
zoD&~{Uv9Vzg+NbxXR8~anPz)LMRDU*a{cbk5NSe`S`4)ea!+#H!QwiLPZHl*xmY?=
ziuL-%+?DO^Jt^S7G&$+C8aH>?pazBvbE@qi>i0PRrtZKua;k+w_p6Le)w3At&r4dV
za<V|j4y9`G?*;K?PX{+<WH`ZkN1OZrZO8&SG<MlX&2@(*Hr~8qRX}%9dfwdFqDo6B
zQ0VoDK@-R)mT>F=ZapoB0Rjw);w)kwYOdqOA^%$A^wD&{K?ZnXAG1tQROX}k&LvgD
zDHz|iIyZH(bgGOB{Rf#+>=bC8&1Y1Cup%4Ihqi+~I>8MLltkF5$5UMZ0(`t5`{$sK
zEoZ-OGrd<AnVaM=7y$aH#cO>Ex`pna=EWCy%(`Oy{ITyR?X~qlo-7NimPuHcsV1JI
zlb_mYLklVQ$9FVx%CQ!jT>}eeQh_>0t-&IdCwjHLZE{dER`)i_mZ(8t5#nuK8SVC2
zE%q7S8Eoj^Oj}PxH-X%o1ke%g^45w^Tkn^@ryV?CTJ4SYkKB<eY4b_G4O?k`lGkP|
zE>{UPr!2tTZovwSY@#x`*&Q#^*&1WgjifNJ*Q)2%na9~{G1Cgm_5mBOH1V*bj#xZu
zDt$7M1jrlj>&ip1Eiy@wk#5c0IZqWfzicMMcqQqJNAM7!`c8IC$i@HlNEm5931&z@
z4--w+DI7VUr0(44>hA3%Hd&mqHjod|QjruF&6j(6reh$rppr6R?W_NJr-bz@idD**
zcG6Y%8%XkFl|xy>zR|9|zoj~|xwhzH%}uRQ4wbZ2HI)_=R1wnykN6v74#wb0I)?K(
z{U6VnkU#``PvUpw6h8aaCA3cGU#giDc_%ACQN(_e!%PcY)IU47J~N=h^YfJ!WY@8@
zCTSF74kloN?1uhbq>V$L1ut`9`!Ft-8f@T%tyfkOW8pr}$%knXmnlkLlemY$-S6WA
z0*0Ow=1%|M&zgU@$1qYOR3n1b;Io`}`@)2jdQu#9*-MFMuV>48m5*VP`tnc3NnBk#
z{<7Qx_IZlEsZwjA>VIZrr;FXzT&Rwbat@`>`nAiW*t~pa8K02fRhY%3s9d?eD(+ts
zD79v7#x;>i1GpAKI|kD-Fz)Ca6t_!mY5f*E`RO!%Y$1!~yz69e!o2Xn{Pr!3@Vb4?
zvqH^M^B7W_o4M62)<rOIZ4BR^k;@pswO5<k7Bz9YjiOr`+T9l;hRDp!Jj-s#l$Km%
zor!CD^plEhpJmeZs}!5%ea-4wT=@3y<Povmo(q+l4gVduRJm+bmj^0II>a3tVp%hz
z8rp27Obp+8Cfk#b$ZTeAHBC>BpUu_PKUNi?>stup995S(b51g^hED)60|T0w+24=h
zEvf1G5aqi)j<V9O&TM@be=~7M;u?iQj~jVfLS9R~{VaEhb>{H57*lBB-FXU(bRNm`
zj-_VC#_*V5%%X2~I9ti{Z(plZ*4Pya+f`5ujxu&HS(71Yt9m7BIZ~>gs@uvny@!&}
z)KCcj>?#(-&5WXcRcg<1)V|q&B}%;&YsB7PAQ{`j)W)uBr)O7oYvr}lZgRdkB>kXP
zFcgZ*ZJxyO6i1AYGr!6th{r5$wjSVTwlLt$kGvh5P{7YD+0}4*#A*Y#oEi6`1<|6{
z<S{3&htYm-*vHNM%Q>FDW#ICJwCVbtX_~hu(;`wN0*iz#&!ev|TWo~KcIv$T2ed)3
zDNP^Q^XS#!)z%G~y)fOMq@SBuA>(DG6BCgG$|j)=3gaJtD8_}Rjv56&zg^1o(sAvn
z|68b4!!EdZ0oObt>)lwke^vH$9ZXSyVY#{TI$g<G^X3>VMvf!car-upYr5JZ%d+iG
zQEX<?^J}B@Cfqy&JUU+_{A&!yc?(Y*$Z)`+QrQCtOiFO-Y4`4UakGOrNi6t@j&-T)
zE%C|ekW)o@HeDAN@K>3B<K>9?!r<eM+t7jqZw*|5x4Ij8M;Roxi_61_0Ua(qREZ=z
zuXDBUEN1m1{~|m;`Ui%H91|46Qe&|<MuM17JUs)Oa^K_jZqd!2x1Y~~cY>%Dry-A=
z_<ms6kN%pDc)j0?Z1W;t>OuxVUOnvrN5rgQnMWyAwaK^XFmguUNcJ+cVO2}7NKuSY
z#n-%V9S;tA1qD7{l2tKGOoEdAox8PlSGP4Shb9t$h_I~K;a`$~hc-Wc`YoaT*>V27
zMX2maPl=+IJ^VAn(ZOL7rS141s-<W4)XjLfIsYQSIp%LGJU_N^#maeVc~v_jL0(A)
zq~GX#|0V&So>H%ZRBE{r<(Q%`@7(5xJ29q_!PXedC~5P3>*6>>RP=Ul?UOM^SP-XP
za{X=Jef`ttYSTqw87`RmWGO2BxO8cLf>=*a&jIL=N-Wq~9hn>_!Q6>&r)cv16Uvq^
zn?__9hQp;FMdODhi%a3Qe_Hqw5D{Fs6s+y1C}Elw4n+u@AC8pJ40BeXV82jBXx*Ft
zUQZ4G&h4c+S=^_SAKaAs%%jbxpZTP8q0}4ja6M_wYuKVV+rV0^Doru5r+^<)RKpXI
z5g~HAm8s44@aFWf|2fL4oS6?tXD<Kz-S4@sjKhA_9h{8PVr~Erqiv`p6kYnj^T9gY
zysK398J7~;VSshoJ0pb74DKuX%nG9%*UL>7v*6n6sWJa&a~dlS&hxvUI0{yVX~~n~
z8lw6aVhJ>OB;*mTgUH>lPi`O;-|wllsGV7Yp>?F0nisBEN`h3DHQ(U-yNT-mRnN3c
zzP<T>J3sNkffE<WEO8z!x6T~gvX~qPPrwfUjWGB50Pnp$WMXu&+dX+`n1^^OP!EkK
zx{pfGR|&NSixY_KPxtzHKFq6en~4@9&UqnjlZay41ou_?dU&$6a%|ETpd@@5U}?U8
zIC|~;b3?oVp^exDluAI&e0l@w_nRGf;6Nm4EHKe`HEj3AGa@3Q=bn$lAk@mm5GCth
zOlc5X*8TnE4xdy$am{fC@3L19|2s=h&#8mM37*L?ui+s;q{!Nhz+KZ#K8szXxQEec
zJ1Yw<_x<&D@J(aXx*P&S)&A22OzzAY1dDCm;b~KTB2~u8nrY~W9q)=#An}0th6j_<
z;~)wfx^DLF!6N_)cz0jz7HH~SL(4^}cQnB%=2wY2W?rjln!sil|HU+Z>-NNa=rUpH
aL^a#>AI$x~I0OzR7JK{uZv6iR0Q?UL692pa

diff --git a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
index 662e8887c..7cb75beb1 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/app/MigrationTest.kt
@@ -15,21 +15,17 @@
 
 package de.dreier.mytargets.app
 
-import android.arch.persistence.db.framework.FrameworkSQLiteOpenHelperFactory
+import android.arch.persistence.db.SupportSQLiteDatabase
+import android.arch.persistence.room.Room
 import android.arch.persistence.room.testing.MigrationTestHelper
 import android.content.Context
-import android.database.sqlite.SQLiteDatabase
 import android.support.test.InstrumentationRegistry
-import android.support.test.InstrumentationRegistry.getContext
 import android.support.test.InstrumentationRegistry.getTargetContext
 import android.support.test.filters.SmallTest
 import android.support.test.runner.AndroidJUnit4
 import com.google.common.truth.Truth
-import de.dreier.mytargets.base.db.dao.BowDAO
-import de.dreier.mytargets.base.db.dao.EndDAO
-import de.dreier.mytargets.base.db.dao.RoundDAO
-import de.dreier.mytargets.base.db.dao.TrainingDAO
 import de.dreier.mytargets.base.db.AppDatabase
+import de.dreier.mytargets.base.db.migrations.*
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Dimension.Unit.CENTIMETER
 import de.dreier.mytargets.shared.models.Dimension.Unit.METER
@@ -37,36 +33,30 @@ import de.dreier.mytargets.shared.models.EWeather
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.test.base.InstrumentedTestBase
-import org.junit.*
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
 import org.junit.runner.RunWith
-import java.io.File
-import java.io.FileOutputStream
 import java.io.IOException
-import java.util.*
-import de.dreier.mytargets.base.db.migrations.*
-import android.arch.persistence.room.Room
-
 
 @SmallTest
 @RunWith(AndroidJUnit4::class)
 class MigrationTest : InstrumentedTestBase() {
 
+    companion object {
+        private const val TEST_DB_NAME = "test_db"
+    }
+
+    @JvmField
     @Rule
     val testHelper = MigrationTestHelper(
         InstrumentationRegistry.getInstrumentation(),
         AppDatabase::class.java.canonicalName
     )
 
-    /**
-     * Handle to a database based on schema 16 is updated to the current schema during setUp.
-     */
-    private var upgradedDb: DatabaseWrapper? = null
-
     @Before
     @Throws(IOException::class)
     fun setUp() {
-        ApplicationInstance.initFlowManager(getTargetContext())
-
         // Create artificial image file to ensure the according database entry is not deleted (Migration23)
         getTargetContext()
             .openFileOutput(
@@ -74,72 +64,155 @@ class MigrationTest : InstrumentedTestBase() {
                 Context.MODE_PRIVATE
             )
             .close()
-
-        val tmpDb = getTargetContext().getDatabasePath(
-            DatabaseHelperDelegate
-                .getTempDbFileName(FlowManager.getDatabase(AppDatabase.NAME))
-        )
-
-        val `in` = getContext().assets.open("database.db")
-        val out = FileOutputStream(tmpDb)
-        `in`.copyTo(out)
-        out.flush()
-        `in`.close()
-        out.close()
-
-        helper = FlowManager.getDatabase(AppDatabase.NAME).helper.delegate
-        upgradedDb = FlowManager.getDatabase(AppDatabase.NAME).writableDatabase
-    }
-
-    @After
-    fun cleanup() {
-        FlowManager.reset()
-        FlowManager.destroy()
     }
 
     @Test
-    @Throws(IOException::class)
     fun upgradeShouldKeepData() {
-        val trainings = TrainingDAO.loadTrainings()
-        assertTraining1(trainings[0])
-        assertTraining2(trainings[1])
-
-        val bows = BowDAO.loadBows()
-        Truth.assertThat(BowDAO.loadBowImages(bows[0].id)[0].fileName)
-            .isEqualTo("img175420839671886584-0f61-43a6-bc1e-dbcd8526056c794370927.jpg")
-    }
-
-    private val TEST_DB_NAME = "test_db"
-
-    fun test() {
-        val db = testHelper.createDatabase(TEST_DB_NAME, 2)
-
-        //db.insert("", ...)
-
+        val db = testHelper.createDatabase(TEST_DB_NAME, 16)
+        insertTrainingDataForVersion16(db)
         db.close()
 
         testHelper.runMigrationsAndValidate(
-            TEST_DB_NAME, 3,
-            true, Migration2, Migration3, Migration4,
-            Migration5, Migration6, Migration7,
-            Migration8, Migration9, Migration10,
-            Migration11, Migration12, Migration13,
-            Migration14, Migration15, Migration16,
+            TEST_DB_NAME, 26,
+            true,
             Migration17, Migration18, Migration19,
             Migration20, Migration21, Migration22,
             Migration23, Migration24, Migration25,
             Migration26
         )
 
-        // MigrationTestHelper automatically verifies the schema
-        //changes, but not the data validity
-        // Validate that the data was migrated properly.
-        val dbUser = getMigratedRoomDatabase().userDao().getUser()
-        assertEquals(dbUser.getId(), USER.getId())
-        assertEquals(dbUser.getUserName(), USER.getUserName())
-        // The date was missing in version 2, so it should be null in
-        //version 3
-        assertEquals(dbUser.getDate(), null)
+        val migratedDb = getMigratedRoomDatabase()
+        val trainings = migratedDb.trainingDAO().loadTrainings()
+        assertTraining1(migratedDb, trainings[0])
+        assertTraining2(migratedDb, trainings[1])
+
+        val bowDAO = migratedDb.bowDAO()
+        val bows = bowDAO.loadBows()
+        Truth.assertThat(bowDAO.loadBowImages(bows[0].id)[0].fileName)
+            .isEqualTo("img175420839671886584-0f61-43a6-bc1e-dbcd8526056c794370927.jpg")
+    }
+
+    private fun insertTrainingDataForVersion16(db: SupportSQLiteDatabase) {
+        db.execSQL("INSERT INTO `VISIER` (_id,bow,distance,setting,unit) VALUES (1,1,18,'18.5','m')")
+        db.execSQL("INSERT INTO `VISIER` (_id,bow,distance,setting,unit) VALUES (2,1,50,'50.5','m')")
+        db.execSQL("INSERT INTO `TRAINING` (_id,datum,title,weather,wind_speed,wind_direction,location,standard_round,bow,arrow,arrow_numbering,time) VALUES (1,1480633200000,'Training im Dez',0,3,0,'Neufahrn bei Freising',199,0,0,0,-1)")
+        db.execSQL("INSERT INTO `TRAINING` (_id,datum,title,weather,wind_speed,wind_direction,location,standard_round,bow,arrow,arrow_numbering,time) VALUES (2,1481410800000,'Training',3,3,0,'Neufahrn bei Freising',32,1,1,0,-1)")
+        db.execSQL("INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (199,'Übung',512,1)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (1,1,3,-0.412068963050842,0.0344827584922314,'',NULL,0)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (2,1,2,-0.236206889152527,0.0245498139411211,'',NULL,1)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (3,1,1,-0.120689652860165,0.0275862067937851,'',NULL,2)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (4,1,0,0.00172413792461157,0.00172413792461157,'',NULL,3)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (5,2,-1,0.0258620698004961,1.1275862455368,'',NULL,0)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (6,2,6,0.0327586196362972,0.929310321807861,'',NULL,1)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (7,2,5,0.0501584820449352,0.771118402481079,'',NULL,2)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (8,2,4,0.0327586196362972,0.593103468418121,'',NULL,3)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (9,3,4,0.0,0.0,'',NULL,0)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (10,3,3,0.0,0.0,'',NULL,1)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (11,3,1,0.0,0.0,'',NULL,2)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (12,3,0,0.0,0.0,'',NULL,3)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (13,4,0,0.0206896550953388,0.012068965472281,'',NULL,0)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (14,4,2,0.00172413792461157,0.151724144816399,'',NULL,1)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (15,4,4,0.0103448275476694,0.362931042909622,'',NULL,2)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (16,5,-1,0.968965530395508,1.01896548271179,'',NULL,0)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (17,5,-1,0.953448295593262,-1.08965516090393,'',NULL,1)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (18,5,-1,-0.813793122768402,-1.15689659118652,'',NULL,2)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (19,6,1,-0.072413794696331,0.0586206912994385,'',NULL,0)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (20,6,1,-0.00517241377383471,-0.0741379335522652,'',NULL,1)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (21,6,2,0.136206895112991,-0.0706896558403969,'',NULL,2)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (22,6,3,0.277586221694946,-0.0431034490466118,'',NULL,3)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (23,6,4,0.123950511217117,-0.329122811555862,'',NULL,4)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (24,6,3,-0.0206896550953388,0.265517234802246,'',NULL,5)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (25,7,2,-0.144827589392662,0.00517241377383471,'',NULL,0)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (26,7,2,-0.113793104887009,0.0637931004166603,'',NULL,1)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (27,7,6,0.131034478545189,-0.565517246723175,'',NULL,2)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (28,7,7,0.0448275879025459,-0.658620715141296,'',NULL,3)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (29,7,2,-0.0775862038135529,-0.113793104887009,'',NULL,4)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (30,7,7,-0.0448275879025459,-0.65172415971756,'',NULL,5)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (31,8,2,0.0172413792461157,0.17758621275425,'',NULL,0)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (32,8,6,0.00689655169844627,-0.570689678192139,'',NULL,1)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (33,8,0,-0.0396551713347435,0.00862068962305784,'',NULL,2)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (34,8,7,-0.0603448264300823,-0.656896531581879,'',NULL,3)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (35,8,2,-0.106896549463272,0.0137931033968925,'',NULL,4)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (36,8,7,-0.079310342669487,-0.682758629322052,'',NULL,5)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (37,9,-1,0.782758593559265,1.23275864124298,'',NULL,0)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (38,9,5,0.0827586203813553,-0.496551722288132,'',NULL,1)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (39,9,1,-0.0827586203813553,0.024137930944562,'',NULL,2)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (40,9,5,0.0551724135875702,-0.474137932062149,'',NULL,3)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (41,9,2,-0.0620689652860165,0.0862068980932236,'',NULL,4)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (42,9,2,-0.0655172392725945,0.167241379618645,'',NULL,5)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (43,10,7,-0.155172407627106,-0.606896579265594,'',NULL,0)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (44,10,2,-0.106896549463272,0.0841121301054955,'',NULL,1)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (45,10,5,0.0551724135875702,-0.408620685338974,'',NULL,2)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (46,10,5,0.0344827584922314,-0.489655166864395,'',NULL,3)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (47,10,2,-0.0379310362040997,0.129310339689255,'',NULL,4)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (48,10,5,0.0810344815254211,-0.401724129915237,'',NULL,5)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (49,11,2,-0.0706896558403969,0.172413796186447,'',NULL,0)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (50,11,-1,0.853448271751404,1.17586207389832,'',NULL,1)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (51,11,4,0.136206895112991,-0.336206883192062,'',NULL,2)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (52,11,2,0.0,0.200000002980232,'',NULL,3)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (53,11,4,-0.0206896550953388,0.31379309296608,'',NULL,4)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (54,11,1,-0.0103448275476694,-0.098275862634182,'',NULL,5)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (55,12,0,-0.0103448275476694,0.00862068962305784,'',NULL,0)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (56,12,-1,0.994827568531036,1.10689651966095,'',NULL,1)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (57,12,2,0.0758620724081993,-0.172413796186447,'',NULL,2)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (58,12,3,0.0758620724081993,-0.281034469604492,'',NULL,3)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (59,12,3,0.072413794696331,-0.256896555423737,'',NULL,4)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (60,12,3,0.0706896558403969,-0.28448274731636,'',NULL,5)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (61,13,3,0.0586206912994385,-0.275862067937851,'',NULL,0)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (62,13,1,-0.0620689652860165,0.022413793951273,'',NULL,1)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (63,13,0,0.0155172413215041,-0.0413793101906776,'',NULL,2)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (64,13,1,0.0879310369491577,0.012068965472281,'',NULL,3)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (65,13,1,0.0879310369491577,0.0258620698004961,'',NULL,4)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (66,13,0,0.022413793951273,-0.00517241377383471,'',NULL,5)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (67,14,0,0.022413793951273,-0.00172413792461157,'',NULL,0)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (68,14,0,-0.0172413792461157,-0.0379310362040997,'',NULL,1)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (69,14,1,-0.0258620698004961,-0.0637931004166603,'',NULL,2)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (70,14,1,-0.00689655169844627,-0.0827586203813553,'',NULL,3)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (71,14,1,0.0258620698004961,-0.0517241396009922,'',NULL,4)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (72,14,1,0.0155172413215041,-0.0913793072104454,'',NULL,5)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (73,15,2,-0.0103448275476694,-0.108620688319206,'',NULL,0)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (74,15,2,0.0189655181020498,-0.122413791716099,'',NULL,1)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (75,15,2,0.00172413792461157,-0.134482756257057,'',NULL,2)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (76,15,2,-0.012068965472281,-0.112068966031075,'',NULL,3)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (77,15,1,-0.0413793101906776,-0.0741379335522652,'',NULL,4)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (78,15,3,-0.279310345649719,-0.0655172392725945,'',NULL,5)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (79,16,2,-0.0137931033968925,-0.146551728248596,'',NULL,0)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (80,16,3,-0.25862067937851,-0.151724144816399,'',NULL,1)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (81,16,4,-0.13965517282486,-0.291379302740097,'',NULL,2)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (82,16,2,-0.012068965472281,-0.196551725268364,'',NULL,3)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (83,16,1,-0.0155172413215041,-0.0620689652860165,'',NULL,4)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (84,16,2,0.117241382598877,0.0948275849223137,'',NULL,5)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (85,17,3,0.225862070918083,0.0293103456497192,'',NULL,0)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (86,17,6,-0.155172407627106,-0.568965494632721,'',NULL,1)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (87,17,3,0.246551722288132,-0.053448274731636,'',NULL,2)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (88,17,0,-0.0396551713347435,0.0155172413215041,'',NULL,3)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (89,17,3,-0.201738655567169,-0.0793248638510704,'',NULL,4)")
+        db.execSQL("INSERT INTO `SHOOT` (_id,passe,points,x,y,comment,arrow,arrow_index) VALUES (90,17,2,-0.158620685338974,0.0689655169844627,'',NULL,5)")
+        db.execSQL("INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (457,199,0,50,'m',3,4,1,40,'cm',1)")
+        db.execSQL("INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (458,199,1,20,'m',2,3,0,60,'cm',0)")
+        db.execSQL("INSERT INTO `ROUND` (_id,training,comment,template,target,scoring_style) VALUES (1,1,'',457,1,1)")
+        db.execSQL("INSERT INTO `ROUND` (_id,training,comment,template,target,scoring_style) VALUES (2,1,'Kommentar',458,0,0)")
+        db.execSQL("INSERT INTO `ROUND` (_id,training,comment,template,target,scoring_style) VALUES (3,2,'',49,0,0)")
+        db.execSQL("INSERT INTO `ROUND` (_id,training,comment,template,target,scoring_style) VALUES (4,2,'',50,0,0)")
+        db.execSQL("INSERT INTO `PASSE` (_id,round,image,exact,save_time) VALUES (1,1,NULL,1,1481446121326)")
+        db.execSQL("INSERT INTO `PASSE` (_id,round,image,exact,save_time) VALUES (2,1,NULL,1,1481446162740)")
+        db.execSQL("INSERT INTO `PASSE` (_id,round,image,exact,save_time) VALUES (3,1,NULL,0,1481446187350)")
+        db.execSQL("INSERT INTO `PASSE` (_id,round,image,exact,save_time) VALUES (4,2,NULL,1,1481446353036)")
+        db.execSQL("INSERT INTO `PASSE` (_id,round,image,exact,save_time) VALUES (5,2,NULL,1,1481446372435)")
+        db.execSQL("INSERT INTO `PASSE` (_id,round,image,exact,save_time) VALUES (6,3,NULL,1,1481467230756)")
+        db.execSQL("INSERT INTO `PASSE` (_id,round,image,exact,save_time) VALUES (7,3,NULL,1,1481467234438)")
+        db.execSQL("INSERT INTO `PASSE` (_id,round,image,exact,save_time) VALUES (8,3,NULL,1,1481467237540)")
+        db.execSQL("INSERT INTO `PASSE` (_id,round,image,exact,save_time) VALUES (9,3,NULL,1,1481467241244)")
+        db.execSQL("INSERT INTO `PASSE` (_id,round,image,exact,save_time) VALUES (10,3,NULL,1,1481467242448)")
+        db.execSQL("INSERT INTO `PASSE` (_id,round,image,exact,save_time) VALUES (11,3,NULL,1,1481467248373)")
+        db.execSQL("INSERT INTO `PASSE` (_id,round,image,exact,save_time) VALUES (12,4,NULL,1,1481467262907)")
+        db.execSQL("INSERT INTO `PASSE` (_id,round,image,exact,save_time) VALUES (13,4,NULL,1,1481467264230)")
+        db.execSQL("INSERT INTO `PASSE` (_id,round,image,exact,save_time) VALUES (14,4,NULL,1,1481467265561)")
+        db.execSQL("INSERT INTO `PASSE` (_id,round,image,exact,save_time) VALUES (15,4,NULL,1,1481467266866)")
+        db.execSQL("INSERT INTO `PASSE` (_id,round,image,exact,save_time) VALUES (16,4,NULL,1,1481467268308)")
+        db.execSQL("INSERT INTO `PASSE` (_id,round,image,exact,save_time) VALUES (17,4,NULL,1,1481467270994)")
+        db.execSQL("INSERT INTO `BOW` (_id,name,brand,type,size,height,tiller,limbs,sight,draw_weight,stabilizer,clicker,description,thumbnail,image) VALUES (1,'Name','Brand',0,'Size','Brace height','Tiller','Limbs','Sight','30','Stabilizer','Clicker','Description',X'89504e470d0a1a0a0000000d49484452000000600000006008020000006dfae06f0000000373424954080808dbe14fe00000200049444154789c8cbc598c66477626769688bbfdfb927b5666d64e1659c5e2ce6eb2d552b7466ab520b5dcd208a319c31a0b5e001b861f0ccf9b0d03066c3ff8cd860d78e03164790c79e4999104a9d5fbce6677b3b915d92cd6be6556e59e7ffeeb5d22cef1c3cdcc4ab225cf04127f5edc1bf7deb827cefa9d13817ff0d20a0088080020290038e70000c57be5026d1057398c8cb1044c68d88a31060088489945840e1b0020627950fe02000396eda8437915918fba110111a92a1119c5c7f73297fdcb9e474f467c7cde1b2a9f0f007c781200c8fb4fdc583e4d198e86611e770700c1c78d01405501c01c3d050014fc5177442440125fa4236032cc4aa8245e04458848e1dfd00e28a270fc23cbb7fe5bb6b2331eff6c22113924350200aa2220e8c1273eee797488eac531b382002078293f0f00e470260000f1f1c054e5e8ed7c79a98388aa2a72fcf9c064001455519c220321180642241455620642556066553d18ebe1fde541f9023ac63e1fff7838e2a9a3f796b372bc5b39b6a30796c70a02a000aae59f0a808296c7077d5005401141558c61c492264aa8088a07447dcc3300c7270345a47c9429ff1d8c95140044849941cacff3089ae5191281614140324424a044888a8858d2a81c5629aadefb23a2281c3cf3e8f587bfe0bd3fe8a39f24eb71aef9c586a8655f00204500402839e288d2002a8747a0ea0f880f80e5f3cbfe408f2792e0689cc7a7d3102a20a80ad3e12b814140551011d98a48e2c5a563b4a42802880ca2e0158858559999999df75e041115808e699c431228117d9c40254b0b008a3c963e2aa7ff18d7949798545541413c00878ff5941600507e3c801e498390093c20a0b3645409b19c078f8f090ac7de02c738f7e8ed70a4838eb7a34f3aa2a892aa6a914e22e6f2f8a895fc02005c6a07e64f3ced38effce2f9e39afbe33c729cf90fbe45154a862545f087720d0400a4040080a4252d001c826320804fcaf6dfd6f23c0fc3b0343e9f188ff9f8e0b0b44ae5ef21ef917a2122f15eb34c4d5c92464400b0340d22025e10114098d9ab7aef0f44ef98ec1cb1c3d1c38fcfd5c7f90b4b8e3b127f663e225c71ccfc1860449492d688002aaa4454f750a03a0622a26396e188eeaa8a585ed4300c8d098e49d6e34935c7877bbc1dd74d02c20004504c2610568f1e74c44400800a2a0280805aceda01098e93ffff57b31cf67f7c474923630c33833ca67234cccb59f4dedbe2e063d2340d0a2dcf1745b1e7b3cad2ac69578999443e368843ea23f2e1012298a3311c499b8818445685d2f283000122288002201c2addc0436a519959709c8f8c4d4843508f188092083133184f61683948948b980c2023456c0b44154127a480a288e89c53a741a100501485f7450d08018a718a00cc6c8126c39113091d10e07892e6933447ac4431891659ce04b55a2dcb32ef7d4614c61120667996b28de2381327a0413a323333505af78ff95c8f7f994b978708d9e163a55e0a968808a0512fc6989210f0b7e90211110a673a8b26a92a3139311c11b11aa4512e2216590bc51c7163e4d26d0c3948b5c8f2b42806ded783643299a8170008ac0dc370341c22621e586b6d9aa6aa0a7188d6e4deb131491c9b2401200aacaf071858668a99426b38b0c864107d12691cc7cc440495d086015b9ba8d8302022b24654fdfffd35655622c5030df58b04423ce027f102fcb1af7eaca4095c69e04a062a29725c161051d222ff683b9fec62400e5ce48b882dda20736315718a01b1546b59c42e6083c6762aaa4a846118481855c3c07b4fc6f8c49a28aa3a1745910bd818532322225b0d0befc9b0472000648e2d03210b785025742a150a3da82014e22d5907204461185a6445c841c99891775caa15ef27fbfb359d414440247c6c408f1a11955f7de037e163310700e79cf75e550d0182e881cd4538a2ae1c93dbc0408a527df2949e6d478fb636de7ba7a69a0e3486223281145e9044d3e9dff8b5fde956258f848ad2b114d0008c5725468f102a7911c35ca882a1e250d164e28d0dc4890172064921f4044e0b83065933171beb4493202485bddd9dede1da7038ecf7fb7373734f3e7331f78e09410b0b9600a95010ea17053303912294feda7102fd1d6af0a0f9c3a6aaa6a445790ff1a15d3fe61720e238e0769617a156676774ae73f2c4f4e6eb3fa5fbabc8186a31d22229a2c2ef4edeb951fddc4b3db737daed6759c6cc5353535c6d10918a32222018639c734484fed00888b001ef0b62cac11b0d9839f305a292044aa8c67866d5ac529b49c22a5174e5eafb7bfb3b6bf71f90e7cacc661cc75996351a8d0034b2e19025cc1d9131619831b322c2810524a2a39042b5f43605400001bd966701c0ab7af15e3c00f0f34bedc736151fdb5d3c644b0040023b218d926865d6a389a34abdd39146add8dab5ce2961e1b401ec73d926776b6b63fdd1e66038f2a233b3736c6ce9bc940e7a3919c79d46638c887becf8912122ef05d4208231e6c0516448a2bae58009bb9dd97cdccf26a34ea7d14bb37ebf3f1a8db6b7b7c7a3f1643044cb7e30f1efdd689f5f7615cb087c18dc7e827b3ee1e100aaaa78ef9c88f70e40bd771f73148ffb0847675495405d88769c8238425b18c4994e63ba458391bf7ed3aa5343795ef0fad6e043d86986cb679fe876bbed76bb2444c9954751db91935912c57b4f7ce0e98808a23ae7561f3c620a67e69a47a43cf4bc200cc35ab59af747d3b566a35a6bacac88489aa63b3b3b5be9ce83dea0b2d56889395daf1f397ee57b8f3bc0c71ce803675dc4a9ea81680196c70722f66f6c4c9883c3fe10c48706bc3a364651a69fb9b07eeb5e907ac3340e7166a2b5dcbd74f953c9ec7c1cc707e1851e78cc25ef94033d7247e1d00384c31850c5138608d63b2c2f317339d623c7fdbd2b3f852cafda24895b4b4b4b799e8f46a3c5c5c5edddddc1d68e8da3f4de46bfdf6f382742a852c66b87b3fe38522fb9f6c0f3405f2a665f32cf11813c01001095c11f95313220e371da0ba9d56238f6c3823b005a7a5e9435dbf1672e17df7c7d004504c136e8f4d28a5bec624076b467aded335b62e42874d88fb340a23206f3aa28c6fbdc5a43c4a285b104a040e2914ca1cb4b7339172406a490bc20096c18a02009ecec6e0f1edc927c54d820f343cbc6c626b4415114f3d33345abed55d847d94f3f7c34daeb8f1da35a14634c49146bf448cc158a237967551171ce69890e30290219fe040749496080031d8d54c209824c86d10f86d06910211138e7eeacded9bb7777a1560dfaa35d28424b5597db875ba36fbfbdbdb70dedeaece5a72b4f3e35889c034c26ec232ca725cbb20fafde9d9a6e2e2c7691f25022c91d2220aa276f39aada6a7fb06b0314e77b7b7b9692d65cbb84bed234cdf6d7f2410f8cc585163239e7bc8a224c7ca62004908f4764824e236a468e511084884a19277025458808313992740752bae644244e8050099d7873248d44a420c4070a080f21081105460a8d213569eea530c68c27e3f5f5f5d57b775bdde9686ed1fdf0bd4a91a187c98dbbc3eb37bc2fac14bc317ef88d1f50365979f1d2b89f9a76070ecd2533773a9d7abd4244aade59efbd007a22f2bddee668afa84f194008208aa26866c6e747c811327314256ebceb343726502f209a8e270f1e3cd8dc585355af525b1f3dd1a8c41552728a400488aa5aa82a13a90a1121caa18253443484de83471071cce4d42320a1fc2207c1c7e3270010016532864986634320e26edfbed9ebf5da956a7366be3adb4d3f5c1dae3ff4e4a0189bdcc5421ad2c8c208447ef453be71a3b97022fee55733088d31defb20084e2cd582d088f83475930777c6e32180787132dc5f7ef2398a80140a544445024f600fcd2b11458d9383495aa956319a8fc86cedec5d79f75d440c06a98d23db6cd420b1b8274609493514f207ee8f2a209588a1310648e0d0316650042044404120005144d08f1388c000806889a81e697866e795dc10b2c6e60e7879746f6db0d58f1acd7abb35b7bc107b2d9e7fcafec55a1651b5f059880c9821b1b15064c4dc1e657ce7768e45f0992fa866b935f366c6b2f5de7bc9d261bab7b6559bee4c2f2d68642db088e4799a898857431df0dbc5a4089386a047361132077666ee4c2645688b4ee7445c99e9b46727bb1bbbbbbb9b9b9b924b9fb1b9d09ac63c3336904c80b1d419088f514c5411b1d61ec4abe289a8280a551552504050a6bf0d0ffa5b9b2740c4c15e6ff5daf587ab8f6c9c3c7de6ec74ab9b6a21acadb3a78ae79fe8be7d23ab20a1172460cebd33c6246af7d1372d47b7ee8e97aeeb93cb535bb01fee7ff8fecf3832d5667d6e69fef42bcfa92a051611bd085b93840111490154ac1b7cbb960c27d9a709a7734c27e487f9588bd483529804b913c335097ffed537c72633f38db1d12077c49608898880ca58e213d90444b4c6964e5629b925108a8825c54abb697e11e2c48f037a079a88200c2ca47ae7da0d9b542a954a3d8c5bd5b6104efcb8d7dbeb7cf6a5fd47fb92ee4b364c5181c0ab38a75114ef19187b3d6513dbdb5bbdee1edce8574e2f3d71f1099b0462c093786355151541810d0322107a1543a1b16a49c83963ec5e7f5f87f960b8b33f1991160b4ba7664f9cf4eac8e147efbf37353bbdb7b35a1485320380b596e8c0e07c02cc8443a7ec08eb2022f0eee8923f442601809f5be97ce2e623323d26906ace106614f9b071e91c479117dd79b4351eb956bd510993e17effed6b57ec5c2b78b0ce311700a32c3551646cd099ebd6964f69abd30f83c95e1f323cfd6b9f6a751288aa65468601d18125a3808a585a072c2d25a822668e459f2c6c8d6c1d45fda4ff6867234e2a2fbdf21a27cda451c1c2ef0df7f96ce7cadaaa096312ca05ba816dd4c0331b50c043d0e73112844407870722077ac40d7a8c1a06a8c43d40400c05a5c652d54355ad00e0889342d240b8d7ef8649f3e9d3ba3bc07a35dd1cdc5f7bb4b030bfbdfba0df1fec0cfcfcd9a5538fd62ae4d7596a0eecd26ced95cf6b27e2c9fefd2b5744e5e2cbaf7a898cc972c990d989a0e19002012fac006231121104525535445c67be800801626c125714192521552f5f7e7173b34f363dd99dcfbd0f6bcd3c95997a7d628153a7eaadfadc5092d3c4b2513e36eff83897a79e90141455f0d07125222300004c0c00fccc528b88451400991ee770ca7688f221a92a92f673d39de2f94e23aca3096b8d6a98248fb61edeb8f3511c1824926a0436a8ee8d935a5b92cad2b39777171a37df7de7da777ee8f7062f7ff1f75a8b273d1aaf445428081202027a6262050f48a47804cb227905610544b6545d7fb4e5bd4f924a52a94dcdcc80914a2de8b4bbc8d0ec346bcdda48276e302ebc732a27c3386888555656502d534088a020c484084848a00759293c78e9915b74c471fcec72071410090f4fc2e348f7501f011180430c728aea4db3321f8855b47194586bb27cd2df1facaead56c2a43a3b1d365a34e8576bed6d02217be5fb3fce367b8d4e9b1ab5f58dc1cfdfbd12089e5b583654d5dc904615dbb44ce2bd2219e2a33c9aaa5a43068ca538096a5018efd3479b6b64cc60d0b7910d2243962793f1feb0b73fecf5fa7b836c7cf2c45232d5ae3d1cb4ac52430859b1cc41a1aa10138094c7221e7c86a888ca048a0220220e49911450008418ccbf1dec0f8a804842e20663ebd598a051eb04142ab8c642bd5b99aab7a664b737e98f25083ec2bcb5bd954661b03548badde9cb4f7617e6ea1a7828b470f7ef3ef8d6ebdfa03cad35ea411cd51b0d0dea956a6c0c892ae0634313db9a35916478efd6a3a218cd2ed4bbd3b57a23a9378d57cf411590539f95334a4c06b0884c50a985b776070bd85aaea90a8277e20f271e9ccb8d89caa83d404451f18e0185e048f4f0307744447c79a505a80aa2a0a5862c3515c0c19f2a2091071f79f56991ed671ba9b3616d7f73ebfd2b6fdeb8f6e1c6a3354bb83c752220bcf5c1cf6f5dbdda9c9a9b7bf69995179f2b663b773736efdebe3fd8e9239b9999658aa24aa7dd3e31556bd5835a82a1896a4990c45e7d9ea78135603d0022d85adc94dc5dfdf9cf99818cb771b8dfebab8366b5d1a8778c0980158c823c76209d2b388c5961fccecfabb3b1695740520742be6010524f20c4440884002a640d9548ae61025451044040632d1c26f5ffadfca032ec285494291aca5befbe7dede6876c802568b55adb6bf77ffcbd6f3be74cc0ade9d6fca9130b4f9c3d71f60c9249ea8df6afb41e3d7ab4b1b171f7c1bd538b679b9d8eaaef0ff78bca8182cbf39ccab9e2088055bc02b2e1ededcd61ba3fbb329be739325e7fff7d6bb9d16ec856869bd1e2f2020823a8a80380d241374100a2a81a105b4be21d8a10a12000828858620214e79939301614c4792025832252b20c22a2021f19be3ffccc29223a48fe958ed5318cf1e058c943414032d0ea244a7ee3d334d5040b568252aba569eaf647955ae240af7cf07e217ee5e4e9c5a565268b202515fafdfefafdcda9cef4934f3e6589d77af78320283d34f592a6f97e6f9824f5463732c420b8b5bed19de97aef27930911b5e27852a495662dae44e00355dc5adf1c0f472be716f1307d468480c6e4c5defff2ff362e84bc5267ef840ca82b3fc4185302812577c02162c7cc0a50a2a0cc8c87d90ae64f46f37f7b230587e045c0304d26be3f093ab32a2524a2e23589ebe324560e42c5d3e72e5e79e3071bf8a05aad37a6a60c0800d8d04ccd741bdde6687ff2f5effe4d6c2bfb69ef95575e0902ab80cce8bd0018ef008111990dcc2fccce77174bf73fcff377dff95967b65b384d6c280024048253ed190028833b111150026024cd8a28ae7a505005517b107833291ee47a98cbf8be3c0600a1c738279795104c887800da973515c771ace34d10481800c4cac44f68bf2f548038810338555513602d1c124d755bb32b27363636d6eeddee366b1a1082c95251816a12c6adb07af9e2c6c6c6fe6a2fcb2761c4882a60aacd4ab55941c4804955901810c33016cf69d65fbd7f3fefed6ff962213945180064883abf38ab5e3da0b128ea0019c0832b86ec5a51c4f588d4aac1400e6a610ea0db92142004206400f1c0d41f2b472204ef7d9aa6bd5ecffc5db9f3bfab0595d88e8bc30ca488686907cb09296573e5f499bdfea0d66ca5850b6d88c40f1faeeeef0f5e7cee92884451b4b4b4b4b8bc72544c620c1d9f9ea3f8c87b8fc0b56a3d8e6adefb90d95aebbd670c11289b64d5a4b6d3ef55ab0922034a09f938957eaf17631b899408f0007cd6d23621c1e11f7ebc1dd1811088c85a1b86a139cc0a1d20c747ecf309ecf648ce3372c166cf9405023e1f8d46a58e301c4c4d4d95c05dadde7cf6b917acb561141131009c3a75b284caca989099891850547da90189a8c4e70d50d94144441c53d0eb0d6fddbc5fde5ea954d234751377ffee834eb363a62d2b4f86935aad028ae09011d54f2c135b53949537a0a503ac0054f208a2021e543a1c461ef0b178ebe0dbe3383647c43b6af80bb9c3034d54226f04ba3f76ce39e76edeb8361e8f1131cf73c31111cdcece8a8802d5ea4d5565630e4c032b12a1a2aa1a63922451e2f16458c6898807a98be32f32c6202202ab10822d2f1963c6e9b8d9aa549233bd9ddeeadaedc026f57afda73f793d08eca5675e606350d55a5b78e79955bc412264623a6a072e3233a094628587c9a0033e3a24908898fe70743426d44fe6540f2002790ca159d202f2d1b507abc560d0dff5decfce2e34eaad4aa7d96a769c2253181a12114004f1219157413002ea59d96b33aa5783ba170a0c4dfc28d3d4800551c36506dda87a050f2882211bdf9a0ae64fd41ede8d8c318c28ce150a1498b89e7c70f583a5c5459c14cba74e54abd5713ec0b8627be3a11f07ead8793644f83859f0b1f01dc090926a6e4c2096b910b000c0e85845401da2329b5151e2fb0a0001f1716944402cebb7b83822a214c469bab57aaf1f5312c7274e2c753bb3cc8c16d1bb20880d923a203c880fbd1334acea8d35bec899121bb51c1aa34512d78bb188b085308ee2300c8928d00049bd2ff23c9d4c7a85217145e12771adcac60080b88342ca6ab57af1e2c52008c2302cef0562f14e9d6f753b5016ba1118633e516172d4320ac3424d5a640d8e35aa363adefb62dc77e8418b001d82375bbdd11169498f60da03563fd03e7c907541442be15988bb4932757ea55eaf8761481820927aa925b585b945069e64190038e710719c8e5297028048ce6c234ed8ebcee6dd7b37aed516e72a8df654ad1d861100b0320a121a54656302132abadc65e334cdd5cfaf2cd55b4d0108c3d039175a3b1e8f6bb59a0d830385054a881629cd8ac168d8a0261cc3b67e51192362a5e09d9f5e1dbd7d6be5777f153efd5a7d611911d1a532decc46837cb0e7d2b17168a98c54a1d4fa1f23101e401f01d201c2e60043a67a35e16e1700107877776f7e7efeecf2856a5c61342ef7a3e13a221a0c0683812f4be75000354b0b23d9bb3ffdde9537bf2161fc6b4ffc8366b39a98a8280a00600036c6a34704c3040846631bc75152ef0fc6713d9c64e9a8b7d7e974fa9371604c9ee78d5abdcc3d586b55d58386c40490d46bf4b8ecea6310fbf1605d4c3eb8ffd07cb00d2fe6535f3ae1bc25228b088d33711daa3304a27cb65d4bacad469c04a88aa88aaa04c04ed00b3a8f5e72f1eabc160e7267c935533671129f5d5402f1f9d6eaa3f3279f9ae9ce008207f524be706118064158a9548c09b2d15e1a48a861beb67ae5bb5fd95ebdd5985b988c874fbcf86a279cd20204bd31a68c809008910004918499910d984a528b6a9587f7d66bb5aac342f2bc6ec25d2eaa43bfbdf6a0d16d16e0507d094aeac38de2ee037b2250046283c4688c0562546040030680093c696ecceccc3377efdf952b777a576f4ef636aab32d4d920c3129a41f092b985a2d210655752e0f18e510f58063351ea24a0048680c138b334899432760c810cdcfcf0efabb0067e1a0e241e26a5496d11262c846090de06463e3adef7d3fc8333f1e3ddadc0ce36a98e536f159001147e5f43ae73efaf9cdb9b999e9e92e00580160f004711ce7db7be279b1b370f7ad37269b77d33c306fdeb8b6583ff7efff7d0fa8801ec12a7a95d417f52411b641a1cc501888050a0b40c6001537c6abd76e4df607611c3df1c52f0c9717b71eae3b34f3c69cbaba73eb5bff73eb979eea9c58bc6378e6b54fa98061e355d17ba78a8452aae923c041044524560655283c8867d501b878a7d7105065eff387abf734f370f16505b7bbb795e613622d8aa28cef0a10626ba4f8f98f7eb477f77e109a7ab3736ae19ccf8bfff39ffef1ef7ef90f162e9d2debd74bd19e9f9f6fb7cb94bc32a02324053f4e27bb9b274e9ce8fdfc1afdc5f74e5e5bdbb4daaf2767ff8bdfe3380651521042546166ca3dee0ce5ed9e3d3def63465400113038766f7fed87c3b736eb1c5683e8d1ceadcaeca51d5ec3dd014489ffd90793175edcbf7bb77afdda9585d6cbfffd7f9d09a2a851707a58e972105ca9a082d7a38043242f4095f4002fce50ac079fe5602d2958d6d1b0d7dbdffae0c3776c4c492d02b278084128212819857c6b27361a349acffeca17843ab73e78f3f9172fcecf2dab98a3746e1886dd2822022487880ed923b0c0c38f6ebdf73ffdaf2b7ff8fbad50827cef9a7577ad9cfccfbe8c8d19efb46ac2bd9d9da05619e5a37aa5cac30c1feee98f6ec11fb5b2e9b0eac15b2005da18ce3dc8d556b3d144c783955667e5e58b1ffe8fff9b0d2407d8dbbeffde5b3ad3eeecafde599ab9ac5353de86213aa38ebd3a4005f65e2b001085150008428810b3e17e3a1cbad29328cbb4c3623aaae95eeaf6465c4bac89d2914b7bdb7ff9d53f3d7fe6a9304a1c3976050556400bf1d65bcfc21eb035654cf8e20b9fa92d9ead279da58ba7d8ebfeda7ab3b9e48d041010b263084ae70291001d0adf7ff8d6ad5bcfbffccb6f7fe6d2b77ff0e1dcec13cfffc37fef8daf7cffccd3cf2caf3ca7b65f0ce451bad7ed76373737efdfb8f5f2abafa103cfb9b42b3a9504ce17367269b1f39d9fb8f756617b12982057698d7972aee5d09b7bb7ce51bd989d3af50f7eff836f7e5dffd1abf89526cf34b51a5528148bfce47cc72032200321fa240a2a49c80004f978d097a2080c1b2200419030b4dd4e332096fd3c5e980fbb4d17328cb247afbffbe489d9e6e2ec382055120b5e858911c0a01104013cf3c4534f5c7ef1bbffeaabcfbff0bc69c5a59ffae3af7d7b6e7e26ae379884c9330aa14142cf5858741bfd77fee63b172e5fa676b577f3c60b947c00746f1d80ea02c199d3270db847f7ef2fcd2f8cf6fbd39deee2e27c4130b976b311233f372b75832810302a349e3cb5f4d9d77461ae75eaec30cb61771018faf0276f2eeceeb70333fbc4b9ca7ff39f9e7ffad947b7b6cfff93ffa8f64b2ff7c324c95525e7174ecf10aa5131ce317b83be4847924f241f85860d230121a8f745a512d7eb5556978bab3acbf5467862a6b094d8702aaaca9fff60e3d6eddd416f6a6e8e2c970b6ff02057c7cc41546d4841cbcd99cee27c1132286060ea81112c5acd796fb530ac54cbac8b1dcace20dfdef7f54a7b6621393103e0c3cdfdeb5ffbc1cd345a5fd3ddc1646ee10431ecedf56767ab7ff6677f56abd5eedcb9c301c5f52a5dbd631b90aec4c67b35c66298efa6eb37d6ee7dff7d7b6be7d1ce5632ca5d7f900f87d5413e2f9ac431359bc01573e9dcf2a5e714ac0847a9177163f6fce98b735100e026b5c8541b953030459682fad86299a4f2220cbe5eab44a1155f485e68c0c148d546f6896506e428e0c5ceebefbc7dfea9b3274fccde7bb416aa7df860adde6e2993614247f5b01e40b87fe7ee4f7ef676bcbcd0acb6d43b1fc0cc742b68c6efff8bff2330fbd6f8c4445b3ffd68f3eaad1bd76f049d7aab35a5f50622aefee53765a1fd6e6f301cd74d3d6955eb6bebf7bb73d31cc473cbf1f9a72e7467a6a7e6669346c244fae30fb2606c9320541c45e1e0e6d6ad7ff526bebbdad918717f30d71b54f7c6637443299e3d7f49064326a35cbdff831f9e7fe185de523776529802d14d8c1a6f0c5244f124090cfa607f67984e725524e25c00408d42628cad84de6956e4de4b144546a088b99d7a002d502b8e5c102c5eba9c0d5c0f6873b5da588a964f9fb4d6a82701efc2a4e64c0ee3ddadfdc533e7eb36f198230266c19dcdef2eb5df3df9dc66e6efe7ba3828fe70773079e2532f9dacc6defb428830b3e4fbbd8d330b9f6a4eafdeb8ff301f47235300bad9567cf27c3d33fd98d49922d25055ad57676cfd0eee15bd11f1fadaede1eb57a733a872209a99201861ce5c1b1560ac0e361e0ef3912f4c633c5a7af515f7d499a68fd224b52e54d261c953fa00001f0f49444154088903366120ce7191f1ce461f202fd72fa9aa7a83e08290a2982685f75e8ba288e3c465b903f005ef8cb6670a0f4477aedd88aab50ff6f8ca5a98af3e6acd76567c886135978c98598338932befbe4b44673ff51c4240cc1648385784fdedea37df986e4cf6b6d3dd977efb5cbbdbbdf8f94f298280308141d2302c02ffdc977fc357ab4b2bedb7dff856587c14912e3ef1d42b9f3eefb8b87773fdeafaadeef4d4fc89931634072793cc5d5b73ef3cdacfb26d19c58e43a1d8b017d81f4d9a71f31dcdd5b9e7391964d9380c4934ddef2dffd62ffbd85aa40a046af9085a3093f1b0b7b39b4d1c690054160a82889216d55a6c517c96151e40298ee3344d59402d8751906848c34c03bb72e6b4b1e1b3fbadab79ef74529870301e9ac9082a8dc86b3eb1dccca47161be9974527191091151450013d201da4965aa52f54da3b6da3448c31c638b14220140a11a098419bdfe17df79ea1f7e79617966a60bd0df88892e3fdd2233610a9b8b7397d2c9fa9f7e3b3b798ffffe67d9695e140399dc0357c97ce299bc73aac8e1c9d3e73e585b1d7ff1b3affdca2b5ff9affe87cdd17836cbef34cdaffee7ff4958abc2a527f33c2fbd4d30721491f05ce0c41101330a5b14afaa60adad55adb802bc14b9506083201c8f270068042030562ced17d1ca02b56ac23441bdf6e6a387a3de5298ca78df4553f76e5f3fb13463492381d1addb61b7e6852893e1fe8898801403406ff7b6fab9a6cf7f2e5a3ebf0816227a16410305552948d803816496ba73b31045885c8c469c4ddc24bbf0ca6bd327cf0071ea065b5ff92e7df79d0f07ab737fef330d8ffd8f6e4d16eb83fe3899a8671db2360042b40f77f7d7b2d1dc1ffdee7cd4e8be71a30a138f74ea0fff60e6cbff0e9f3ce31863819cc123a268596de69ce30bd30921b0216402e751350a6c1458ef7200c89db3a135413c9964de0b285110450a1ea5e2296937657e4a98025facdfdd4b1edeab40da1d4f366ebcf5c46cd3d470ff6757dce660ebfabde4d259a35050ff6ffee49f7deffb5fa987b3edb969e689619d8ce0e4ca17d03c8de66947c08040be3f9cacdddb8b6b31b1354841adaa8603c09dddfe4b5ffced932b73cdde3e9c3f1b7bca8a22ac44db67db4b5ffe7c23696786b36fbcbe3737159d98f7b1d5d4458a2d08294afa2c6d24f8c9cfb6bef9c39af4d3b83bff1ffee3e52f7f611071ec89151589155981c01545b1b9b55d78e1a7e60e56efa82aaa542a95833a2284c2b938498cb593343b5c144806995173551e4bd068462b8bac385edd28ee7d7436d48dd56bfddefa6c3b31571f2cbd74d99c5d91162c3f757e12051670b0f9e0fdd7df1087b73efcd9de5a6fe9d4b930692c4f2f883108e0b29c44944320934f5c18441cc57290bc4371a4858b227e70efd6cecdd577fef2ebcf7ee6d735347b6ee4db517d65214e6a560354c477afd52f3f7d6d7d35430ddbf5bc1ac078bce06c3b883226effdee60585be89efc277f643ff38a92890b6385043d8212c2643cbe7ee3e638cdabf5461825e678d2be1257ca525811f10a49a50688932c47c412ccf34e1131f7ce0178b6be37f4854336fdddbd13dd999d1fbcd3f1512ff7e1b0dfcc4cd4edc48bf3a1bba84089996cf56eef6c6c01fa4a94bc7cd9561adf4fd7d683467b124b54f98f55a2826ca6a6aa82ce34e24a3fdfbb77fdce7e6f77badbced3c9dd1bd73637d72d4a311e2e4d2ff49bc19df5b55a6539ca300f4c18c61588a330f12ab7c6eeec53979256e7cd1ffe7075f3a649d39a353c715980fd662d44b25ba3e4a3edca952d792634b91494f72bd0560450f1c54fde783d6976a6e74f349a6d1b46a6849f8d3161186693d111b1380c87e389b51600a1d44c657975e10a97bbc00aa10e5344dccf2753cb8b667f42969a06bb9d6ee4e881ec9cb978a6bb8b8feefdf58e6b5db8f04bbbd0d9dd9bec4f46322a5efaf43396d55e1fecdd79649eacdeb9febf2f9f7d2633f5b10b6ef706e35ed1dfd9be79edca60b83d1cec37eb354350ab3b13559c300ddc83cd073cdfc4d0c679104ec5d384c6988ca220777996552bcd0cb53a33f32b5ffaadcd9b377ff2375f1f6df6525fcc68a53a8ca2579e30e7961ffef537e0b50b264df747c3b4486987b682280c4311e9f77aadb913f5462b4a2a26088df12e0c43222cc623e773200426139a490e6c2ca1772e258c0eabe32115010c22b503ceab3ba3660a33d58ed6b4d6c07b31351176d7363c27f79b903c9adc7ff4feee7b3faa3c6cf65a4b7168823c72049485d5660bee8ef6bf5ea429c17c96c875dadb08a0fd2ffffc5d0751e64d3a1857983c681484ed6a94c838a976462ade6056d14a543975f1d55654b4a6ab083962e49c1a4a7320723956d809b16525ec9e3bfff9138b1bffcf5fadfdf02ddced55ed1e7c6b977e7c75e5d5176da5f6feb50f766e3f70b91f9384a46c82a05af5ce95cb338928080293244959402d52ae6b641b845e24890254c9d29125ab586243ea5c21ca74885a86a16d99c074da0609d1ce7dfad5fd0777d9244410997498e7b5e913f8e97ff7d4ec53eb71448fb6579e3afb6cfab9bb1f7c44ece04436f96c2a45182c356ffec9fa95fcba8641c3d4948a7eea265270544d07c3663df4f9448c6659566935fbe331118571b5d5ee3c78f0a07bfa3242e01c2212231a94dcb92ccb1a86bdf3884ca4956afdcc7ff08fcc97beb0f39dd777de7cbfdd1bda67cf757efb738366abb6d7bbbeb58beac5504ee4edc4a80a28006459566b3401c0e4795ef286f7de069109ac570dc3d810efef0fd1a9302a8bf7ea9c2722153cca648df2916cf77561813d16cc4f7cfe57b3f1fef7fee49fa7ce37a61adee3cad90b592a3948adc86a358ecf9e19eef5666af58974eb717be699f5623479787bfbecab506dbe78ff21debdb39ff5368aa26066360a44065d000a405996699a3ae7ac0de27aa7daec149321a1eeeeecddbc716f696969f1c40c2b388556a76de30895401c880771a4a13f559b3db598fcfe6f6b6f0767a6f7e2849ccecd9f3875e1fcd5f7de232f6c9385f367ba4b8bcc767a6616119d7326385c372f2261182a320006418048e3f1505c6e2930c0a9cf01c818034a529439382ceb0bf39d3d0b840e8db81162cf6737d76e1b0ebbd5e9bdcddded4ef7cebdf54ebbdaad56fa51680badc40aed1a459f837a437aff7ab0f3e390a7a3a5b9a47bb1d3b2daed7ff4fab77db19f70115a25a25a1c182c44c839970d0660cccc54fbc2d3976d101793e1783cee746bedf6b388a890b1da22cfd9184500250502f122c00c9123436652a9e4b566086001185d61ccca85276fddbd91edf72c7098c41086495c2d71d4a228b828f8d274cd030671322a8a2032416855254b279a0b21ab2a20a03a43649009a0102146250083893749732a3e774a948450490380e9c5a5d3cf3c9db99a6db42677b7defce64795feb0b9b892e3e4dec34d3bd2eae26237a8f58b3744f6a0356d4e5e328d33dde4999dfde1b7fef45f2c2e9f7ceef9674c14aeef4e30d766128401e6e221aac7d682892f7efa738b73671faede79f289a7f71eed36a6a7cbc23a662b86f0e1838d8dadf6c9654501f5071966f2cae0093c0081288a07ef498c218c6db3d3bd7bfb41b55339ffd20b6fbef7f3fdad61e11ca8cb27c3ef7df3af8d47b5c6eceff7acb5a1b5ae28b22c53554246c4344d01c006688cf14ebd7fbcb987f77ea2f9686f6f46049803404f8449f5cc5397defef0f6db377e7a7fb8f7a9e595275726dabdf7e143375edf9ba5b5413a7beac56734c9aafe25097a5264a6d209cc4ce169e1e4f99933ed07d7debc7d139f7ae9b5fff2bffdeff67b83cdb5fbfb7b3b49b5d95e5c6c35aa360ca36a8d14b727fdcad40cc45929ec651311f5122571ee0a81c71b661c657b8808f4b058512517af80ede9a9e73ff3e90faebcdb6a34bff5f5af8d76c7d5662330a6db6e17796a82d8e6791e85d61853647996650738abcad1aa186bcbb2877279931eed3ce18cf637b7422779a00858e6a646c371efdec3938bc9a5cf4f4dd97b8f1e0eb0de8f8234c95d821fec0695c4d4bd08420e613bb6c5f6fdfb37defc93f5876b49f7f9ed5bbdc06564937a776e6b587467676bb38be93887bc208351ade1d58b22103c75e945558e6ba1f7455910414421994cc4180396111e577b97d3599657a808804e2613622096900d312f9d3935bbb078eddaf5b3cb27bf73fb7b1004dd76e7eebd87a8605297a97708c02aeabc412a0b877277b098cb1843046596020f3701295b0ede22c8780281c9d03921996483cdfec2c4ef3f2cbef9171fcd76ab17e6a26a928fe3e0fbdb1bdd9bc187d187187c0dfcf8c4b94bed99c5f5eb37befac7ffd4e4e3cc0c65b890221729561af5932be75acd6984dc23c549301cefe060f4575ffbea57bffb0312f7a5dffdadcfbcfa6bde6bad1e455154ae1ff0de1b84743446c37a98023b4cedf9a32462993bb97efdfa7832248f11993849824635ae358ab4d8ddd9eaf77b62e324ae2a9a2277060b456036ac44aa54eea6e0449054bc37c61083f70500196bbc53634c9e1faceb97c0ea60bc3fe8551b2d266b6c3a9864f7b67bb1bb3f0e7237ceb7efae43b38e531116a387198412e606ef7d7463fecc996ffcc5df5c7ce6f91ffde05b43af615c6dc60dad68353cc1896d9c3ec7f5b6313930597548b6d259dabe77ebafde786b32f00093ef7ef7c7bffeebbfcd06451ca24651000088e0918d50668d78a3840c2ace33aa94b502400aca00d606cbcba7de7befbdedb5478c6585901a9bac6e6f7ff56bdf78f6e9cb1bc3deeeee7a6802c3c16145f5b12d6eca50e3c09f3e5c0e78540571c4b1cc0c209e24dfed212aa0801ac278327645278e6236db9bb5f55dea8dc49d08cccad3edc6c0e913679e3ef9d4c5f6f4c2dcd2dcb9274f3edcb8bfb9bd36da5d1fee6fedef3ef2e32d49b7ceadccc651e005b4500448479bdffcca3fdbd9fea8391954f27c64707d7dfdfefdfb78581cf658d18088384b45287b82e382726734b51f2f534104c45abdfef22bafbcf0ca4bb556b3740327a391cbd35a3531963ef3f2cbbff73b5f3ab1b050b88c2fce2678b89403f4a0ce4c4488f1d8661f8a4800a8021ee8b0d80f0921f6b6dd9e0d4f2e9625a1d68479918eb3dd07f71f982c8d853cd45ffec21f752be79f3d73e9f69d1b73b3f3afbcf69a7792497a6279f9d1837b7beb8fa228f2d64ab52df9b05eb3cf7ff6738de90546f696c65bbd77fee59f8f7ff83a7ce7fd0ffc64cb72e2d48b5f5d7df0d95ffe2563f87816cf12f66edddcbcf3e1c3ed6bd9a0a804411424a056c11fa5d4bd8a80221331d75bcd4a25b97ffb76361ea793c94eaf67ac999f9ed57cb2bebe76f6fc99575e79e9205875ce31b3783daa0f26c2e36ca5aa221e80acb5d6dad2bd44524f92f7fa78b81f95b1c5d3cf2ceead9a6b57ef9e7ff5fcdee6dea38dfdcdb50731051982f793309bfcecad374c41975e7e7192ebaffdbddf9c6ced9cbbfcecdcc9256c2d7531ed6ddc338de99dbdde74bd6190b15a6b2dafcc559435a9bff5eece66cfb19287ebd7afbffffefbcf3efbccc7ea75148a2caf576dbd92e5bb6faeaeff34358dc6f442fde44bf57abdb42d40875b08808a6a777a6a7a6ef6f6d5ab599a1a466b4d18d908a1d1e94eb55bf7eedde1a717ea4084cc59e1500150889559010e96e132b33a2d9c472613da5aad464459963359f18882151f264f3fa98059963ae75d21db8f36bc93b9b9a528a99db97cb9282473deb0b9f4e28ba72f3cbf70e2d4f4c9958a2694a451edd4b39f7e71e9fc139d99f9e956bddee9cecc2dd92489e32820063626b4d3a74f47a79f1c36abfffaafff4ac5d1c19634d468d62f5e7cfa63351b1ce66fbe35b67d3022c6542a492d4493efefde7873fbf6d53c4fa3762346838802a06c80880897969673f55b0fd60aef85e8c2f3cfcecc3476f7b66fdfb9d36a340c1c6e34808874b04196a84ab96e91998ba270ce054160c3b0d56a155eacb231e4bd0744877e7f6f777634c69a09828099adb5a79f7ef2ccc50b07f19a098fe04b8f51160ec2bc5bec7cc7b3ade06b10ec138504079baaa9eaee707c77f5c1850b178c35476b00aad5eaf4d422681047719615c400a0d7ae5d2b8a82d99621e4713b75d44a2168049e709cafbfbbbe7b151a4b9d99a5daf48a530cd491922abcf8c22bada9eef6f6eead3b7717e7169f7ee669298aabefbdfdbd6f7f8b9f988a8e6a7f0cd261b19e1299b2eec63907841c04cd76cb8401823aefcbda684561a526240b172fd956b38c8011518155716ded91f31ac7b11eaa46ebc6c3d5b783f1bb3a7a23d30d5354c992986a392d87ac40ed7a3309a3726383f294aa8641e4bddcb87e030045fdececec6ffee6174f9d3a291e5581c9209031a6ffce3b90140e32640b400094e76e0c5689c986f576bd6b8693ed071b773f1c3eba4549cb84512e5c60d0e8d466e7e62f5d7c66766a562d1ba66b57af0e07034344e55e114110b08097d23f3c58ce7e50794a58962a090011048101006674e20545bccbfafd687ee668de5800003af5661cc78aa008028a009330a815619efdb1eb9ce3bd7b7bbd7f5e977f1c4ccd81f1476e4b2534bdbdbd200a958dd7837d09bcf7453e7ef99567abd56875f561ab3df5cc3397e6176627930942e09cab542a954ae5a85caa2c2c29ef1591d08805f2e88aa2e8dbaaa9c254cd13caf8f6777a8e2468d73b73cdc5a7ac09d9064ec050b1b9b1fddecfaf5dbb7ecb7851640a420be0732f80006c8819c14b21964c9e4bdc882b950a7865423401a217914a35ea0dd294555d31dadf8df56047404652234426b1350b0640101c021344e37191372b93ed8b95fd3b598e61f78bd03a0d52a80833a31208baf1b0f7c7ffd7fd76a7dd6ce1c2fcf2afbc6cd15018846198541aa7cf9c030044b66088c54b9a6368c5f61f7cd478ea656b289c4cb29614682c21780155299ce5508950950b40760024484026ae710c60ad1bee5fbd79e7add6dcd9e9d3cf99c60c789aeace7fe9777ee7de83bb0611833028d7c11f5fb72985231b884058495add8e96aa1f414510310802efbd19e50292b314bbfb47325f66ef4683fd308c9d55610cc252874a92e448179a2bd3a3fc47556805950b0ad670aa07fbe8c9ff57d7b534477214e17c5455cf4bd2bebc92657bd71b7e007e8439c3152e5c38f32be1e203c1019bf0058703029b085fecc5c4dafbd6aea49166babb2a33396477a9a50d2a7498194d7757677ef9a8ecca6f369bcde36f1e6e1f6d4b4347d25e8f2702a60c29ab45f69e01223204a5005036ebb3f2e3974f4eca83efbfdbbff3fe72fff593d39778d8f84c08d16f0ac73dccce283594fe0018a994c2048bf96af9267373fadfafff385feeceaf7ff2dae19df7def9f99d3b1f84182322aa4a0841f2b047b19492fc9e086feedf421e1a1790c8e90343082184c5a2397d79724eb17dfcac266c00f0e0fed387ff7920486da4dbfb373ffce85d660400d6d770f95c60b69afdc1780d3a035520f6559e2902c0b7cf4e1b48b7eebdfd78735236a7fb6d9b120037d334154dd1b491cd775f7fbebeffcdf9fc50a53b7afad38d83db8bc56c8b0250540321890821fafe6c1b890c075747640666e8b41788731338d8d98b89d727fffcfee93f9add83bd9b878391d72deeb5861f88cdecfacd1b1a288b20f38495011071b158cc9aa621ee59fb17c715416ddb7ef9d5b75d1f0d57e7d2b45be93b314533113a3a3e92cd69303d6649015ac24e61a0e8f175b252120a6b2dfbefdf7bf7b7bf5a2e163b943a86a90250e0e4d1e37f7ff6e9d1577f7ef0e8c97aab42e9e18f3f39378aaa4c36808d0d3c2367088cad3a0e23442a4554ada86e4adf219c765d52bed5a45b74b6f9e1ef01a90466f7d35acc44488c0dba595c2e97b149606a7cc10106c8809aa58f91d3a2898bb439eeb9dbd2e65477af71864ebaf73e7e87888e4f4f7e79efedbbafef51600450332c61bb79818b85d27500246c0c04294721608a73309cfdfe771ff5bf797fb59a71200b0900ba0089103118800121922243e4d73ff9f5eebd0f8efff2d762f2d6cdfd93178f9a17eb97061253a3d6338819200293932898f74e8ad724100dcb48cb8308a6b90901c5405122f652726b69b11398a39931c7528aa98299050a1c9af97c3e9fbb1e1c560301906888644639e740bcda5df61b69b77d7f74deecdc24a6d5fcdac71fad1091e84d3290d08813c60128dac1c161548899da0404101582c136654642035223e913eaf9f1a99aec9e67f7896ddbae4a50d575d731336ed6b96807f0d9df3e7fb93e7de3c61ebe6970fbda179ffe29cd215bc90466a632d08de26816221247a48b88c1d01152d774c3e2412a259d054406b0beef550d45800802f3acd9ddddb59147d1f91b7cabad6fac1ddd9e2e57f3764fb667ddf9e951c2434326931e03230543449ae9d61b9a4b9f4b7bde6eb66d5f3627ebb8de58eed72f8e1a223a3b6f37db40d46f5a469bcf9bb3f3d3dddd9dc754bc3fa394723c4f6e5f4dd3646b33f159579e3df8b60f71f78d6bb76fcc732ccb591f0e17a62725309a899a3b7519cdadf23c5583ad0e1bc645684a494a6166425491d077d997efaa1a690855713e14598606fc4953703d518c512533f3eeb55d79fab2dcff613b4bdc6a77b60e7ddf9d6da02f96cbd9fa79445a1fbddc992d78c15dd7edeced8a88ee0033c61868d1c8ad14690f0235741d3817b219ac34d0323439e7b4582400556f812140645d315310f970ef170fef3f3fbade6e0f6906c83bd41683637f3c4336320bd084bdc80b15e2951c22bf11c7e94516ae86e40b0a0dadaa15214012ccc4a0b00a8b6e5372cc2e6c666e80626424032fe80102852c3a0b4b635a35727a035f7cffafe7f7bf69660b8e891608883c4b34e3703dc694566f7188312c668d6f37238266a8b4006218fba810d12039ce2904204a73a494cc0c4430845c4ad33490b7881843b87bf7ed345b3e79f2ac28cd887a0212ca04682006a220806cc86a044844601010550a317b68ae668546aa12224be90d51bd190f21809a211a80050280ea774a51222a454b51efc6412403e491572bc6e86c45d8c41b770f1560b55c0006a0101930b09852085434a61401dab685790a2939b853a0da53e4d9f6b0df5f87d03350f98cb4c5354df7c4da4b3129a583830333532d21ccb414cb9d0221d0c0784ba4aa3cd9f32d22ce51eaf57577d27ddfa79070e80933e75df6b9f1cff6170080810b0131a759a300402e886175a4022186186335e0a1becb149cb42a72244b29c5d820630a9110032019508ace381e9b844cce456d60622aa614189d2b83c810faeceef582a88e4646926a1a882865286932b382cc87ae342530cd9daa2947535111a72205d36a5c6640cc4864975bf8085df1c59b35e582d01c800263600c3c9bcdaaa2c0a8fe2172c95a8a78b073cdab2a2b0405ebb211729a2b45412c402d6007588c004340025110d55cb02889b1028979ab4b4550517179e9386a2ee3e52a07ce0881a16ee503d0544b29c572ef446445b03e2e9eb6088a48dff7d5370f1d1e22ccec44f534b6ade59c7d974b504224cc392f56cb00acaa0840803632538610004cacf40528242006440a11000cad05992d6668a8028452c0628ca80500d44c80b5a017520cccaca498b266371f34d0225eaab03234e6e6cb5c7030f2df0d0b85104a29660c826684c660c81454c54cd44000c42c588730f804413063565381dc754688ba34335304062d4a485a14c0afc22a062a29442dc238567c96cb25338b29327973b0cb7eca40e753dc6eb7b53c42443504542de59c2b04aa5a7064e61afacf878e4bf52f4c7390aeeb88c8e9656b64f1a32a226a3c82c9f00d6153bc4ce3b78878a63e3c6e18255eefd1af55415aa71abc56304471421be8f0c06b34ae6a3373fbf534c4afc7cc39f74414104b29be0d9f38d6a3fc40c76a9d994bcdb130468352cbbe70b9bdb8dea48d248ad5b8c6c5d485086a7163f0c77ab572e6fd75e4cb31ae9d5e176dba53a7ee1d5a3494817c896c06886a17cc3857f453911f63acbdb9f50b3819305221f80bbfa529eea659950b71bbddfa79ea642a66dd5b399061fc558b9abbf95b9b5058fae7afbef66a67f562d5a955894f83433d21719306de681d190101c89f15112a4231ad8ecda54363d43481408c01319852515446323122eafb7eaa1c18036a35b169710b00e6f3b9cf983098fa721da51818a98029a21afb8f3ec894c21701a31aa3322ad7303715a899191401cda03d2252e8a528a858ae92323329bd6941706e7f98baea218262edcfb99c77d4fb51bdd4b059e1537568662e972bd09baab71acb20e289ae1c14d3cffd4545c1d4d34dd1740541d3efbc3aa6ffad09972f18eae5aadb3533ba82aea965fabfa6095b8dac974048e4ac1730ba43179fcfde8d5147924b1c4ba83071abbe31b28afb8a4087beb3f1f9b28ba9ca5d2f6792feb68acc8fad68bd728f75f8346c24e384496f3c9552fabef7071baf5a63ced9cf5b4a710e8d2a9afab99b378e7529f7be539854fdfbe5abb89ddca422b75aa2be923dd772d7d4f1d533d71ff6988ea9a0fd754574554f55c39520ab63cecdcca1ef0c067677348310104c39a06624225f778921851985c07166feeb076a80a0a81458cd8892299a39895346ace4c8c585a95a10d9103c87464277bd3a126354811203a0aa15443451c440a0a0a59aa14bb4ca8b1073df0b1823d4fac6452c1bf3cc01d7210a98a915153548b10131530d4c5980994485981140c45441c4861dd2ae8abecbce73a60253df54416bf58724fe8f8655d503248ce1a91a451541cda1ab0eab2d5425d7f3d79875c52eae20b45eb15abd5df64ab5ae588faa89a863ea55c80f5f8331f5c839130529aa0aaa1714423a966275326a0ee2198d99f57defb4c5d3ea414d7660e2d4a6339b5afb15bfe02771eb98a4631707d6b4708a1a9bc46f1f554c342e505d2297d63a9333f875eb52e382c08c88cc5015a42800557f0493c4a19ed1655ccd44c787d44e235d4f3814342620d5cb0c3c3e9b1a4d5c93d355d8aba3a2e08ab7ba92f1576f328d1b22324d5c47585ccc472f33d088c8ff00df1394ac78a937f80000000049454e44ae426082','img175420839671886584-0f61-43a6-bc1e-dbcd8526056c794370927.jpg')")
+        db.execSQL("INSERT INTO `ARROW` (_id,name,length,material,spine,weight,tip_weight,vanes,nock,comment,thumbnail,image,diameter,diameter_unit) VALUES (1,'My arrow','','','','','','','','',X'89504e470d0a1a0a0000000d49484452000000600000006008020000006dfae06f0000000373424954080808dbe14fe00000200049444154789c74bc69ac65c9911e16119967bfcbdbf77ab5755575556f45f6c2e69023b2871c8e3ca26cc99a19dbf00833960dc83f0441230906660c03860d1bb0fdcf3f2c0b8204cbb00c7881ec1971b8349bbdb0c9267b6775d7bebe7d7fefeef76c9911fe91e7de2a92f02140bcae77dfb99991b17cf14544e2e66e5704104504114104101100109488000020034096e583fe500483c08be35829e53ee69ef1cf2202c8885896e570989ad212511004511469addd1708002002080222a28880fb2240401091224b07bdeefec1eebd3b773ffffcb3db776eeceeee1a6310800019400081ad200008220a58142280ea57d59a0841c0220100089008a020080a008ab50040a444408401480019984008ddfa10444444bbb539b954421a6f75f46459d6ef0f40300cc3248989a8dad8af3d88088859960d060311d1caafd56abeef13917ba793118ebfe897bf31cfd26eb7bbb3bd7dffde9d8f3ffee0d6cd9bdd6e87d9300bb325202462112404426121000101200060b72f016626220416270a40b74142140110606024045080042c4a296656a858404404009d7c091044bb8313401140c0eab700e3dd6759d6ebf5103108c25a2d1969c02f49d3fd202222920eb3341b8a48e047499238c51111428427c43ad2190061002ccbb2d7eb1ceeeddeb871e3c38fdebf75ebe6f1c921551fa9962d080c820822ecfe9edd1b00c559010b2022a28000a200202a408500bee74751acfdc00bfc300cb5f27dcfd35ea09412b1048a41ac2dadb5255b2e4d9166799e9645a1c7a634d27640c46a13c8c3e1304d530415864112d700808888c849672c1766767fd1eff78ba240a4308c7ec512e509adacfe10804598391f0c76f676eeddbdf3d107ef7ff6d9b556fbc872a18944588459009146f60ee2440482a000ac1501a594a008002108a2f2023f8a925ab3d98c6b492d6904beeffb9e0029240056885c293b80c0f8cd082820c282e40e4ed882fe550379e2c9f33c4d530008c3b096d47eddfadc0f22424465590e0683b22c95d2711c8561e8cc6afc3c69922c8208cc9265f9d1d1e1fa837b1f7cf0fec71f7fb4bfb7c762450ca2621144052084c23c3e4200200111140411e73144a3d25110361acdc9c9e97aa319c7b15244a891188481c5b0b1d666455e16655916d632b3b5d6b26581eae548a8482ba5b4569ee769ad95f6f5afcbc56d38cff37e7f88409eafebf504e097ace957c49ae779bfdf6766ad759224beef3bfd7a52659e1410211645d6ebf7d6d7363ef9e4a30fdf7fefd1c30765591a63111191c69142041105d182b0b87347b6c24884a050fb8ddac4dcdcdcc4c45492d47c5f51a5d1262b86459a0d87837eb7374c076936b4c694a515711a6f450491100901992dd268c1d50ac8ad42fffaea11d118d3eff785c5f3fd24ae01d2e38833f6b5a33f2c8a622c9d5aad5645ab5f56995ff1e8fd7effe4f8e0f6ad9b6fbdf5e6e79f5febf77ac208c848028002022c882000388a422e3c21228b20f849adb930b7343d3b57afc50a8994c7a62ccbbcdbedb48e0fdbade3fe6060ca52c43a932122664644440502cca6d21a676608cc0c2e801081a0050bcccc563fb961f7b3b5b6dbed32b3effb6ec3bfb2c927bd4f9665fd7e1f11dd8795524e4508c7a11b9e948db5d2e9b4d6d61e7df0f3f7defbe93bdb5b1bd61a008d28c694a411802b1728282802b6fa464106f183786666617979b9d16c2ae50b14362f7ac3e16e7f6b58f40ed78ea5144401665188080256692d22cc95d364111cad4b440c9700e0968d885604840105470bffa5cd2389b57630185a6b955249928c36fc4b616bac472e9c0380effbf57afd091b749eb5f2c463c9666576b47f78f3f3eb3f79f7ed6bd73eeef5ba23e9596621426070216aa4ad0c88088a94efd792c5a595b9b9f9388c89d094f9a07372747c707470d81ff692557efa374eed6eaf295b63cb8408ecd44f3f065e00cc2c22481a000451c0ba90c48c4424004288220e190112226a44046410623120980e8765592aa59e50875f7d9cba8e75278e6317b09c0e8f3f0523e7e7a4d9ef0f7676373ffdf0c3b7de7ce3c1837bc614a375bb3f1160001a698f8808a2f245a8d16c9e3a7d716e6e5e6b602ecb6c787472bcbfbbd3691f1b530008111ded0cac587f9a8bcd4c896781091100452a24c095623a586a1d52751e9fb882750200385a9254bfd7e2222608220e878334cb10288e63dff7c79af22b0272d2190e8700e050f238f00300215a66a2c791ce5adb6eb7efdebbfddebb3f79efddb7da9d6363ac80900b4500440440426e91956992f29389a97367cecfcccdfbdab326eff75abb5b5bbbbb3b45590a58368614baf5a051dda30184196a865239f838de3500282276a291d13f56080a9ddb2622001ec57d4120100400dcdc1938b45ee6a6d7eb014a18c64992fc0a0e7cf23f9d7498390cc3388eb5d6bfe26846c625885296e5c9d1f18deb9fbffec31f7cf6e9c7599689308bb85443a4523a0264073481516bdf8f9fbaf0ccecdc5214fa45311c745b5b5b1b7b7bbbc6942e49719fad228f2a8329a5a6cca03899f2168f1f9650108e94c1adccb255a49cc316ace4c2208404e0e48344282e150160b12e2e391f24c6986acf5114c7f1936e78fcb37bcab21c0e8722128661ad561bffd6f98c2703a230674576b0bf7fe3b3cfbef7bdbfbc73e7565994a393759fe4111a0006010422a5bcdacaa9b3cb2bab61182170b775b0b5b5b1bbbb6d6c21cc347ebf2080946249f18baf5df893ffeeef7c74ebfafff64fff8f93f523afde285b24231b414004d25a19205464191035688f1100d08acb8e9c0302112bccc20ccc28258ac5cd9d3e88f487833ccdb5e7d5ea75fdcb89e8934a648ce976bbd65a271d07059d849e948e4bb8d234dddeda78fffd9fbdf1faf7d7d6d6105d7284ccd6654f00e27c29b8588e7a7a76e1dcf9a7269b93964d910e1e3d7a70b0bf6b6c69d956df00c46c2b8f2b8241f1f7fe8bbf1d2dc0caab8dbdfc507516ffc99ffd8bc1417fb08b9005804ac4a720043f5641acc2d88f1a7e98f841027e84ca535a2329444445c02262c5965c164551d83c3559bfc887b8b5d34dd32c4d730168369b9ee7c3e3205289c66512ccdceff7cbb2f43cafd1683c19e0c6ba36d25b19f4fa5beb1beffef8ed1fbdf9fafefeeee86d22880c40cebc44085c8aaefc30be70e1d2dcfc52e0ab3c1deceeee3c7c78cf72698d1d213001006112114271295c3025fffcadff6a13eeecf4b6d3ac334967eb8797fec9fff03f0f5a76383cedd7a66b930be1c49cdf98f483d88b6ada0f75e893f6c8f3412191526ef9482ee52d4d21c61ab65296262f4c566863accb278220f23c6fe4ae1eef7cac3e83c1a0288a2008eaf5bad6fab1b28c9051b507e0c160b0b9b9f1eebb6f7ff73b7fde1b747e3d4771ba00ca39239c9a9abb7ce5b97aad0e52b60ef7eedfbf7fd23a06b04008235c8148f238480a2020a2c96d7790af771f147ad0deefec1da6e7ebb5df7eed9bfffbfff9bd2bbff5b7b0712a6ed4bc38517ea03c0d445a6b52da82650624201712dc972003a00784020c8282c022c6eadeb06b1982d0afd7ebff7fd9168cb250cff31c387ad267bb8f597198c5a683c1fdbbf7de7efbad37df78bddfeb8ab0000a303d964da56828a4b47feeec85d55367b5a7d2617f73fdfef6f6665996480040228ca01c0a71b048111906008fa1448132d76ffc5f3f0f2f1703db4dbca950c77bbd3bdc4f3cd653cb5a9fba149002440164401141000b08a09442016167e604228f3d3a3b0c89080a41919a7caaf9fce5979ac9048d30c8af786544ccb22c4d53228ae33808825f774f002e6f9261bf77efeedd375efffedbeffcb0dfeb393002882e560000120a200a0279b5c6e473cfbcb0b2720a818f0ef76fdefc7c7f6fc7899b00c7da593130282e2910f210a5c48092f9daca95c6eccaca696ffbd171a89a9dfec160bfdbb96bc036f75b47a79ef94d418d080295af7c42811147b90b0002b20820d008513edebedae8dd9c99997de6d20b281e3c7ec3e327cff3c160404451144551f4a4ec2cb89d80c39ed960b8f6e0de0f5ffffebb3f7e6bd8ef1161955c0a3a8801c8802480447a767ee9ca95ab13cd89bc48d7d71edebd772b4f878ac8f9bb91028f8eca6591a04a21a1404dae4c3df5e2d2f35f5b78fe2bf1d2c5b29bdb9393fdf5f5fe4ee7f09a395e1f065e90f73b67bef892510d4447e18c84fde403801582231737e4b1c3a80e464daef81f5e7b6ff1d4ea853397110981dcba6044800d060317b69224715ce2d8ace80907344cd3b5b5076fbff9c69b3ffa41bfdf1d790ec7553a0a1311d08220ead5d5a72e5d7c360aa27ebf7df7def59d8d2d6b4ac739ba17125115a950181081193453e84dad4c5f7c75f1b9d7969effd2f485679a2b2b417341ebc55ffce0ed87effea23c8a07273500fde8de2f3c6cd5a66af1fc33823e205a360a519346044156e04e4f40c44126e78388c4e991e36f1149d5e74281f2bdf7df7ee6f9ab4bb3ab046a7c7e44d4eff78d319ee7b9a0fe2462a4b12a89a469bab1bef6a3d77ff0a337bedf6e9f382d0624176b1c2a140400523abc78f9d9f3e79e228256fbe8fa8d5fb44e8e0184941211353e6a44204210410da45945d4589abbfcd595177f7bf1f957e72e3cdd5c58f06b75a53d44043f5a98a807dddddbb7b72d04b62cb44628db696b7d589a99b9534afb4af900ca6d8cc6c98d5351042214202441c45128a856a26ad31e025a2c7ef0c677ae5e7d6961fe3472e53706834196654a5192d4b4e7557867cc758cc49317c5f6d6e6bbefbcf5fa0fbedb691f13113886054100a5caca4450f96172f9f20b4b4b2b6ccb9d9df55b373fcfb24cc4392610277404201074daac983caccf4e5e7c75f5c56f2e3cff95990b97eaf3737e1281d2440a801421122c85fdc6c1cf6edfba855e6205f3c274bbe9f1eec18d8fdeb9f9e1eb9ab27a4dfb71c3920260c7a3884885702bbd952a418171c60f88a8c2ba6745109090df7af7cdaf7ce5eb93f559022c8bbc3f180040148551148d1dcf38a223110094a6d8dbdbf9f0e7ef7dff7b7f71727c585528dcf7388fe6085280304aae5c797e6e6ed194d9c6a3fbf7efdd626b11467c8c8b2144802080842480366a36569e5d78eeeb4b5ff8caec852b8d85051d87a81456fc1f3288a0f2a47c75b9bf6c6ffeec679f6410a35fd3da475447c79dacd7e7e1f1d6ad9fddfcf07b7b8f3e9d9e4a6a8d04556441a326008be008b3519d455c8a348a6a880a7d444160066091fc27efbdfbaddff9eb81ae75db2700e8fb7ef204d90aa374581c7500b6dd6e7ff4d107dffdcebfd9da5c7f9ccde3d8c13a4b212f485ef8c217a72666ac29efddbbbeb1fe704cb1008033c6f10900a291c09b3a35f7ecd7175f786dfef24b13cbcb3a899190c831e8aebc8000a0c5be32577e65c948d63feed95b0f77c2a45996c6f30266c8b3d45a03c064b2defebdfb1ffff0f647df1db66f4fd535e9242fc81685290a36852d8d188b6c41584410840488587dfdb5d71eaeaf81301bb12c83fec9a79f7ef28dafff6e991b226ad4eb4aa927391d78c2ca7abdfef5cf3ffbde77fee2f6ad1bd6968f25e8764a04880ca083e8ead597269a934591dfb979636f778bc51269041aa7b50c16840189889892e6d9174ebff2d7e69f7b65faecb9786242690f41902a0566602001010fe07c92fdcde742afec2c9e3a33180cae7dfa79564210d64a631b8dc974d8cfb3a1af898d2544b485edb78e366e3ef8ec0dadca64ea822985adb1a6346559167991a7659195795ae6799965459eaba5f9a97ffbdbbfb3b57ed06af79d5eed1deea820bc72f90b499268522e10c213c0da0968381caead3d78fd7bdffdf8a30f1c8349a3a4a452556124e5f9d1b3579e9f9999c9b3c1fd7b3777f7b7d95a4dfac9682a604140132279d0585ab8f2b5952f7e63eed295fafc9c17c695c723e5e222012861053e004ef9833f7e71ca1bee035b02989e9a3c3edcdfd8dc37102050694bad281ba62056f9541aab342108327399a68c175efaebca4f94f64969a53cd2a4b5e7485e111010b6acea51fe1ffde1b7bff0c5af67b96cac6d5acb60cd67373e7ee5cb5f3dbd7c4ed1af8266f79465b9b3bdf5ee3b6fbffdd68fd274e00c442aa78c48840828a8fdf8e9cb2f2ccece95457ef7eecdbd9d4d10ab3401013a96dc95308144d052e8cf5e58f9c2b7165ff88d897317c2c92679c448408aa072640222200460006a38f8779f9d98e7236b7336b6c8d3a416059e5a5b7f707c32505ec88c9e1fb270afd741058e8447aa90f2e4a9ab97bff2071424411869dff702cff37d3f0c7410fa61e8878117f87e18a8b9f9d90be7cf3f7df9eab3579e9d9b5d3e3a39d9ddd9639bffe4bd777ef777ff463d693a1e140469a44acc7c727cf8d1fbefbffefa778f0e77195c8500188480049188142aa5fd4b4f3f3f3fbf2862eeddbbb5bdbde56c4400083520320802138005b25e5c5b7de6d44b7f75e1995726cf9cf29210881ca9064808ec0ad5802ebe21a2bcba082f4ee5520e998d298c4664b6e7ce9eee758fee3f5c1b0e9154cca492b821167abd8e520028beafb4af58c5bff1effcdd78e905714407b0d37a402540020884a40948a95a73e5e1c6d1a0df999cacbff6f5af7ff39bdf8ac3fa073fffc494d94f3e7aff6ffd8d7fdf030f4670d99d79bfdffdfcf36b3ff8de771e3cb8eb42bffb771641727aa144f0dc5397574f9f66360fefdf5edf7848840ce81c1355de474050448917cd5efecdd32f7f6be9d92fd616e7c0f31c8f02e0f20be52c5c465f24a866a8ff7bcf37547a006ccba21c03d8a248cf9f5dd958bfbbbeb90faa8ea0013808c341af9f0e06bea7bc405ba592d597bef11ffc69214105128110a98a1863344d24006a7e61a9d7cf3736f776f6764dd937c5e02bbff1953ffea33feeb4bb376f7de607d10b2fbc02423822980b93af3f5afbd18f5effe8a39f0300b320563945d5f82042a21657cf9c3d7b11c06e6f3f5a5bbb5f19073878e3d21f2100464fa2a9f9e7beb6f0c5d7662f3d1b4e4c9302848aaf6516108d02ae6ee8d0038020dbaf9dd667fd36b1b1b654a494220061230858abd5e2183ffef0e3934e8e616cad45a43849da478748d6a29e79f6b5fff03ffba7036e3847e316268c8e9e92c7140530b37ae5a557b234cb0ab37fd8dddede01b1c3b437ec775e7ef1a57feff77f7f777f7765f95414c5840820cc7c7870f0d107effff0f5ef0d067de0514c77415aaac835353d77e9d233daf3f6f7b7efddbb69d92872d853b9382084480480104dcf3df79b8b2f7c7df6a94b7eb30ee880dc1841a9f1172022b320305956fdbddfbb3ae39527c282485a6b422c8d61404524569617670ff6366fde7928aa465e0c48205016c3342fbff4edffe49b7fe7bfc9fc2921c7afba534510e4c7de76848881d4c2c2c4eaca19162ef2a2d34ed7d7f73aed6e12fb45d6cfb27c7e76066c2ab6d0dad79ed7eb776fdfbcfdfaf7beb3b1fef0b1f3165720412264413fac3ff3dcf3711cf5baed5bb73e2fcac2c1781620741b16056449abdafcdcf35f5bfac2d766cf5ed0498d5139665240d0d597b9ca072bd48f226521bd83fff8eb6767f910c12a22574d31c61853ba8aae65612e4f5f387df3faf5adad631dd4053d249c999a3c75f6c2f957ff5ab87a05c815c2c4193a22398a1c409054d507e2bef4e5572eddbd7b636579b939399be5e5302df60f5aeb9b3b93cd064ac165990d7aedd6e1fee13600b44f7aefbcfdf6871fbc674ce15297ca970800826506f29fbe7c657a6ab6c8b31b9f7fd21f7408d0395a1ee75902000ae299d9e7beb6f0c2d7a6cf9cd3496c511c0f42639f56693fbbbe1331a6180e06fd7e28c5b79e9b0d6c0fc91724c3b664ecd960a8924cf46119dc3cc16b87e1663927d34f87c1c4d1bdbb14d71028f0421069b7dacb179f91b05ebd5d001058408050aadac13891124475fffefa73cf5d2ab2936c38585d3d6f508cb1ddf6f0fea34d24ac25be4829d6b235c37efbe4e4e42ffefc2fbabd8e4b081cf906cc2cae22a796574e9f5a392d6ceeddbf7d78bc3fd25e0764509011442965c3c9e9cbbfb1f4c257a74f9ff3e23abb008ca000014073aaa4344ca808d92a045b9abcd72bb30258d0f71e1ca65b59f4c92e7c7e4c9f9de0c77bf8de2ebebfeffde2c07e7608f7fbf14e51dfcba2b2716a79f552e7fac7f9a06db4671850a9321b5a15cc9dbdc480c88c82c88222040cc08216c4420584044514123d78b099e5e985a71637361ececfcecfcdcee57996656663f3a8d5eed493586b6230a6cc19e0ad377fcceccac18e81e7cae993ae35269fbef4acd67a7b7b6363e391330e00024240d40e4902945e3279f1cb4b5ffcc6ccd9f37ea38658356a00008215e02f9ff6bf7ec65fdb6fe7a241a01c66597f589685523aae257ead9eb2b73fc496f18e73755c04ad52e51495e8e7e097e85b08189410315049c1caf4f4f647ef0a51a97c44b4c6f4daadf98533d02ff0e8988f0ee4e4584e5ad86a73a723bd9e4a73c80ab0258b150415d602a5bc763bbb776f6376ae5e4fa8d36e5db9fc0c8864457174923e78b4138751bdee6925fd1e5fbfb51ec7f5413a00164464a80c4c7be133cfbc902449bb737ce7ce75311651d0f1ebce4c4401aa12f4e4f917575efcd6ecb9cb41b3ce0eb602e3a8484600c36ee72b17a6a63c7e70940e06799a66c0ec477ed4a8a9c003200bca92b2a0ac1003b1037f5650804881305595753425fb4114ed6c74b6d64c10195488900ffa5414a707dd0bf73e5d5ebfb3b8756769f3fefcf6fdb9ed87d3db0f1b3b1bf1fe56b0bb078727b6ddd64048a4222f91d25cfbf4e1c3c6f6cbaf3c73e7de87e7ce5c9d999bb97577ad3b18fee89d8f377656be78f5c2e494dfcb6c48e1d4dc4ae778df70ee11394d5c5c5a6936276c916fac3f288a4c570cae1da5f622c0062859b9b2f0dcd7a6ce5ed48dc48e8801007265600432608e4cf8f9f6e0ea0c9d52edd65023ea308efc24042441020404768c3509207005511dc3662d83550c90a6d2e962eb983a272fcfcc5ab07707bd7eadc94a29c2edf5fb973d7f6ee7ce6cd9031105c42816c10218f40cf9560559100fc2ba6acc4db0881508c390b41ef4cb078fb659b2f9f9e6f1f1c9b3cf3e9f66c35e3f3d3a1a7c7efdde871f7e7a7cd22f0b434114d51a0468f31c90a2dac4d34f3fa334eeed6cef6cad8bcbc6aafe48477d280bda9b5a5d7cf1df9abff26a3c33459e070022ac100034088e382acba43b8787af5d9a9fd6c3bd765a044d2f8e903c24c50ead8c4ac728165104b9624805b1c8bd764b6fedd4eedd59bafbf9b907d74e3ffac5dcd1da4aa21eecef0ec2c862a0b49fe53944f50b53b3739d8308ac16d66203105f38115b3379c30c1b7977a277a4c2c95a1435ebb5c9dce441104d4ecf9f3b77f9ecd967ea93337fe5af7ce3cce90b2fbff44abfd3ed757b8511445f7b2a1ff407bd1e2a4f7b753fae69adcf9dbd30d16cf47b9dbb776e94261f372040d544018248f1ecf20bbfb5f0ecab8df959541e8e0b9f63a8038024c8168ced9cb45f3e3f2bbd9d89a968bd87858aaafe386440a9509d000010292b400290e67cb8efdfbd3dfff0c6a9fbd74e3dfae4d4decd85c1feb4e934b89c4000c4ddc1300fe2923cf274db526d767539ebd6ca1e02232974843956e92a8a550af41fffe1df7deed997ce9e3b8f68a62666223ff2b44f8422282062eccece66fbf8786e76e6838f3e3969f70121aa37f274d0daddc99a53c9e44c184e1a50693a5c7bf8202f5201c7813bd05b6ddd78f1ccf917a72e7ea1b6b004be67dd4eab8aece39e59b4c29607ddaeafd36bdbef7ff154d8dce9bd303bf38b93321325440e642312802bcf5a16d6b991a3a36867637aefc1fcfee67467272e3a35668502c00a10003d962fce3436d7366f0c4e8eeb0b26a90b141f1fef3c3d7f365a3b6cb8b0038e49741a2a88c422fa0f7fff8fa2b096d42220120685558d9a984b903c1fee6cacfff8adb736b636cf3e7531d83b3a3a3a4ecbc2afd5213759b7950efa1373cb8ff0e4d14e393839d1202206c043785c22b1e045f397a79e7e75e2d479cff78151a143830ed9575b462bd69861b7ebcbd1dffc1d31d13b3f4e7b8bb39757bc1449bdbf57b31857941f00832864b6d676bafedafaeccebda5dd3b33edcd6659065c2812646405ec6a8e20c252cbe5b5e5b9c1ce3ec2c431619e9d7425fdd9c4b3b3cd95b8b5aed0257e56584627070a5123e8300c1101b8f2a5e2dae10010b87d7c72ebe6cdb5f587799e5ebff66110354e9d5ad8dd3fec0d72f08280b0c8d3939d8d41b733b9b03c7dfe9593bd3519ec78e0fc1d89080ba9646ee1c2abd3ab97fca40688e25ae1004083724d1e6c10c0b5bbdad2acac9636f9e4e6fe071434b919c641ebfeed9f4e4efdc1b1e8aafc26440a39cb617777fafeadd5dd9b8b076b53592f82b202c40c824c4204a37a25a287b4e4e92fad2e1c6c6f264a1bb22ab7f70f376f4f2f4df58eeaa6ef9a29143a7ed01d0368adb5e769165b513a23f721226551eceeec5cfbecd3341d20320a66696b7dad333bb310057ea79796ec2bcf132b835e77efd140bcdafcc557cac1f1e1da0d55b48133623041bd79eeeae4996792e92941606654e44a3968b9b244141619767a655e284512e887fb3b9d56bab0348fa56d65bde66ab277ef739afb2a6b57b694e2a81daddf5f5ebbbeba71736ab09d80558016898485a5aa977265ec30da95caf9d244fd5e7872a7b787cdb901433918bc1b66cb8da5a74e1ec65288a06bfa73b42801aa3ff9477fa6b58651a63c76ae28d86a9f7cf4d1473f79f7ad3ccfaa94081045b2610f11e23836c60a202b3ff043043d48f3c160509f5c9c3c750183241f0e91399839b3f4fc6bb3e72f06492458b51e8c3ab3aa3c8b05b27ebf1ce45a53544b18553d3a6cd4fb918d366e6fb309fb2d7372fbe0e0b06ccc2c5a2bb2bf3f71e7c6859bef9fdefe7c213d0eb8d488e4987516214064011919ca28fb042044656c7db6be7eb457a0b6c99484cd937e0f83e0349761d9471915390408d0326bdff7018050cb2f3775585b1c1e1eddbaf179b7db71121df1f12c8ce97090177ceedcf9e3e376a7df4d5992d9653f99383edc7b74fdd3c9a5d5e6ecfca9ababadc3adc6d2f9a9d50b5ebdc1a332a9f384153702228226cf86fdd4430aa2c80bfca2a85376d12f1e1cee1c0cbaba4f47d8f71f7cb6b3b9f37eb1f9e9a90b5fadefee9cbbfbf1f2c946434a9f99092d3221b9d674ac10008cabefee3414a011abac9e29f0f9e9e647ed5e31e8b54a36145c1bea4bd1543dedf89256e9bd002112e12fb5ec8eff1f11d334dfdadab87fffb6b8a187b19e02b932d6dcccd4e2fcdcdcccf4dddbd777fb47ed83a23e63a7a7e7d37478bc797fd83a6a2e9e995f7da636bb5c9f98404f01d2b84566c4460b0094793ae8f4e16aeb91000020004944415408d18b4215f91645c4dbdc991d6ea9f9fafcdec3cea0d3894c7cdc567bf76e766efeec53f5cf5e593c554bb417fa99f29b4a832d0180b86400611302794655aec84d8600007269c12267795964e5d966ed4e6befb87fa4828c92a97ee1ff24082774b2dc6d13384fa43429a5941e97119f9411b3e9765b0feedd393e39722d9fe3fdb832b9527a7e61596bafdb3e69b58e9a8937a9745a1ef5db6938b130e92f65dd93fdfbd7206d1d6cae15c5f0cc0b5ff626a6588120ba825d059284b3fe10acd5810e93b0728c48433a1d4efced37fff57f1d715faba9cdb635dee4f29557f293bd7bb73fdb2bae7d3f9044eb58b84930ed878d5a727a6e766ab2716a79b6d9c9661e0c02d602c828a59496d95a76fdfa220284b56efea5a5f9f6ce516195290782ead1d05c0f6b8d819f98be02b2864b280141fdc37ffc9f3fe1c55c170296a6587ff8f0cd377fb4bbbd352a3fc088db40406c34a7574ead8af0ddfbb7f374688cb5d6282dc21973a9fdba9f4c92e70d8ef7fa1b3707db0fbb27ad206904711d9547c85295bf201b0c8b61460aa27a82be46473c8b35c6b0576b94ad8f7ff443a82d1bddb0c602a08a9bd333b3bb1b9b409095b6cf7068ed96b577fbfd4ff6f77fbabbfde6fe83221f3ea7261563696d5aa4a535a52d5d9f38116945be52815249e899581ff6baa5800528d818bfb61206f365198c2ac722f0b8d37e54f643404e87838d8db5adcd75161e37878d750d80e617167ddf6fb58f7bddaec3b8cccc59e6e8f4c2da60f2746d62322d7ae9499a6edd3dea1c67fbebcb2fbeb674f5cbe1d4841001802dcb7490124010475e101866427181dc231df0fe8ffff25fe57b5b2d5293a7af9646236aa59075fcc2cb7fe5da47ef041ea006228dcc4a9180aed58228a4d5221630fd9241c4022392875a6b52a455d51481800a87e6ea5c633fed9683a1e45e6965d72fae05c1a9a43191b623721c031033bbf6ea115c0061e9b63a0fef3f68758ec7cae5e2258bb088e785535333ccf6e8e8506c0920e3fe0dc502f99087adac77980e5b4c18cf2e525c2bfa47fd1b3f5dfbeeff7ae35fff8b935b9f733600907c90338be7fb7e1c5ae1514d16019487fd37fee57f7be7fa67e2072f5d3dd3dfb91e62a11529c1208898e22b2f7cad28c85ab66cd9221844e6a2286687e5b37e332f0b634b110ed04bb49ff87ea8b44f8a40a1a06b1dd082b576fecaca729d7b13e5d04bcbbc286e957cd78b0ad20840021a51fdc99ffca963da473e46f23cdd5c5f7fe38def1fecef559db94f1a21c0f4dcc2e2c252960defddbbcda6746e431e075452d1c4c2d3af04138b395b261fbc0048439ee9dea11caeb536ee9bc27861c44600249e6c907654ac7b8928b09db5b7defd57ffe354a37970d819f4bb579f3df7e0fecdb03e4dca03244045e84d4c4eecef6e13006904a514e2a4947fb47c65a95f6a214feb507b9ea735200abb28cf500563ed9ab9adad053ed4c376eb04ac97aa280b23cb741aa5667287a0d43ff8877f3a06884e16837eefb36bbff8f18fdfceb2f4b1685c91464488ce9fbb1886d1c9d1c1c1c18e88614758125acb88604845f397565efced0baffef6ccf25346c80a82524cc46ccca045edbd7ceb616fff8082a8363b17d413477754d685ece5dbffe67ffab385d0d33eb1b5bb3b277e00cf5f3eb3b5b5539b98b3a00580b820cf8fe3daf1de1e7aa245962dfca7179ebb5c061151a8bc5007dacd7d812021bb53ac3ab1182bbe4f419e35a6eb6dd39541614b35d43a151d13ac70a1c502b01e6b889b6434c6f47abdf5b5b55eaf23a3672c2301d09e17c7099be2e8709f8d61b1848a81998510598455d45838174d2deba43e5bab4f2d2eefaf3f58fbece7bd9d073688a9ef9be1091f3f80e1f1d1de7dd9fb067cf9b5787e19b5220221d452bcf7fffe333ed9f326a6d2228b6ac130d5d7ae3d128b4f9f59bdbb75bbbe70010531f0b0c0f9c5d37e9197076baf2d2d7eb9d658282126f2c877876f9ddf444261572044572374a56e00605680b593fea5d9666f7038d9ef0c7a30a82ffcc27ae7213a27c617abfefe3ff8c72222600544d81a536c6d6ebcfdd61b9b9b1baece3392120b0803cdcdadcccdcea5c3e1dada036b0d8e4c031159989447f5a5852b5f9d3afbb40a022404cf4ba666a79756c86fa4064a162be22b550e5ad43b84ddb5cef6a6461d4ecc6118939872fffadbfff2bf4f884589111bc57151e486657fffb81607a716278e0f0e35e95ebf1f45b5321d2e25f5cb61e3b21f9e45aa6bed2b4d88e378e2a8ff319b0260abdc0648aa2620c182c328c86bb63b18482e85f57abae65b7b0acb108dfa7b7fff1f8da33b5b9b67d9ddbb77de79fb8d5eaf3b1eb47cc20df9abab67e2383e3adc3b3adc7f9ca08c981d0b5e63e5cac29557ebf32ba45cf70b89b01f2513f3cbcd99b91275615559484084d694c303afbd61d6eee6adb61fd7825af897ffcb7f694fd64b5384b11f27b53ccdbd20a8d7eabd6e777feb78652ab8508fd3bd565c9b3c3a69f9719d400725a559e62b9e0d4225563b488d552df309ff399afb151674e3cdec4aa29897c1941a6026034b05762ce5c22b6427d0e8714254985221a4c3e1eed6d6c9c9b1b5169e78840508fc90925a5214f9e1c991b506d0911650c90881bda0367f3a9e98716de6c2e2faea19818270eadc538d99f9edd995edbb9f661bb7bd93ed3057ddf424dbbb61bafbe9a34f6a2f3d777cff4355e4611c1645599a7eb3d16ced1f9081f313f59514beedcd9c01cf7b6af1933eff22a9afe72613ca944ebde0f6b0eff1f04a33a6d2002aa9aa9a0e9412a08018d7a95280b1604481d19691512120682bab2b71c61ddc69a5a56e15fa9691b948e9b1934100b6b6d7edecec6ea769fa64f04274491cc44922084559f4ba2d668b48223cae1e0a828a27a3c96515d618a43a3ec471c6c822e0478da5f3bad66ccd9d3ab9f3d970e77683422a8efbe981da6ca58d0dccbb9e0e8bbcd09e177baa7b7c3899175793c9afad5e3c275e6400856578f80a05750c279076f2a2b445a9d450fbb7fadd48c9e924f6f997cf0dc03233414139870c534a4fc5aaa1fcba824029ad10d070197bd44f8c1df6e78f5b9ae36d435ba81e0fd411a2b5dceb750ff6f74a5b1028a87811377b0502546f4c28c47e362cf25c1e7323ae055998a9d6988b26e7bd3064cbae45410010195d4f86c5bcc80d4a7d6e697a79e9707165f7faccf0dee7713b0cd561ea0df51468df1ff4b3b81e33b33a69fd5663eee5b3b397300a4b8b280c2816089436e9b2a4887143fb873a288bcc474f917ed03e49c95c8a9aa1b5ae580280259acc2b799a68290a57eac1ac1f4c453ad2142aa85c168a656b0167fde1d18d629899be5809b732a3c78d5122628c69b75b87477b84222ca3be2982eabe024c92ba26d56bb76c69ab2c1740dc9c1ea05018cfac84f54945ae290d0005515884904018184c9a6bad751804b568e9caf3932b2b07a72fed5ffb79f1e893c0db4b2693619a4e4fc4133ece95f2edb3179fe35a6ced680a41100401add8bc286245e7741e1250867de505c80d5fdb9c6eb74e121dac7a4168ad011878b99da1e05c237c2a89976a5133562191e7a1eb9186eada09118b482bc1eca52f2df7db1bc5239be678907b8f271611d158db6ab53addce283b1d59b1208bd5be1f8681b5b6db6b03f2a829d4f5a30008a8a8114f2c8471bd6a51729715889bb40400b06569ad05223f0e48a3d29e9e9e8f5f9e6c2c9ed9fbc56af7fa5b4f75e8d5d933c3ee5190e593da1eefecee85930b5112a98046fd8f864dce051269241fe9a95802288fd26cc86c4550fc1af283d6a19e9a9d274aa3c2bb98d49f9bacaf366b3309f8a034557406d851e31c2a04c308203ac0f32f2c1fecb439ede24e6e0ad044d5dca208e779deed76b3ac20d448584d78563c900ec3c8f73dcb799e650ad5d8ad2020b300a01f4d868d592f0c65d41e218c231adcf557140cae8197ac152201440afcc9d367e2466d6f66f6ce27ef24bdddd9a228a1dbe1f2ba6d7739bf28cdd5a036a56b5a94282c804b010fc14752c258148bbe22238779d113087ddf96a66bf876a78b53dec2d585da8b53f14a2d4802a549100018aa914c24c231bb3abe3ca339915cba7abab37f2bed6460505355f9130028cbb2d3e99445e9cc72dc52e69c5d14d7897459946551c848b9c64d06963cbf391b36a7d4684aba6ad560719ddbcc5c16253307be3ff2fe844202a03c88e6664f255f8d6b33e94fb5bff6999f5169d3010cee71bf656c4bf2d33a9b0feabef825974a4811695202408221f35c1808182a0a23907a9115d92f0beaf4136d574e4fa8448de00f8fd686a38b3aaa28e2e6b3482b546af9ecdcd92f7607271b9d6ca01109b19a2ccdb3acd36a3f1e93241a2369246a36273ccfeff73ac61845aeb150dc1d2b88c4caaf4d2ff8511db5ae4e6304a0082ab6c094a542f43c6fcc9c8954dd9288a0504f003f373111cf2f1d9cd876da1e02f64c7aa8b254d9034e2fd862de4691a85825bed2e0883711644950968284047733e9936f0435fbddb47beddd473397a7169e9f43ad60444b806ba71c1d6255da454600610492b0a6cf5f593cdc6adbdea126d48e6d06943ccffb83dea8111ac68a80888c18453122a4e9c045b44a0300d8b50705493231efc735d1341a1ea9aaa50240005c5814f03c8f94425088ceb42d22822841e66c30d9debfd87934a7fb9de9fad680d63b1232a7d64bcb72233429744eeb7c1562628a502168ae6eb940040c5916bcb000ee176840aca71427dda3939ffef9b56fce7ca9b13ca1d46806e171f897d151d9519bbdb8fd34a693a75e58eeecb6f5d88e4cc969960d87a933aec72f424200221d451122655986882e710374de0504c80feb3a697a71a2488d782fb41578450030b604115255581d0fdd222203230b773b8df6ee64d6aa639e104d46c1829edbecfbdb79a7cdd8077b2865a6a0ebf35945a59566a903f22b59330a80af68c6cf4d04477de895080a0592cddbad0f7f70fb956f3fdb98af011288001ab7f88abef835ba19003d4f2fac4e9db9baf84b777764699a0e5322351ac618171fc0f7c3300850241ba4e3991fc793088220796123ae4d7a41408a46dd47a0e0b12f676b95efa930505ab9520f8154c3f280620d755ab3c3939aebaf468c159e527e534fcd64dee6a0bb9ff57b8203b18f38efc6ed6e543beb8713a58d8d0f1238be7308d6bb503fbf1a87b74f766fa5a5d5057a80b59bef6d7a8de0e5bf7a29a9c70200a0dd053bc26cad5b43251aa59454f36c526f84a79f9ed7ce1d8bb03136cbb22ccf467baf9488d902811f865a6b1031a6ac88c7b1a61220eab036e14775cff71f5fbff44b58bc3206e569e7b3d1f1ffee6e24665b98a8d7ae0d8f158a42ed50940699f074a4271aca9f48bdcdbcdd41ec90ddc7b40fb61d9ab351b868211e7220111b3493a676796af2eaececd559febfaf1fddc8b0f44182bc575c7fe7617326b8f4f2e9288904b1cc25cff3b22c04dc6d1415e223023ff0c2304024a5f4ccdc9473a8ce4f439a0d8bbc70a4ea93380801a228d29e97a7a9b576e4bc2bfa510490b49f4ce9b8865abb8b949eac205552462444ed790a959b73c151364288a6b0d1a09de43d0516dcb0ba880540c040e152dc083ced0f682f6d47225da13ef27de9b5203b93d833493295221788a7c3e84cc36f067a523df307176ffc3ff78eae0fed9013f2d263f3f1ebf774a2cf5e5eb152e6a51197a88a755435331bc30092e7459697491c077e1486a4895c542601cab2a2300615b95ba140081114020304618ce85bdb6766529e543207b44c00a5525ed25041889a40118f934401276c49ab3b4494524228a40080ac5ba21001e56923ed263627421103e03cbfebb04726090817a3faa41f1de7dd8362b04f6587e0508a7ed91a4cdad5895a2308662f3692d948f964819bcbcd2ffcdee53bcd879b1f1ce92e041876f7869ffef86161ecc26ad30b7418046118babb6a9c5735c6946599e7795e9485e9477e99c471e5a499d95a331ca6c28ca0dc153130ba3b4601f861e4696fac8ace682c08113000e9c00f6b4194a006c6511904aa5251552d4444ad84101455e184aa929212a26cd828731fac831d8fdd9fd325400188b43fe925937e349975ebb6bb5f9427c03de03badee71d39e4a124f0fa63845a395d20c36596a5cf8dd0b54d35b3fdfce4e38c6b8bf5fdefe784ba4bcf0cc995a2d2152ae1141400441795afb5e1086fd2c1d0eb2e160684bab11c5816963ca344d5900ab66dd11a64214a4388895d6b66a067f8cf3509085c08bbc3051be26e58d4b8330ca811d578b88a41529b252bd45d0e14440115d6441daf7d9383247505010885c0199d92a0101f23d3f203ff28246e64f98fe9ef40e351db23968a5fd321f7ab6f0e9f4ea6cb3d108a2801192e9e8a9d7cee9babffdc98edd1958c6bccb0fee1cc413f1197f298c42116177d782eb646641c2388e09f5a03bc8f2426335a283c69834cd58acb86181515f8488b54c6114a3f28c65d45ac48e264bb4a05184e0873a49c0d34008008a2a26a0820b155e444f6b520a46bd4f88082c0c62d9ea7c18d8a172be10a56abaaa96e13a3ad023120204f4484f8653611ed759d7f34110e14948bdbc78f0a8d51b94c7fbdda72e2cce2f4cd76a3102858d60f9c5055517faeca87d3254a15f768b7bd73635d1dccaacf67d601eaf516b524aa150e0f9b6cebd4e5f2356d7dd1863b234835199acea7207414485e4fb21111a631011410bb2088c2eb603f47ccf8fb417101190bbb48fdd1b0400c40a02799ab412421150632b4241777e45e19b921490bb144648aac97f72ede444448a8850d85d348735550b8dae994e2def6f7be541acba5c1ceef77bddf4f0a8f7f4d32bf38b9349ecfbbea77d1dcf25d397cbf0400dba85116fd82defdfd864e699a569778ba133e7b2b4b6101d68408a8230f7b3c77487b536cbb35176e224eab0253233290200b6c6991d547530402006503ad441a49422220174a17f3492014e52a414fa9a947acc838aebdf56002a10abc5a0a34ddc5055d582e0e608dc8d1748823c726b44a87538a535594f4937a8c1a156dd619ee6fce0d149ab952ecc37e3c49b9d6dce4c3745246c0651a8bc83c1a09b5109fd9374edfebef2f5c2f29cef7b6cd95a2e4dc9c250a252000849103e26ccace5a2c810c95d39e79cb188e0a8d540d81a534d3eb9ffb9241e855069a543ad3d05c48fa14f85a42b6b4254e82ee919010842117633409a450923687043c058bd629caf21002180300170950c210182d22146f3737ee3825eaacbe6eed1de7ebfd3cf0f0ffb874743619e9b6b9e3edd5c5898989da927d309f99a7611baa92d6cb7d5dd78a47ddf6b4e24884a6bad108c65531608ae0ece950f7251cc9406c6de61d444e404404a018031164141053d5d3d159880b44697433ce17aa4aabab87b705c37c9e833a3c9080442141241661c35753e8e02d57504088c28382a6e8e1196b088b01834fe74327171524da8daa45fafb7b6b74ff60e879dbef4fba63f3c6229fdc89b9d6f7aa14ea663116bc998aee50c4ef63bf70166e79b7112d4ea49ad1623a2310640942266d6e31cc418b6564458bb9362761929239022adf5f89a2991d10f231992f2c85340585d0854ed10915040c45ae5fa7500c6fa25a340eee28047a04114b82920198d5629578c1b410e102404266111141416561644b1255191aa4dd44ef91445811710e311a16153c635ed7bda47ad10413088029e142bc8d4f186b63bc88ef77b69bf08233535df9c999f087dcf94cc863c4f8b881e131acc6cd9ba3e86713ef9241aae1acf1e87f08a8a86c7ed9800e0ae4e1919d9e82140fb846ae0137f5ebdd55190f838c37665dcea1eb68aa06091d11505c0ae57aaeaeab4ec3ae7c23898999d70795214b6574e45b373938147cd66444a480121fa911fd78d3109c3c033ba1816bd7e3648b1d5cd8e8ffb3333b538f692387265a2276fe2641057a8b02e8794f15da98ff35e76a7ee5c8073e402388edc23b1c878280e47ff844f74d0f038563a032402a5889eb890a86acdb363368a9865346050054077452c00011863852d91804810787373f520d2a75667b5a6248eb32ccb8bc2f33491208a5210244102025a0db31664a56123e5ffd7d5b934376e1c71fcdfdd33000890942cadfc489c4795abb2f9fedf20b71cf2ac4a25a7d8cec1b1e3b57625522230c074770e33003761f126b1480c66faf1efee1fe8ddfbf3375f3f7ef9e5eddbdf7ed1b56d084e4461db235cbdbb83481d0caf12539923772318c3a5b06609455d323730bb95a55bc14375506d6d77240613b47059b761b5ba6a0e8083c63653e3085cbe71c527ba1b6070af01117cab8e965b66c4c1a093daac706611168426b67dbf7e3b9dcf82b399997004798c62867edf4a103555e434c9655ac645dffd788e517ef58b5b793816424fd80c0111b10881cc0beb6705347f74beb6e87f3d2c4e443043765373cba583d2b78f5c0f59dd815e1985ffd32e012665c9a171a6acc695125d57bbe05a1559ac60a37dc32e956c4d28fa65d15181158ab2eec4e28276bbddb22c251e160eeacebc001c1b1986e6ee7effe1717cbd645bfc7249f39485030011c966fcb19511665ac7b5d7fb0614b0a51ba1ca5debb9afb110399b6668b6cd0403ceb439e9eb895897c4d695f6eaf5284b508e6656bcc2d6ed478059e9b78241abeb5bafbfb84b01d168f66a50670e81858844b8bc99b96d9bb66d99799933113163b7eb42e01038361c0288754c694ef9e1fef0c5cf6e7603b76d60e6e9750aab29a12031c66856094c582da5a951846525a218e2b615808ab42662f3e4cba459e1ca2e5a8a245e6d57b13859d517e5b66457859d7add61dab439340ec866f8564f096246004c61e65a4c0133d72e472221e1d1f571cea3b5fbe0940378935c4488391c0e7bcdbacc4b90d07691c8b9eb822c911185429459a3c8eecd27bbdfbcbdbfbb1f62d7ce695e4c835751464442a14bf9fa2a2c216626475e32c0b189f54f159c8b32476929cd735a317e46ffdb3550556db36cb9c1b6ad8ab5afa4efdc7453b34b0e21a75296297e81aa8dbe0608c512d4035ef1488d36fa98d239ed3f3d8834be925d50953b6ddbd80fbb719c529a24a0ebda104208c162e89a66180ec7e3f47ad17ee8eeeedab60b73ca97b4480c61352e10914adf5cf58a6a6ec0663a2fa3b9c61837530480cc6b789b932da3e639ebff63a437630cc0b444765ef5c5eae71c2cbeeb2fbb7d820d56c738ca12968852888253069b71e4c0853f4fbe956f5a34a71fd3f2d3a8bf50ea0393c0a1ec4420737276d030f400e639a5792696ae8bb189999d9843f4aeef52ca2136c498d37cb94c0c6afb5d30cbcc4ce44dd31424abdaf2f1a5c1dc3da76932b5186249970073a3026f82292c2de359e7a5b946e157c543eb8970cbea664a1571e4705eeb2fd6f72ffd31851df2b9dc77aa536756ea0622a29ae1b543bc1cc2f26106c1999f2d7f37e5af96b88bccece20c5aa784bdc08d43082f2f2fd3345f2e9794a4699a1863e9892633e630cd731a473367f6aedbed8f87e2c594c843e4beef51aedf7de305964b9d5272f726462a08e36a1f4a6460ae299d4f9a127bb12e6bebff8a9d2f385356773589b5adad86db4e02b1b61d8f6f52d8bb9eeb9af1c6eb0003c2c2569a9d5dea0667272b3b084cbd76e99b97f1ed6b7bd7c52e388a18608402cb6077670ec7e3b16dd338a6699ac6318d630240e4d52412983946eebad8b52db3878d9c2f42fdb017e194d5fd1aad95dc344da3b9510c5ee999e4f03294a220775ba6539e47527752e250aebfe84602270107d26caad64464608b9cab58d435affd6d1a1e96f443b316e6d620cae1145816b0b92b345074b73a6858b471f3e821ff274d5f3f8f9fb5cd17774408908f65f19a1c9014a5b569c23c2f665e3aa18af4cacc4d1b9aa6e45570f815b8ddb6ed61bf0f812911aea02f94de85295db2e6189ad036cb98e15e72f90ae0735d2ecf3abe9a668a4188152033a076c0c09d43c8396bceeeb186025e826328c022fac9f1c3f1e1f30f6d402ac79389e01583cba8a7cccc8ac2506284b24dcbffc724cb3fcee9b33e0dfdf049bf2a37e554d2d6af5316a2effbddaef80b5bf367b91a507773c395510330f3f178ecda9edc7935c3a50b8f1ce37431d51863dbb64a30e27524a56462be9cdfa7f3876599ddc9d5a4409cca1771e11944102ce73551abbe0080939170beb979bafb746c066292a2891115f05a79450970e8365150d3985a1800d0502bdffbe92fef5efff5385f663019dcddaa19dbe484f5258143e418393612028748c4ab0a4ad559f1e671436886a1ef87a18c8612414b2e0107d8b3a5791291433f902b2c3350c0f8e2e4a4f3e5797c7ad679914268365f394b44e6808586c1aeba905bc5d733d54113b083c37e78beb97fe91f32859ae995acaf94f498034b603120e599580452a7f1210c610e44dc79f46fe7e7bf3e3dfffb945212626281947d71bd585adbe25667c4cc91100804321687139310e86a86897cd80fc7e3710de11d50772b250c539dc689996f6e6ecd0cb8ead20e67779dcef3cb87653cd700718dd0b7063c1661aadaee96a9acb92d1ca0a699de7cf6eee6f3911b2b255baa2147d9ab0cea24c0a0ee6a86751f14605ee1ca30c921b5f6b7d7cb1f7e7afdf6697a99ca1da28f54a6f231e675de090dad63d740493703b19447265c8f98483c1c8e777777c20283ab1504af59499e703e9fcc31ec0f4cc1cc5067fbe06022125fc6a7ffa4cbe8a6d7d8876bc7b63b91080772374d696dce2503b4d6e8411c71f7e94f0f5f9eda010413268857f665c5de96875d387856cda5c059a182b496fa39583b5c9af94fef4fbf7ff7f2cd693a5fb64ed3b232a5524824cce54d1b83a4ae3988998841ece19a5833f7fd70ffe60d8b68a92f3b1759d4a1eefe7cfab0a8356ddb75dd940cb6655e0603585f4f3f8ca7f739ff32c6b5e44fa80d1825026ec232cf7999832a64051a11d1da2d4b37fbf39b2f3edcfcec613c0d6528683536eef589174d685f9794cd4455425cef43912819202388b7c30bbdfcf9747e517b5d96af0ebb9b3e84b0219a56ef73154f3e2667ae3106c1bd1eb1d2add1b6cdfdfd7d31eeeb7a170544419aa671c9a9699ac3e166cdcbddcc04c6d088657affdde5fdf79a12bc346cf976556583774d27c4cb9275c9452bac3fb782441c41e6cfbf7c77f7d553386442a508d47808e22042146a82c0ab7b767733b735e029a20c9113c230b5f6f7e9fcbbc7f31fdf9ffef9343d4fa67eb53b5bc254f6e0ba19dd800a4815dd1e5d531675d7ed1e1e1efabeffe8810eabd7834f699c2e97fef6f6f6f6f0e33b47a11faeea993ad978be3cfe30bebeec6e6eeb1962c63a5fe80041a469741c7556744c9b3441a5be2d70e29b9b0f9ffefcf4c3fd55c969a90000005349444154cde3d35e8243e1f5195825092150179bd1b2ba8ecbbc8b4d20760331190395be6e420484de64fe76393d7e7ffe75dbbd3db4bfdc0f9f0cb16f6217a53c518bea2fdcaeb4cc162ccb9c2ecbf474f92fe872cc677026d3bc0000000049454e44ae426082',NULL,'5.0','mm')")
     }
 
     private fun getMigratedRoomDatabase(): AppDatabase {
@@ -147,36 +220,30 @@ class MigrationTest : InstrumentedTestBase() {
             InstrumentationRegistry.getTargetContext(),
             AppDatabase::class.java, TEST_DB_NAME
         ).addMigrations(
-            Migration2, Migration3, Migration4,
-            Migration5, Migration6, Migration7,
-            Migration8, Migration9, Migration10,
-            Migration11, Migration12, Migration13,
-            Migration14, Migration15, Migration16,
             Migration17, Migration18, Migration19,
             Migration20, Migration21, Migration22,
             Migration23, Migration24, Migration25,
             Migration26
-        )
-            .build()
+        ).build()
         testHelper.closeWhenFinished(database)
         return database
     }
 
-    private fun assertTraining1(training: Training) {
+    private fun assertTraining1(db: AppDatabase, training: Training) {
         Truth.assertThat(training.id).isEqualTo(1)
         Truth.assertThat(training.title).isEqualTo("Training im Dez")
         Truth.assertThat(training.standardRoundId).isEqualTo(null)
         Truth.assertThat(training.bowId).isEqualTo(null)
         Truth.assertThat(training.arrowId).isEqualTo(null)
         Truth.assertThat(training.arrowNumbering).isEqualTo(false)
-        Truth.assertThat(training.indoor).isEqualTo(true)
-        Truth.assertThat(training.weather).isEqualTo(EWeather.SUNNY)
-        Truth.assertThat(training.windDirection).isEqualTo(0)
-        Truth.assertThat(training.windSpeed).isEqualTo(3)
-        Truth.assertThat(training.location).isEqualTo("Neufahrn bei Freising")
-        val rounds = TrainingDAO.loadRounds(training.id)
+        Truth.assertThat(training.environment.indoor).isEqualTo(true)
+        Truth.assertThat(training.environment.weather).isEqualTo(EWeather.SUNNY)
+        Truth.assertThat(training.environment.windDirection).isEqualTo(0)
+        Truth.assertThat(training.environment.windSpeed).isEqualTo(3)
+        Truth.assertThat(training.environment.location).isEqualTo("Neufahrn bei Freising")
+        val rounds = db.roundDAO().loadRounds(training.id)
 
-        assertRound11(rounds)
+        assertRound11(db, rounds)
 
         Truth.assertThat(rounds[1].id).isEqualTo(2L)
         Truth.assertThat(rounds[1].trainingId).isEqualTo(1L)
@@ -188,10 +255,10 @@ class MigrationTest : InstrumentedTestBase() {
         Truth.assertThat(rounds[1].target.id).isEqualTo(0)
         Truth.assertThat(rounds[1].target.scoringStyleIndex).isEqualTo(0)
         Truth.assertThat(rounds[1].target.diameter).isEqualTo(Dimension(60f, CENTIMETER))
-        Truth.assertThat(RoundDAO.loadEnds(rounds[1].id)).hasSize(2)
+        Truth.assertThat(db.endDAO().loadEnds(rounds[1].id)).hasSize(2)
     }
 
-    private fun assertRound11(rounds: List<Round>) {
+    private fun assertRound11(db: AppDatabase, rounds: List<Round>) {
         val round1 = rounds[0]
         Truth.assertThat(round1.id).isEqualTo(1L)
         Truth.assertThat(round1.trainingId).isEqualTo(1L)
@@ -203,15 +270,15 @@ class MigrationTest : InstrumentedTestBase() {
         Truth.assertThat(round1.target.id).isEqualTo(1)
         Truth.assertThat(round1.target.scoringStyleIndex).isEqualTo(2)
         Truth.assertThat(round1.target.diameter).isEqualTo(Dimension(40f, CENTIMETER))
-        val ends = RoundDAO.loadEnds(round1.id)
+        val ends = db.endDAO().loadEnds(round1.id)
         Truth.assertThat(ends).hasSize(3)
         Truth.assertThat(ends[0].id).isEqualTo(1L)
         Truth.assertThat(ends[0].roundId).isEqualTo(1L)
         Truth.assertThat(ends[0].index).isEqualTo(0)
-        Truth.assertThat(EndDAO.loadEndImages(ends[0].id)).isEmpty()
+        Truth.assertThat(db.endDAO().loadEndImages(ends[0].id)).isEmpty()
         Truth.assertThat(ends[0].exact).isEqualTo(true)
         Truth.assertThat(ends[2].exact).isEqualTo(false)
-        val shots = EndDAO.loadShots(ends[0].id)
+        val shots = db.endDAO().loadShots(ends[0].id)
         Truth.assertThat(shots).hasSize(4)
         Truth.assertThat(shots[0].index).isEqualTo(0)
         Truth.assertThat(shots[0].x).isWithin(0f).of(-0.41206896f)
@@ -226,74 +293,20 @@ class MigrationTest : InstrumentedTestBase() {
         Truth.assertThat(shots[3].scoringRing).isEqualTo(0)
     }
 
-    private fun assertTraining2(training: Training) {
+    private fun assertTraining2(db: AppDatabase, training: Training) {
         Truth.assertThat(training.id).isEqualTo(2)
         Truth.assertThat(training.title).isEqualTo("Training")
         Truth.assertThat(training.standardRoundId).isEqualTo(32L)
         Truth.assertThat(training.bowId).isEqualTo(1)
         Truth.assertThat(training.arrowId).isEqualTo(1)
         Truth.assertThat(training.arrowNumbering).isEqualTo(false)
-        Truth.assertThat(training.indoor).isEqualTo(false)
-        Truth.assertThat(training.weather).isEqualTo(EWeather.LIGHT_RAIN)
-        Truth.assertThat(training.windDirection).isEqualTo(0)
-        Truth.assertThat(training.windSpeed).isEqualTo(3)
-        Truth.assertThat(training.location).isEqualTo("Neufahrn bei Freising")
-        val rounds = TrainingDAO.loadRounds(training.id)
-        Truth.assertThat(RoundDAO.loadEnds(rounds[0].id)).hasSize(6)
-        Truth.assertThat(RoundDAO.loadEnds(rounds[1].id)).hasSize(6)
-    }
-
-    @Test
-    @Throws(IOException::class)
-    fun upgradeShouldKeepModel() {
-        val upgradedSchema = extractSchema(upgradedDb!!)
-
-        val newFile = File.createTempFile("newDb", ".db")
-        val newDb = AndroidDatabase
-            .from(SQLiteDatabase.openOrCreateDatabase(newFile, null))
-        helper!!.onCreate(newDb)
-        val newSchema = extractSchema(newDb)
-
-        Truth.assertThat(upgradedSchema).isEqualTo(newSchema)
-        Truth.assertThat(upgradedSchema.isNotEmpty())
-    }
-
-    private fun extractSchema(db: DatabaseWrapper): Set<String> {
-        val c = db.rawQuery("SELECT name FROM sqlite_master WHERE type='table'", null)
-        val schema = TreeSet<String>()
-        c.moveToFirst()
-        while (!c.isAfterLast) {
-            val tableName = c.getString(0)
-
-            val cu = db.rawQuery("PRAGMA table_info($tableName)", null)
-            cu.moveToFirst()
-            while (!cu.isAfterLast) {
-                val columnName = cu.getString(1)
-                val columnType = cu.getString(2)
-                val columnNullable = cu.getString(3)
-                val columnDefault = cu.getString(4)
-
-                schema.add(
-                    "TABLE " + tableName +
-                            " COLUMN " + columnName + " " + columnType +
-                            " NULLABLE=" + columnNullable +
-                            " DEFAULT=" + columnDefault
-                )
-                cu.moveToNext()
-            }
-            cu.close()
-            c.moveToNext()
-        }
-        c.close()
-        return schema
-    }
-
-    companion object {
-        @BeforeClass
-        @JvmStatic
-        fun prepare() {
-            FlowManager.reset()
-            FlowManager.destroy()
-        }
+        Truth.assertThat(training.environment.indoor).isEqualTo(false)
+        Truth.assertThat(training.environment.weather).isEqualTo(EWeather.LIGHT_RAIN)
+        Truth.assertThat(training.environment.windDirection).isEqualTo(0)
+        Truth.assertThat(training.environment.windSpeed).isEqualTo(3)
+        Truth.assertThat(training.environment.location).isEqualTo("Neufahrn bei Freising")
+        val rounds = db.roundDAO().loadRounds(training.id)
+        Truth.assertThat(db.endDAO().loadEnds(rounds[0].id)).hasSize(6)
+        Truth.assertThat(db.endDAO().loadEnds(rounds[1].id)).hasSize(6)
     }
 }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
index 841df7655..4166bf1af 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/main/MainActivityTest.kt
@@ -30,6 +30,7 @@ import android.support.test.espresso.intent.rule.IntentsTestRule
 import android.support.test.espresso.matcher.ViewMatchers.withId
 import android.support.test.runner.AndroidJUnit4
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase.Companion.ITEM_ID
 import de.dreier.mytargets.features.arrows.EditArrowActivity
 import de.dreier.mytargets.features.arrows.EditArrowFragment
@@ -46,9 +47,6 @@ import de.dreier.mytargets.features.training.edit.EditTrainingFragment
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.EBowType
 import de.dreier.mytargets.shared.models.Target
-import de.dreier.mytargets.base.db.dao.ArrowDAO
-import de.dreier.mytargets.base.db.dao.dao.BowDAO
-import de.dreier.mytargets.base.db.dao.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.shared.models.db.Training
@@ -125,7 +123,7 @@ class MainActivityTest : UITestBase() {
         onView(withRecyclerView(R.id.recyclerView).atPosition(1))
                 .perform(click())
 
-        val firstTraining = TrainingDAO.loadTrainings()
+        val firstTraining = ApplicationInstance.db.trainingDAO().loadTrainings()
                 .sortedWith(compareByDescending(Training::date).thenByDescending(Training::id))
                 .firstOrNull()
 
@@ -136,8 +134,8 @@ class MainActivityTest : UITestBase() {
         clickActionBarItem(R.id.action_statistics, R.string.statistic)
         intended(hasClass(StatisticsActivity::class.java))
 
-        var expectedRoundIds = TrainingDAO.loadTrainings()
-                .flatMap { t -> TrainingDAO.loadRounds(t.id) }
+        var expectedRoundIds = ApplicationInstance.db.trainingDAO().loadTrainings()
+                .flatMap { t -> ApplicationInstance.db.roundDAO().loadRounds(t.id) }
                 .map { it.id }
                 .toSet()
         intended(allOf(hasClass(StatisticsActivity::class.java),
@@ -164,10 +162,10 @@ class MainActivityTest : UITestBase() {
                 .perform(click())
         clickContextualActionBarItem(R.id.action_statistics, R.string.statistic)
 
-        val trainings = TrainingDAO.loadTrainings()
+        val trainings = ApplicationInstance.db.trainingDAO().loadTrainings()
                 .sortedWith(compareByDescending(Training::date).thenByDescending(Training::id))
         expectedRoundIds = listOf(trainings[1], trainings[2])
-                .flatMap { t -> TrainingDAO.loadRounds(t.id) }
+                .flatMap { t -> ApplicationInstance.db.roundDAO().loadRounds(t.id) }
                 .map { it.id }
                 .toSet()
 
@@ -183,7 +181,7 @@ class MainActivityTest : UITestBase() {
         // openBow
         onView(withRecyclerView(R.id.recyclerView).atPosition(0))
                 .perform(click())
-        val firstBow = BowDAO.loadBows().sortedWith(compareBy(Bow::name, Bow::id)).firstOrNull()
+        val firstBow = ApplicationInstance.db.bowDAO().loadBows().sortedWith(compareBy(Bow::name, Bow::id)).firstOrNull()
         intended(allOf(hasClass(EditBowActivity::class.java),
                 hasExtra<Long>(EditBowFragment.BOW_ID, firstBow!!.id)))
 
@@ -195,7 +193,7 @@ class MainActivityTest : UITestBase() {
         // openArrow
         onView(withRecyclerView(R.id.recyclerView).atPosition(0))
                 .perform(click())
-        val firstArrow = ArrowDAO.loadArrows().sortedWith(compareBy(Arrow::name, Arrow::id)).firstOrNull()
+        val firstArrow = ApplicationInstance.db.arrowDAO().loadArrows().sortedWith(compareBy(Arrow::name, Arrow::id)).firstOrNull()
         intended(allOf(hasClass(EditArrowActivity::class.java),
                 hasExtra<Long>(EditArrowFragment.ARROW_ID, firstArrow!!.id)))
 
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt
index 87d31df57..437e3ad65 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/statistics/StatisticsActivityTest.kt
@@ -24,7 +24,7 @@ import android.support.test.espresso.matcher.ViewMatchers.withId
 import android.support.test.espresso.matcher.ViewMatchers.withParent
 import android.support.test.runner.AndroidJUnit4
 import de.dreier.mytargets.R
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.test.base.UITestBase
 import de.dreier.mytargets.test.utils.rules.SimpleDbTestRule
 import org.hamcrest.Matchers.allOf
@@ -46,8 +46,8 @@ class StatisticsActivityTest : UITestBase() {
     @Test
     fun navigationTest() {
         // Add round ids
-        val roundIds = TrainingDAO.loadTrainings()
-                .flatMap { t -> TrainingDAO.loadRounds(t.id) }
+        val roundIds = ApplicationInstance.db.trainingDAO().loadTrainings()
+                .flatMap { t -> ApplicationInstance.db.roundDAO().loadRounds(t.id) }
                 .map { it.id }
                 .toList()
         val i = Intent()
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt
index c190a04a1..fee4505e6 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/ScoreboardActivityTest.kt
@@ -29,10 +29,10 @@ import android.support.test.espresso.matcher.ViewMatchers.withText
 import android.support.test.runner.AndroidJUnit4
 import android.support.v7.preference.PreferenceFragmentCompat
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.features.scoreboard.ScoreboardActivity
 import de.dreier.mytargets.features.settings.ESettingsScreens
 import de.dreier.mytargets.features.settings.SettingsActivity
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.test.base.UITestBase
 import de.dreier.mytargets.test.utils.matchers.IntentMatcher.hasClass
@@ -54,7 +54,7 @@ class ScoreboardActivityTest : UITestBase() {
 
     @Test
     fun navigation() {
-        val trainings = TrainingDAO.loadTrainings()
+        val trainings = ApplicationInstance.db.trainingDAO().loadTrainings()
         trainings.sortedWith(compareByDescending(Training::date).thenByDescending(Training::id))
         val id = trainings[0].id
         val i = Intent()
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/TrainingActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/TrainingActivityTest.kt
index 7a2516831..2dd9c9683 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/TrainingActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/TrainingActivityTest.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.features.training
 
-
 import android.content.Intent
 import android.support.test.espresso.Espresso.onView
 import android.support.test.espresso.assertion.ViewAssertions.matches
@@ -24,8 +23,8 @@ import android.support.test.espresso.matcher.ViewMatchers.hasDescendant
 import android.support.test.espresso.matcher.ViewMatchers.withText
 import android.support.test.runner.AndroidJUnit4
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.test.base.UITestBase
 import de.dreier.mytargets.test.utils.matchers.RecyclerViewMatcher.Companion.withRecyclerView
 import de.dreier.mytargets.test.utils.rules.SimpleDbTestRule
@@ -42,14 +41,15 @@ import java.util.*
 class TrainingActivityTest : UITestBase() {
 
     private val activityTestRule = IntentsTestRule(
-            TrainingActivity::class.java, true, false)
+        TrainingActivity::class.java, true, false
+    )
     @get:Rule
     val rule = RuleChain.outerRule(SimpleDbTestRule())
-            .around(activityTestRule)
+        .around(activityTestRule)
 
     @Test
     fun navigation() {
-        val trainings = TrainingDAO.loadTrainings()
+        val trainings = ApplicationInstance.db.trainingDAO().loadTrainings()
         Collections.sort(trainings, Collections.reverseOrder())
         val training = trainings[0]
         val i = Intent()
@@ -60,12 +60,12 @@ class TrainingActivityTest : UITestBase() {
         //                .respondWith(new Instrumentation.ActivityResult(Activity.RESULT_OK, null));
 
         onView(withRecyclerView(R.id.recyclerView).atPosition(0))
-                .check(matches(hasDescendant(withText(containsString("50m")))))
-                .check(matches(hasDescendant(withText("212/360"))))
+            .check(matches(hasDescendant(withText(containsString("50m")))))
+            .check(matches(hasDescendant(withText("212/360"))))
 
         onView(withRecyclerView(R.id.recyclerView).atPosition(1))
-                .check(matches(hasDescendant(withText(containsString("30m")))))
-                .check(matches(hasDescendant(withText("203/360"))))
+            .check(matches(hasDescendant(withText(containsString("30m")))))
+            .check(matches(hasDescendant(withText("203/360"))))
 
         //        onView(withRecyclerView(R.id.recyclerView).atPosition(1))
         //                .perform(click());
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt
index 1d9b6aee7..f545e9f59 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/input/InputActivityTest.kt
@@ -14,7 +14,6 @@
  */
 package de.dreier.mytargets.features.training.input
 
-
 import android.content.Intent
 import android.support.test.espresso.Espresso.onView
 import android.support.test.espresso.Espresso.pressBack
@@ -24,9 +23,8 @@ import android.support.test.rule.ActivityTestRule
 import android.support.test.runner.AndroidJUnit4
 import android.support.test.uiautomator.UiObjectNotFoundException
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.features.settings.SettingsManager
-import de.dreier.mytargets.shared.models.dao.RoundDAO
-import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.views.TargetViewBase
 import de.dreier.mytargets.test.base.UITestBase
@@ -53,19 +51,19 @@ class InputActivityTest : UITestBase() {
     val rule: RuleChain = RuleChain.outerRule(object : DbTestRuleBase() {
         override fun addDatabaseContent() {
             val generator = Random(3435)
-            val standardRound = StandardRoundDAO.loadStandardRoundOrNull(32L)
+            val standardRound = ApplicationInstance.db.standardRoundDAO().loadStandardRoundOrNull(32L)
 
             val (id) = saveDefaultTraining(standardRound!!.id, generator)
 
-            round = Round(StandardRoundDAO.loadRoundTemplates(standardRound.id)[0])
+            round = Round(ApplicationInstance.db.standardRoundDAO().loadRoundTemplates(standardRound.id)[0])
             round.trainingId = id
             round.comment = ""
-            RoundDAO.saveRound(round)
+            ApplicationInstance.db.roundDAO().insertRound(round)
 
-            val round2 = Round(StandardRoundDAO.loadRoundTemplates(standardRound.id)[1])
+            val round2 = Round(ApplicationInstance.db.standardRoundDAO().loadRoundTemplates(standardRound.id)[1])
             round2.trainingId = id
             round2.comment = ""
-            RoundDAO.saveRound(round2)
+            ApplicationInstance.db.roundDAO().insertRound(round2)
         }
     }).around(activityTestRule)
 
diff --git a/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt b/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt
index 46b156bbb..1f0c90b75 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/StandardRoundActivityTest.kt
@@ -26,9 +26,9 @@ import android.support.test.runner.AndroidJUnit4
 import android.support.v4.util.LongSparseArray
 import android.support.v7.widget.RecyclerView
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.navigation.NavigationController
 import de.dreier.mytargets.features.settings.SettingsManager
-import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
 import de.dreier.mytargets.test.base.UITestBase
 import de.dreier.mytargets.test.utils.matchers.RecyclerViewMatcher.Companion.withRecyclerView
 import org.junit.Before
@@ -56,7 +56,7 @@ class StandardRoundActivityTest : UITestBase() {
     @Test
     fun searchTest() {
         val i = Intent()
-        i.putExtra(NavigationController.ITEM, StandardRoundDAO.loadStandardRoundOrNull(32L)!!)
+        i.putExtra(NavigationController.ITEM, ApplicationInstance.db.standardRoundDAO().loadStandardRoundOrNull(32L)!!)
         activityTestRule.launchActivity(i)
 
         clickActionBarItem(R.id.action_search, R.string.search)
@@ -76,7 +76,7 @@ class StandardRoundActivityTest : UITestBase() {
     @Test
     fun recentlyUsedTest() {
         val i = Intent()
-        i.putExtra(NavigationController.ITEM, StandardRoundDAO.loadStandardRoundOrNull(32L)!!)
+        i.putExtra(NavigationController.ITEM, ApplicationInstance.db.standardRoundDAO().loadStandardRoundOrNull(32L)!!)
         activityTestRule.launchActivity(i)
 
         onView(withRecyclerView(R.id.recyclerView).atPosition(0))
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
index 1245e525f..a2076f768 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
@@ -23,9 +23,7 @@ import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.EBowType
 import de.dreier.mytargets.shared.models.EWeather
 import de.dreier.mytargets.shared.models.Thumbnail
-import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
-import de.dreier.mytargets.base.db.dao.ArrowDAO
 import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.shared.models.db.Training
@@ -44,17 +42,14 @@ abstract class DbTestRuleBase : TestRule {
         return object : Statement() {
             @Throws(Throwable::class)
             override fun evaluate() {
-                ApplicationInstance.initFlowManager(context)
-                SQLite.delete(Arrow::class.java).execute()
-                SQLite.delete(Bow::class.java).execute()
-                SQLite.delete(Training::class.java).execute()
+                ApplicationInstance.initRoomDb(context)
                 addDatabaseContent()
                 base.evaluate()
             }
         }
     }
 
-    protected fun buildEnd(round: AugmentedRound, vararg shots: Int): AugmentedEnd {
+    protected fun buildEnd(round: AugmentedRound, vararg shots: Int) {
         val end = round.addEnd()
         end.end.roundId = round.round.id
         end.end.saveTime = LocalTime.now()
@@ -63,10 +58,10 @@ abstract class DbTestRuleBase : TestRule {
             end.shots[i].scoringRing = shots[i]
         }
         end.end.score = round.round.target.getReachedScore(end.shots)
-        return end
+        ApplicationInstance.db.endDAO().saveCompleteEnd(end.end, end.images, end.shots)
     }
 
-    protected fun randomEnd(round: AugmentedRound, arrowsPerEnd: Int, gen: Random): AugmentedEnd {
+    protected fun randomEnd(round: AugmentedRound, arrowsPerEnd: Int, gen: Random) {
         val end = round.addEnd()
         end.end.exact = true
         for (i in 0 until arrowsPerEnd) {
@@ -78,7 +73,7 @@ abstract class DbTestRuleBase : TestRule {
         }
         end.end.score = round.round.target.getReachedScore(end.shots)
         end.end.saveTime = LocalTime.of(14, gen.nextInt(59), gen.nextInt(59), 0)
-        return end
+        ApplicationInstance.db.endDAO().saveCompleteEnd(end.end, end.images, end.shots)
     }
 
     private fun gaussianRand(gen: Random): Float {
@@ -97,7 +92,7 @@ abstract class DbTestRuleBase : TestRule {
         bow.braceHeight = "6 3/8\""
         bow.type = EBowType.COMPOUND_BOW
         bow.thumbnail = Thumbnail.from(context, R.drawable.recurve_bow)
-        BowDAO.saveBow(bow, emptyList(), emptyList())
+        ApplicationInstance.db.bowDAO().saveBow(bow, emptyList(), emptyList())
         return bow
     }
 
@@ -109,7 +104,7 @@ abstract class DbTestRuleBase : TestRule {
         arrow.diameter = Dimension(4f, Dimension.Unit.MILLIMETER)
         arrow.nock = "Awesome nock"
         arrow.thumbnail = Thumbnail.from(context, R.drawable.arrows)
-        ArrowDAO.saveArrow(arrow, emptyList())
+        ApplicationInstance.db.arrowDAO().saveArrow(arrow, emptyList())
         return arrow
     }
 
@@ -125,7 +120,7 @@ abstract class DbTestRuleBase : TestRule {
         training.bowId = null
         training.arrowId = null
         training.arrowNumbering = false
-        TrainingDAO.saveTraining(training)
+        ApplicationInstance.db.trainingDAO().saveTraining(training)
         return training
     }
 }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
index 1c2a88e0a..4697c2e1c 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
@@ -15,13 +15,11 @@
 
 package de.dreier.mytargets.test.utils.rules
 
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
-import de.dreier.mytargets.shared.models.dao.RoundDAO
-import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.targets.models.WAFull
 import de.dreier.mytargets.shared.views.TargetViewBase
 import java.util.*
@@ -41,22 +39,22 @@ class MiniDbTestRule : DbTestRuleBase() {
 
     private fun addRandomTraining(seed: Int) {
         val generator = Random(seed.toLong())
-        val standardRound = StandardRoundDAO.loadAugmentedStandardRound(32L)
+        val standardRound = ApplicationInstance.db.standardRoundDAO().loadAugmentedStandardRound(32L)
 
         val training = saveDefaultTraining(standardRound.id, generator)
         val rounds = standardRound.createRoundsFromTemplate()
-        TrainingDAO.saveTraining(training, rounds)
+        ApplicationInstance.db.trainingDAO().saveTraining(training, rounds)
 
         val round1 = AugmentedRound(rounds[0], mutableListOf())
         val round2 = AugmentedRound(rounds[1], mutableListOf())
 
         randomEnd(round1, 6, generator)
         randomEnd(round1, 6, generator)
-        RoundDAO.saveRound(round1)
+        ApplicationInstance.db.roundDAO().saveRound(round1.round, round1.ends.map { it.end })
 
         randomEnd(round2, 6, generator)
         randomEnd(round2, 6, generator)
-        RoundDAO.saveRound(round2)
+        ApplicationInstance.db.roundDAO().saveRound(round2.round, round2.ends.map { it.end })
     }
 
 }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
index 98ee937d4..c7721cfa3 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
@@ -17,14 +17,12 @@ package de.dreier.mytargets.test.utils.rules
 
 import android.support.test.InstrumentationRegistry
 import de.dreier.mytargets.R
+import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.EWeather
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
-import de.dreier.mytargets.shared.models.dao.RoundDAO
-import de.dreier.mytargets.shared.models.dao.StandardRoundDAO
-import de.dreier.mytargets.shared.models.dao.TrainingDAO
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.RoundTemplate
@@ -68,12 +66,12 @@ class SimpleDbTestRule : DbTestRuleBase() {
 
         val round1r = Round(rounds[0])
         round1r.trainingId = id
-        RoundDAO.saveRound(round1r)
+        ApplicationInstance.db.roundDAO().insertRound(round1r)
         val round1 = AugmentedRound(round1r, mutableListOf())
 
         val round2r = Round(rounds[1])
         round2r.trainingId = id
-        RoundDAO.saveRound(round2r)
+        ApplicationInstance.db.roundDAO().insertRound(round2r)
         val round2 = AugmentedRound(round2r, mutableListOf())
 
         randomEnd(round1, 6, generator)
@@ -82,7 +80,7 @@ class SimpleDbTestRule : DbTestRuleBase() {
         randomEnd(round1, 6, generator)
         randomEnd(round1, 6, generator)
         randomEnd(round1, 6, generator)
-        RoundDAO.saveRound(round1)
+        ApplicationInstance.db.roundDAO().saveRound(round1.round, round1.ends.map { it.end })
 
         randomEnd(round2, 6, generator)
         randomEnd(round2, 6, generator)
@@ -90,7 +88,7 @@ class SimpleDbTestRule : DbTestRuleBase() {
         randomEnd(round2, 6, generator)
         randomEnd(round2, 6, generator)
         randomEnd(round2, 6, generator)
-        RoundDAO.saveRound(round2)
+        ApplicationInstance.db.roundDAO().saveRound(round2.round, round2.ends.map { it.end })
     }
 
     private fun getRoundTemplate(index: Int, distance: Int): RoundTemplate {
@@ -105,12 +103,12 @@ class SimpleDbTestRule : DbTestRuleBase() {
 
     private fun addRandomTraining(seed: Int) {
         val generator = Random(seed.toLong())
-        val standardRound = StandardRoundDAO.loadAugmentedStandardRound(32L)
+        val standardRound = ApplicationInstance.db.standardRoundDAO().loadAugmentedStandardRound(32L)
 
         val training = saveDefaultTraining(standardRound.id, generator)
 
         val rounds = standardRound.createRoundsFromTemplate()
-        TrainingDAO.saveTraining(training, rounds)
+        ApplicationInstance.db.trainingDAO().saveTraining(training, rounds)
 
         val round1 = AugmentedRound(rounds[0], mutableListOf())
         val round2 = AugmentedRound(rounds[1], mutableListOf())
@@ -121,7 +119,7 @@ class SimpleDbTestRule : DbTestRuleBase() {
         randomEnd(round1, 6, generator)
         randomEnd(round1, 6, generator)
         randomEnd(round1, 6, generator)
-        RoundDAO.saveRound(round1)
+        ApplicationInstance.db.roundDAO().saveRound(round1.round, round1.ends.map { it.end })
 
         randomEnd(round2, 6, generator)
         randomEnd(round2, 6, generator)
@@ -129,25 +127,25 @@ class SimpleDbTestRule : DbTestRuleBase() {
         randomEnd(round2, 6, generator)
         randomEnd(round2, 6, generator)
         randomEnd(round2, 6, generator)
-        RoundDAO.saveRound(round2)
+        ApplicationInstance.db.roundDAO().saveRound(round2.round, round2.ends.map { it.end })
     }
 
     private fun addFullTraining(bow: Bow) {
-        val standardRound = StandardRoundDAO.loadAugmentedStandardRound(32L)
+        val standardRound = ApplicationInstance.db.standardRoundDAO().loadAugmentedStandardRound(32L)
 
         val training = Training()
         training.title = InstrumentationRegistry.getTargetContext().getString(R.string.training)
         training.date = LocalDate.of(2016, 7, 15)
-        training.weather = EWeather.SUNNY
-        training.windSpeed = 1
-        training.windDirection = 0
+        training.environment.weather = EWeather.SUNNY
+        training.environment.windSpeed = 1
+        training.environment.windDirection = 0
         training.standardRoundId = standardRound.id
         training.bowId = bow.id
         training.arrowId = null
         training.arrowNumbering = false
 
         val rounds = standardRound.createRoundsFromTemplate()
-        TrainingDAO.saveTraining(training, rounds)
+        ApplicationInstance.db.trainingDAO().saveTraining(training, rounds)
 
         val round1 = AugmentedRound(rounds[0], mutableListOf())
         val round2 = AugmentedRound(rounds[1], mutableListOf())
@@ -158,7 +156,7 @@ class SimpleDbTestRule : DbTestRuleBase() {
         buildEnd(round1, 0, 1, 1, 1, 2, 3)
         buildEnd(round1, 1, 2, 3, 3, 4, 5)
         buildEnd(round1, 1, 2, 2, 3, 3, 3)
-        RoundDAO.saveRound(round1)
+        ApplicationInstance.db.roundDAO().saveRound(round1.round, round1.ends.map { it.end })
 
         buildEnd(round2, 1, 2, 2, 3, 4, 5)
         buildEnd(round2, 0, 0, 1, 2, 2, 3)
@@ -166,6 +164,6 @@ class SimpleDbTestRule : DbTestRuleBase() {
         buildEnd(round2, 1, 1, 2, 3, 4, 4)
         buildEnd(round2, 1, 2, 2, 3, 3, 3)
         buildEnd(round2, 1, 2, 2, 3, 3, 4)
-        RoundDAO.saveRound(round2)
+        ApplicationInstance.db.roundDAO().saveRound(round2.round, round2.ends.map { it.end })
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
index acd2a320b..911d998ba 100644
--- a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
+++ b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
@@ -57,7 +57,7 @@ class ApplicationInstance : SharedApplicationInstance() {
         }
         super.onCreate()
         handleDatabaseImport()
-        initFlowManager(this)
+        initRoomDb(this)
         wearableClient = MobileWearableClient(this)
         StateSaver.setEnabledForAllActivitiesAndSupportFragments(this, true);
     }
@@ -112,7 +112,7 @@ class ApplicationInstance : SharedApplicationInstance() {
         val lastSharedPreferences: SharedPreferences
             get() = SharedApplicationInstance.Companion.context.getSharedPreferences(MyBackupAgent.PREFS, 0)
 
-        fun initFlowManager(context: Context) {
+        fun initRoomDb(context: Context) {
             db = Room.databaseBuilder(context,
                     AppDatabase::class.java, AppDatabase.DATABASE_FILE_NAME)
                     .allowMainThreadQueries()
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/StandardRoundFactory.kt b/app/src/main/java/de/dreier/mytargets/base/db/StandardRoundFactory.kt
index 6b373715d..69b193f1d 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/StandardRoundFactory.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/StandardRoundFactory.kt
@@ -722,7 +722,7 @@ object StandardRoundFactory {
             roundTemplate.targetTemplate = Target(target, scoringStyle, Dimension(roundDetails[i + 1].toFloat(), targetUnit))
             roundTemplate.endCount = roundDetails[i + 2]
             roundTemplate.index = rounds.size
-            roundTemplate.standardRound = standardRound.id
+            roundTemplate.standardRoundId = standardRound.id
             rounds.add(roundTemplate)
             i += 3
         }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
index a2abe5df3..8af12dda6 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
@@ -24,13 +24,13 @@ abstract class ArrowDAO {
     @Query("SELECT * FROM Arrow")
     abstract fun loadArrows(): List<Arrow>
 
-    @Query("SELECT * FROM Arrow WHERE _id = (:id)")
+    @Query("SELECT * FROM Arrow WHERE id = (:id)")
     abstract fun loadArrow(id: Long): Arrow
 
-    @Query("SELECT * FROM Arrow WHERE _id = (:id)")
+    @Query("SELECT * FROM Arrow WHERE id = (:id)")
     abstract fun loadArrowOrNull(id: Long): Arrow?
 
-    @Query("SELECT * FROM ArrowImage WHERE arrow = (:id)")
+    @Query("SELECT * FROM ArrowImage WHERE arrowId = (:id)")
     abstract fun loadArrowImages(id: Long): List<ArrowImage>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
@@ -39,7 +39,7 @@ abstract class ArrowDAO {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     abstract fun insertArrowImages(images: List<ArrowImage>)
 
-    @Query("DELETE FROM ArrowImage WHERE arrow = (:arrowId)")
+    @Query("DELETE FROM ArrowImage WHERE arrowId = (:arrowId)")
     abstract fun deleteArrowImages(arrowId: Long)
 
     @Transaction
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
index ce8304226..41dc6995b 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
@@ -25,16 +25,16 @@ abstract class BowDAO {
     @Query("SELECT * FROM Bow")
     abstract fun loadBows(): List<Bow>
 
-    @Query("SELECT * FROM Bow WHERE _id = (:id)")
+    @Query("SELECT * FROM Bow WHERE id = (:id)")
     abstract fun loadBow(id: Long): Bow
 
-    @Query("SELECT * FROM Bow WHERE _id = (:id)")
+    @Query("SELECT * FROM Bow WHERE id = (:id)")
     abstract fun loadBowOrNull(id: Long): Bow?
 
-    @Query("SELECT * FROM BowImage WHERE bow = (:id)")
+    @Query("SELECT * FROM BowImage WHERE bowId = (:id)")
     abstract fun loadBowImages(id: Long): List<BowImage>
 
-    @Query("SELECT * FROM SightMark WHERE bow = (:id)")
+    @Query("SELECT * FROM SightMark WHERE bowId = (:id)")
     abstract fun loadSightMarks(id: Long): List<SightMark>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
@@ -43,13 +43,13 @@ abstract class BowDAO {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     abstract fun insertBowImages(images: List<BowImage>)
 
-    @Query("DELETE FROM BowImage WHERE bow = (:bowId)")
+    @Query("DELETE FROM BowImage WHERE bowId = (:bowId)")
     abstract fun deleteBowImages(bowId: Long)
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     abstract fun insertSightMarks(sightMarks: List<SightMark>)
 
-    @Query("DELETE FROM SightMark WHERE bow = (:bowId)")
+    @Query("DELETE FROM SightMark WHERE bowId = (:bowId)")
     abstract fun deleteSightMarks(bowId: Long)
 
     @Transaction
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
index 6c225b04f..8a33dd2e0 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
@@ -23,13 +23,13 @@ import de.dreier.mytargets.shared.models.db.Shot
 @Dao
 abstract class EndDAO {
 
-    @Query("SELECT * FROM End WHERE round = :roundId ORDER BY `index`")
+    @Query("SELECT * FROM End WHERE roundId = :roundId ORDER BY `index`")
     abstract fun loadEnds(roundId: Long): MutableList<End>
 
-    @Query("SELECT * FROM EndImage WHERE end = :id")
+    @Query("SELECT * FROM EndImage WHERE endId = :id")
     abstract fun loadEndImages(id: Long): List<EndImage>
 
-    @Query("SELECT * FROM Shot WHERE end = :id ORDER BY `index`")
+    @Query("SELECT * FROM Shot WHERE endId = :id ORDER BY `index`")
     abstract fun loadShots(id: Long): List<Shot>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
@@ -53,7 +53,7 @@ abstract class EndDAO {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     abstract fun insertShot(images: Shot): Long
 
-    @Query("DELETE FROM EndImage WHERE end = (:endId)")
+    @Query("DELETE FROM EndImage WHERE endId = (:endId)")
     abstract fun deleteEndImages(endId: Long)
 
     @Transaction
@@ -61,7 +61,7 @@ abstract class EndDAO {
         end.id = saveEnd(end)
         for (image in images) {
             image.endId = end.id
-            image._id = insertEndImage(image)
+            image.id = insertEndImage(image)
         }
 
         for (shot in shots) {
@@ -89,7 +89,7 @@ abstract class EndDAO {
     open fun replaceImages(end: End, images: List<EndImage>) {
         deleteEndImages(end.id)
         for (image in images) {
-            image._id = insertEndImage(image)
+            image.id = insertEndImage(image)
         }
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
index 108c81816..98605a329 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
@@ -21,19 +21,19 @@ import de.dreier.mytargets.shared.models.db.Round
 
 @Dao
 abstract class RoundDAO {
-    @Query("SELECT * FROM Round WHERE _id in (:roundIds)")
+    @Query("SELECT * FROM Round WHERE id in (:roundIds)")
     abstract fun loadRounds(roundIds: LongArray): List<Round>
 
-    @Query("SELECT * FROM Round WHERE training = :id ORDER BY `index`")
+    @Query("SELECT * FROM Round WHERE trainingId = :id ORDER BY `index`")
     abstract fun loadRounds(id: Long): List<Round>
 
-    @Query("SELECT * FROM Round WHERE _id = :id")
+    @Query("SELECT * FROM Round WHERE id = :id")
     abstract fun loadRound(id: Long): Round
 
-    @Query("SELECT * FROM Round WHERE _id = :id")
+    @Query("SELECT * FROM Round WHERE id = :id")
     abstract fun loadRoundOrNull(id: Long): Round?
 
-    @Query("SELECT * FROM End WHERE round = :id ORDER BY `index`")
+    @Query("SELECT * FROM End WHERE roundId = :id ORDER BY `index`")
     abstract fun loadEnds(id: Long): MutableList<End>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
@@ -45,7 +45,7 @@ abstract class RoundDAO {
     @Update
     abstract fun updateRound(round: Round)
 
-    @Query("DELETE FROM End WHERE round = :id")
+    @Query("DELETE FROM End WHERE roundId = :id")
     abstract fun deleteEnds(id: Long)
 
     @Transaction
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
index 8e4690c8e..30b06090e 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
@@ -21,10 +21,10 @@ import de.dreier.mytargets.shared.models.db.Signature
 @Dao
 interface SignatureDAO {
 
-    @Query("SELECT * FROM Signature WHERE _id = :id")
+    @Query("SELECT * FROM Signature WHERE id = :id")
     fun loadSignature(id: Long): Signature
 
-    @Query("SELECT * FROM Signature WHERE _id = :id")
+    @Query("SELECT * FROM Signature WHERE id = :id")
     fun loadSignatureOrNull(id: Long): Signature?
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
index 91a64903c..3946df372 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
@@ -25,19 +25,19 @@ abstract class StandardRoundDAO {
     @Query("SELECT * FROM StandardRound")
     abstract fun loadStandardRounds(): List<StandardRound>
 
-    @Query("SELECT * FROM StandardRound WHERE _id = :id")
+    @Query("SELECT * FROM StandardRound WHERE id = :id")
     abstract fun loadStandardRound(id: Long): StandardRound
 
     @Transaction
     open fun loadAugmentedStandardRound(id: Long): AugmentedStandardRound = AugmentedStandardRound(loadStandardRound(id), loadRoundTemplates(id).toMutableList())
 
-    @Query("SELECT * FROM StandardRound WHERE _id = :id")
+    @Query("SELECT * FROM StandardRound WHERE id = :id")
     abstract fun loadStandardRoundOrNull(id: Long): StandardRound?
 
     @Query("SELECT * FROM StandardRound WHERE name LIKE :query AND club != 512")
     abstract fun getAllSearch(query: String): List<StandardRound>
 
-    @Query("SELECT * FROM RoundTemplate WHERE standardRound = :id ORDER BY `index`")
+    @Query("SELECT * FROM RoundTemplate WHERE standardRoundId = :id ORDER BY `index`")
     abstract fun loadRoundTemplates(id: Long): List<RoundTemplate>
 
     @Insert
@@ -46,7 +46,7 @@ abstract class StandardRoundDAO {
     @Insert
     abstract fun insertRoundTemplate(round: RoundTemplate): Long
 
-    @Query("DELETE FROM RoundTemplate WHERE standardRound = (:id)")
+    @Query("DELETE FROM RoundTemplate WHERE standardRoundId = (:id)")
     abstract fun deleteRoundTemplates(id: Long)
 
     @Transaction
@@ -54,7 +54,7 @@ abstract class StandardRoundDAO {
         standardRound.id = insertStandardRound(standardRound)
         deleteRoundTemplates(standardRound.id)
         for (roundTemplate in roundTemplates) {
-            roundTemplate.standardRound = standardRound.id
+            roundTemplate.standardRoundId = standardRound.id
             roundTemplate.id = insertRoundTemplate(roundTemplate)
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
index d880b5cc0..684a6518b 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
@@ -24,7 +24,7 @@ abstract class TrainingDAO {
     @Query("SELECT * FROM Training")
     abstract fun loadTrainings(): List<Training>
 
-    @Query("SELECT * FROM Training WHERE _id = :id")
+    @Query("SELECT * FROM Training WHERE id = :id")
     abstract fun loadTraining(id: Long): Training
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
index 813296842..f73a970cd 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
@@ -20,6 +20,6 @@ import android.arch.persistence.room.migration.Migration
 
 object Migration22 : Migration(21, 22) {
     override fun migrate(database: SupportSQLiteDatabase) {
-        RoomCreationCallback.fillStandardRound(database)
+        RoomCreationCallback.fillStandardRound(database, "_id", "standardRound")
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
index cb42a1adf..536622d47 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration23.kt
@@ -43,7 +43,7 @@ object Migration23 : Migration(22, 23) {
             // If imagePath is just the name and is placed inside files directory or
             // In case the image was already copied to the files, but does still contain the wrong path
             if (imageFile.exists() || imageFileFromSomewhere.exists()) {
-                database.execSQL("UPDATE $tableName SET fileName = ${imageFile.name} WHERE _id = $imageId")
+                database.execSQL("UPDATE $tableName SET fileName = \"${imageFile.name}\" WHERE _id = $imageId")
                 continue
             }
 
@@ -52,7 +52,7 @@ object Migration23 : Migration(22, 23) {
                 try {
                     imageFile = File.createTempFile("img", imageFromSomewhere.name, filesDir)
                     imageFromSomewhere.moveTo(imageFile)
-                    database.execSQL("UPDATE $tableName SET fileName = ${imageFile.name} WHERE _id = $imageId")
+                    database.execSQL("UPDATE $tableName SET fileName = \"${imageFile.name}\" WHERE _id = $imageId")
                 } catch (e: IOException) {
                     e.printStackTrace()
                 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
index 2a856a8fc..e57cdb5a0 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
@@ -23,20 +23,6 @@ import de.dreier.mytargets.shared.models.db.Shot
 
 object Migration26 : Migration(25, 26) {
     override fun migrate(database: SupportSQLiteDatabase) {
-//        database.execSQL("CREATE TABLE IF NOT EXISTS `NewTraining` " +
-//                "(`game_name` TEXT NOT NULL, " +
-//                "PRIMARY KEY(`game_name`))")
-//
-//        // 2. Copy the data
-//        database.execSQL("INSERT INTO $TABLE_NAME_TEMP (game_name) "
-//                + "SELECT game_name "
-//                + "FROM $TABLE_NAME")
-//
-//        // 3. Remove the old table
-//        database.execSQL("DROP TABLE $TABLE_NAME")
-//
-//        // 4. Change the table name to the correct one
-//        database.execSQL("ALTER TABLE $TABLE_NAME_TEMP RENAME TO $TABLE_NAME")
 
         database.execSQL("ALTER TABLE `Training` ADD COLUMN reachedPoints INTEGER;")
         database.execSQL("ALTER TABLE `Training` ADD COLUMN totalPoints INTEGER;")
@@ -52,8 +38,10 @@ object Migration26 : Migration(25, 26) {
 
         RoomCreationCallback.createScoreTriggers(database)
 
-        val rounds = database.query("SELECT _id, targetId, targetScoringStyle, targetDiameter " +
-                "FROM Round")
+        val rounds = database.query(
+            "SELECT id, targetId, targetScoringStyle, targetDiameter " +
+                    "FROM Round"
+        )
 
         while (rounds.moveToNext()) {
             val diameterData = rounds.getString(3)
@@ -64,24 +52,429 @@ object Migration26 : Migration(25, 26) {
             val target = Target(rounds.getLong(1), rounds.getInt(2), diameter)
             val roundId = rounds.getLong(0)
 
-            val ends = database.query("SELECT _id, FROM `End` WHERE round = $roundId")
+            val ends = database.query("SELECT _id FROM `End` WHERE round = $roundId")
             while (ends.moveToNext()) {
                 val endId = ends.getLong(0)
 
-                val shotsCursor = database.query("SELECT index, scoringRing FROM Shot WHERE end = $endId ORDER BY `index`")
+                val shotsCursor =
+                    database.query("SELECT `index`, scoringRing FROM Shot WHERE end = $endId ORDER BY `index`")
                 val shots = mutableListOf<Shot>()
-                while(shotsCursor.moveToNext()) {
-                    val shot = Shot(index = shotsCursor.getInt(0), scoringRing = shotsCursor.getInt(1))
+                while (shotsCursor.moveToNext()) {
+                    val shot =
+                        Shot(index = shotsCursor.getInt(0), scoringRing = shotsCursor.getInt(1))
                     shots.add(shot)
                 }
 
                 val score = target.getReachedScore(shots)
-                database.execSQL("UPDATE `End` SET " +
-                        "scoreReachedPoints = ${score.reachedPoints}, " +
-                        "scoreTotalPoints = ${score.totalPoints}, " +
-                        "scoreShotCount = ${score.shotCount} " +
-                        "WHERE _id = $endId")
+                database.execSQL(
+                    "UPDATE `End` SET " +
+                            "reachedPoints = ${score.reachedPoints}, " +
+                            "totalPoints = ${score.totalPoints}, " +
+                            "shotCount = ${score.shotCount} " +
+                            "WHERE _id = $endId"
+                )
             }
         }
+
+        val migrations = listOf(
+            TableMigrationBuilder("Arrow")
+                .field(
+                    name = "id",
+                    columnName = "_id",
+                    affinity = "INTEGER PRIMARY KEY AUTOINCREMENT",
+                    notNull = true
+                )
+                .field(name = "name", notNull = true)
+                .field(name = "maxArrowNumber", affinity = "INTEGER", notNull = true)
+                .field(name = "length", affinity = "TEXT")
+                .field(name = "material", affinity = "TEXT")
+                .field(name = "spine", affinity = "TEXT")
+                .field(name = "weight", affinity = "TEXT")
+                .field(name = "tipWeight", affinity = "TEXT")
+                .field(name = "vanes", affinity = "TEXT")
+                .field(name = "nock", affinity = "TEXT")
+                .field(name = "comment", affinity = "TEXT")
+                .field(name = "diameter", notNull = true)
+                .field(name = "thumbnail", affinity = "BLOB"),
+
+            TableMigrationBuilder("ArrowImage")
+                .field(
+                    name = "id",
+                    columnName = "_id",
+                    affinity = "INTEGER PRIMARY KEY AUTOINCREMENT",
+                    notNull = true
+                )
+                .field(name = "fileName", notNull = true)
+                .field(
+                    name = "arrowId",
+                    columnName = "arrow",
+                    affinity = "INTEGER",
+                    refTable = "Arrow",
+                    refColumn = "id",
+                    onDelete = "CASCADE"
+                ),
+
+            TableMigrationBuilder("Bow")
+                .field(
+                    name = "id",
+                    columnName = "_id",
+                    affinity = "INTEGER PRIMARY KEY AUTOINCREMENT",
+                    notNull = true
+                )
+                .field(name = "name", notNull = true)
+                .field(name = "type", affinity = "INTEGER")
+                .field(name = "brand", affinity = "TEXT")
+                .field(name = "size", affinity = "TEXT")
+                .field(name = "braceHeight", affinity = "TEXT")
+                .field(name = "tiller", affinity = "TEXT")
+                .field(name = "limbs", affinity = "TEXT")
+                .field(name = "sight", affinity = "TEXT")
+                .field(name = "drawWeight", affinity = "TEXT")
+                .field(name = "stabilizer", affinity = "TEXT")
+                .field(name = "clicker", affinity = "TEXT")
+                .field(name = "button", affinity = "TEXT")
+                .field(name = "string", affinity = "TEXT")
+                .field(name = "nockingPoint", affinity = "TEXT")
+                .field(name = "letoffWeight", affinity = "TEXT")
+                .field(name = "arrowRest", affinity = "TEXT")
+                .field(name = "restHorizontalPosition", affinity = "TEXT")
+                .field(name = "restVerticalPosition", affinity = "TEXT")
+                .field(name = "restStiffness", affinity = "TEXT")
+                .field(name = "camSetting", affinity = "TEXT")
+                .field(name = "scopeMagnification", affinity = "TEXT")
+                .field(name = "description", affinity = "TEXT")
+                .field(name = "thumbnail", affinity = "BLOB"),
+
+            TableMigrationBuilder("BowImage")
+                .field(
+                    name = "id",
+                    columnName = "_id",
+                    affinity = "INTEGER PRIMARY KEY AUTOINCREMENT",
+                    notNull = true
+                )
+                .field(name = "fileName", notNull = true)
+                .field(
+                    name = "bowId",
+                    columnName = "bow",
+                    affinity = "INTEGER",
+                    refTable = "Bow",
+                    refColumn = "id",
+                    onDelete = "CASCADE"
+                ),
+            
+            TableMigrationBuilder("StandardRound")
+                .field(
+                    name = "id",
+                    columnName = "_id",
+                    affinity = "INTEGER PRIMARY KEY AUTOINCREMENT",
+                    notNull = true
+                )
+                .field(name = "club", affinity = "INTEGER", notNull = true)
+                .field(name = "name", notNull = true),
+
+            TableMigrationBuilder("RoundTemplate")
+                .field(
+                    name = "id",
+                    columnName = "_id",
+                    affinity = "INTEGER PRIMARY KEY AUTOINCREMENT",
+                    notNull = true
+                )
+                .field(
+                    name = "standardRoundId",
+                    columnName = "standardRoundId",
+                    affinity = "INTEGER",
+                    refTable = "StandardRound",
+                    refColumn = "id",
+                    onDelete = "CASCADE"
+                )
+                .field(name = "index", affinity = "INTEGER", notNull = true)
+                .field(name = "shotsPerEnd", affinity = "INTEGER", notNull = true)
+                .field(name = "endCount", affinity = "INTEGER", notNull = true)
+                .field(name = "distance", notNull = true)
+                .field(
+                    name = "targetId",
+                    columnName = "targetId",
+                    affinity = "INTEGER",
+                    notNull = true
+                )
+                .field(
+                    name = "targetScoringStyleIndex",
+                    columnName = "targetScoringStyle",
+                    affinity = "INTEGER",
+                    notNull = true
+                )
+                .field(
+                    name = "targetDiameter",
+                    columnName = "targetDiameter",
+                    notNull = true
+                ),
+
+            TableMigrationBuilder("SightMark")
+                .field(
+                    name = "id",
+                    columnName = "_id",
+                    affinity = "INTEGER PRIMARY KEY AUTOINCREMENT",
+                    notNull = true
+                )
+                .field(
+                    name = "bowId",
+                    columnName = "bow",
+                    affinity = "INTEGER",
+                    refTable = "Bow",
+                    refColumn = "id",
+                    onDelete = "CASCADE"
+                )
+                .field(name = "distance", notNull = true)
+                .field(name = "value", affinity = "TEXT"),
+
+            TableMigrationBuilder("Signature")
+                .field(
+                    name = "id",
+                    columnName = "_id",
+                    affinity = "INTEGER PRIMARY KEY AUTOINCREMENT",
+                    notNull = true
+                )
+                .field(name = "name", notNull = true)
+                .field(name = "bitmap", affinity = "BLOB"),
+
+            TableMigrationBuilder("Training")
+                .field(
+                    name = "id",
+                    columnName = "_id",
+                    affinity = "INTEGER PRIMARY KEY AUTOINCREMENT",
+                    notNull = true
+                )
+                .field(name = "title", notNull = true)
+                .field(name = "date", notNull = true)
+                .field(
+                    name = "standardRoundId",
+                    columnName = "standardRoundId",
+                    affinity = "INTEGER",
+                    refTable = "StandardRound",
+                    refColumn = "id",
+                    onDelete = "SET NULL"
+                )
+                .field(
+                    name = "bowId",
+                    columnName = "bow",
+                    affinity = "INTEGER",
+                    refTable = "Bow",
+                    refColumn = "id",
+                    onDelete = "SET NULL"
+                )
+                .field(
+                    name = "arrowId",
+                    columnName = "arrow",
+                    affinity = "INTEGER",
+                    refTable = "Arrow",
+                    refColumn = "id",
+                    onDelete = "SET NULL"
+                )
+                .field(name = "arrowNumbering", affinity = "INTEGER", notNull = true)
+                .field(name = "comment", notNull = true)
+                .field(
+                    name = "archerSignatureId",
+                    columnName = "archerSignature",
+                    affinity = "INTEGER",
+                    refTable = "Signature",
+                    refColumn = "id",
+                    onDelete = "SET NULL"
+                )
+                .field(
+                    name = "witnessSignatureId",
+                    columnName = "witnessSignature",
+                    affinity = "INTEGER",
+                    refTable = "Signature",
+                    refColumn = "id",
+                    onDelete = "SET NULL"
+                )
+                .field(name = "indoor", affinity = "INTEGER", notNull = true)
+                .field(name = "weather", affinity = "INTEGER", notNull = true)
+                .field(name = "windSpeed", affinity = "INTEGER", notNull = true)
+                .field(name = "windDirection", affinity = "INTEGER", notNull = true)
+                .field(name = "location", notNull = true)
+                .field(name = "reachedPoints", affinity = "INTEGER", notNull = true)
+                .field(name = "totalPoints", affinity = "INTEGER", notNull = true)
+                .field(name = "shotCount", affinity = "INTEGER", notNull = true),
+            
+            TableMigrationBuilder("Round")
+                .field(
+                    name = "id",
+                    columnName = "_id",
+                    affinity = "INTEGER PRIMARY KEY AUTOINCREMENT",
+                    notNull = true
+                )
+                .field(
+                    name = "trainingId",
+                    columnName = "training",
+                    affinity = "INTEGER",
+                    refTable = "Training",
+                    refColumn = "id",
+                    onDelete = "CASCADE"
+                )
+                .field(name = "index", affinity = "INTEGER", notNull = true)
+                .field(name = "shotsPerEnd", affinity = "INTEGER", notNull = true)
+                .field(name = "maxEndCount", affinity = "INTEGER")
+                .field(name = "distance", notNull = true)
+                .field(name = "comment", notNull = true)
+                .field(
+                    name = "target.id",
+                    columnName = "targetId",
+                    affinity = "INTEGER",
+                    notNull = true
+                )
+                .field(
+                    name = "target.scoringStyleIndex",
+                    columnName = "targetScoringStyle",
+                    affinity = "INTEGER",
+                    notNull = true
+                )
+                .field(name = "target.diameter", columnName = "targetDiameter", notNull = true)
+                .field(name = "reachedPoints", affinity = "INTEGER", notNull = true)
+                .field(name = "totalPoints", affinity = "INTEGER", notNull = true)
+                .field(name = "shotCount", affinity = "INTEGER", notNull = true),
+
+            TableMigrationBuilder("End")
+                .field(
+                    name = "id",
+                    columnName = "_id",
+                    affinity = "INTEGER PRIMARY KEY AUTOINCREMENT",
+                    notNull = true
+                )
+                .field(name = "index", affinity = "INTEGER", notNull = true)
+                .field(
+                    name = "roundId",
+                    columnName = "round",
+                    affinity = "INTEGER",
+                    refTable = "Round",
+                    refColumn = "id",
+                    onDelete = "CASCADE"
+                )
+                .field(name = "exact", affinity = "INTEGER", notNull = true)
+                .field(name = "saveTime", affinity = "TEXT")
+                .field(name = "comment", notNull = true)
+                .field(name = "reachedPoints", affinity = "INTEGER", notNull = true)
+                .field(name = "totalPoints", affinity = "INTEGER", notNull = true)
+                .field(name = "shotCount", affinity = "INTEGER", notNull = true),
+
+            TableMigrationBuilder("EndImage")
+                .field(
+                    name = "id",
+                    columnName = "_id",
+                    affinity = "INTEGER PRIMARY KEY AUTOINCREMENT",
+                    notNull = true
+                )
+                .field(name = "fileName", notNull = true)
+                .field(
+                    name = "endId",
+                    columnName = "end",
+                    affinity = "INTEGER",
+                    refTable = "End",
+                    refColumn = "id",
+                    onDelete = "CASCADE"
+                ),
+
+            TableMigrationBuilder("Shot")
+                .field(
+                    name = "id",
+                    columnName = "_id",
+                    affinity = "INTEGER PRIMARY KEY AUTOINCREMENT",
+                    notNull = true
+                )
+                .field(name = "index", affinity = "INTEGER", notNull = true)
+                .field(
+                    name = "endId",
+                    columnName = "end",
+                    affinity = "INTEGER",
+                    refTable = "End",
+                    refColumn = "id",
+                    onDelete = "CASCADE"
+                )
+                .field(name = "x", affinity = "REAL", notNull = true)
+                .field(name = "y", affinity = "REAL", notNull = true)
+                .field(name = "scoringRing", affinity = "INTEGER", notNull = true)
+                .field(name = "arrowNumber", affinity = "TEXT")
+        )
+
+        for (migration in migrations) {
+            migration.createNewTable(database)
+        }
+        for (migration in migrations) {
+            migration.copyData(database)
+        }
+        for (migration in migrations) {
+            migration.replaceOldTableWithNewTable(database)
+        }
+    }
+}
+
+class TableMigrationBuilder(val tableName: String) {
+
+    private val newTableName = "NEW_$tableName"
+
+    private val fieldMigrations = mutableListOf<FieldMigration>()
+
+    fun field(
+        name: String = "",
+        notNull: Boolean = false,
+        affinity: String = "TEXT",
+        columnName: String? = null,
+        refTable: String? = null,
+        refColumn: String? = null,
+        onUpdate: String = "NO ACTION",
+        onDelete: String = "NO ACTION"
+    ): TableMigrationBuilder {
+        fieldMigrations.add(
+            FieldMigration(
+                name = name,
+                columnName = columnName ?: name,
+                affinity = affinity,
+                notNull = notNull,
+                refTable = refTable,
+                refColumn = refColumn,
+                onUpdate = onUpdate,
+                onDelete = onDelete
+            )
+        )
+        return this
+    }
+
+    fun createNewTable(database: SupportSQLiteDatabase) {
+        val entries = fieldMigrations.map { it.toString() }.toMutableList()
+        entries.addAll(fieldMigrations.filter { it.refTable != null }.map { it.referenceToString() })
+
+        val query =
+            "CREATE TABLE IF NOT EXISTS `$newTableName` (" + entries.joinToString(separator = ", ") + ")"
+        database.execSQL(query)
+    }
+
+    fun copyData(database: SupportSQLiteDatabase) {
+        database.execSQL("INSERT INTO `$newTableName` (" + fieldMigrations.joinToString(separator = ", ") { it.name } + ") "
+                + "SELECT " + fieldMigrations.joinToString(separator = ", ") { it.columnName }
+                + " FROM $tableName")
+    }
+
+    fun replaceOldTableWithNewTable(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE $tableName")
+        database.execSQL("ALTER TABLE $newTableName RENAME TO $tableName")
+    }
+}
+
+data class FieldMigration(
+    val name: String,
+    val columnName: String,
+    val affinity: String,
+    val notNull: Boolean,
+    val refTable: String?,
+    val refColumn: String?,
+    val onUpdate: String,
+    val onDelete: String
+) {
+    override fun toString(): String {
+        return "`$name` $affinity${if (notNull) " NOT NULL" else ""}"
+    }
+
+    fun referenceToString(): String {
+        return "FOREIGN KEY(`$name`) REFERENCES `$refTable`(`$refColumn`) ON UPDATE $onUpdate ON DELETE $onDelete"
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
index 06dc39ec5..7cc94b043 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
@@ -20,12 +20,12 @@ import android.arch.persistence.room.migration.Migration
 import android.content.ContentValues
 import android.database.Cursor
 import android.database.sqlite.SQLiteDatabase.*
+import de.dreier.mytargets.base.db.StandardRoundFactory
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
 import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.StandardRound
-import de.dreier.mytargets.base.db.StandardRoundFactory
 
 object Migration9 : Migration(8, 9) {
     override fun migrate(database: SupportSQLiteDatabase) {
@@ -191,21 +191,21 @@ object Migration9 : Migration(8, 9) {
             item.standardRound.id = database
                     .insert("STANDARD_ROUND_TEMPLATE", CONFLICT_NONE, values)
             for (r in item.roundTemplates) {
-                r.standardRound = item.id
+                r.standardRoundId = item.id
             }
         } else {
             values.put("_id", item.id)
             database.insert("STANDARD_ROUND_TEMPLATE", CONFLICT_REPLACE, values)
         }
         for (template in item.roundTemplates) {
-            template.standardRound = item.id
+            template.standardRoundId = item.id
             insertRoundTemplate(database, template)
         }
     }
 
     private fun insertRoundTemplate(database: SupportSQLiteDatabase, item: RoundTemplate) {
         val values = ContentValues()
-        values.put("sid", item.standardRound)
+        values.put("sid", item.standardRoundId)
         values.put("r_index", item.index)
         values.put("distance", item.distance.value)
         values.put("unit", item.distance.unit?.toString())
@@ -262,7 +262,7 @@ object Migration9 : Migration(8, 9) {
         roundTemplate.distance = Dimension.from(cursor.getInt(startColumnIndex + 7).toFloat(),
                 cursor.getString(startColumnIndex + 8))
         roundTemplate.endCount = cursor.getInt(startColumnIndex + 11)
-        roundTemplate.standardRound = cursor.getLong(startColumnIndex + 12)
+        roundTemplate.standardRoundId = cursor.getLong(startColumnIndex + 12)
         return roundTemplate
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
index 0d513c7a1..631f97930 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
@@ -39,21 +39,21 @@ object RoomCreationCallback : RoomDatabase.Callback() {
                                   roundTemplates: List<RoundTemplate>) {
         insertStandardRound(db, standardRound)
         for (roundTemplate in roundTemplates) {
-            roundTemplate.standardRound = standardRound.id
+            roundTemplate.standardRoundId = standardRound.id
             insertRoundTemplate(db, roundTemplate)
         }
     }
 
     private fun insertStandardRound(db: SupportSQLiteDatabase, standardRound: StandardRound) {
-        db.execSQL("INSERT OR REPLACE INTO StandardRound(_id, club, name) VALUES (?,?,?)",
+        db.execSQL("INSERT OR REPLACE INTO StandardRound(id, club, name) VALUES (?,?,?)",
                 arrayOf(standardRound.id, standardRound.club, standardRound.name))
     }
 
     private fun insertRoundTemplate(db: SupportSQLiteDatabase, roundTemplate: RoundTemplate) {
-        db.execSQL("INSERT OR REPLACE INTO RoundTemplate(_id, standardRound, `index`, " +
+        db.execSQL("INSERT OR REPLACE INTO RoundTemplate(id, standardRoundId, `index`, " +
                 "shotsPerEnd, endCount, distance, targetId, targetScoringStyle, targetDiameter) " +
                 "VALUES (?,?,?,?,?,?,?,?,?)",
-                arrayOf(roundTemplate.id, roundTemplate.standardRound, roundTemplate.index,
+                arrayOf(roundTemplate.id, roundTemplate.standardRoundId, roundTemplate.index,
                         roundTemplate.shotsPerEnd, roundTemplate.endCount,
                         "${roundTemplate.distance.value} ${roundTemplate.distance.unit}",
                         roundTemplate.targetTemplate.id,
@@ -70,7 +70,7 @@ object RoomCreationCallback : RoomDatabase.Callback() {
                 "reachedPoints = (SELECT SUM(reachedPoints) FROM `End` WHERE round = NEW.round), " +
                 "totalPoints = (SELECT SUM(totalPoints) FROM `End` WHERE round = NEW.round), " +
                 "shotCount = (SELECT SUM(shotCount) FROM `End` WHERE round = NEW.round) " +
-                "WHERE _id = NEW.round;" +
+                "WHERE id = NEW.round;" +
                 "END;")
 
         database.execSQL("CREATE TRIGGER training_sum_score " +
@@ -80,7 +80,7 @@ object RoomCreationCallback : RoomDatabase.Callback() {
                 "reachedPoints = (SELECT SUM(reachedPoints) FROM `Round` WHERE training = NEW.training), " +
                 "totalPoints = (SELECT SUM(totalPoints) FROM `Round` WHERE training = NEW.training), " +
                 "shotCount = (SELECT SUM(shotCount) FROM `Round` WHERE training = NEW.training) " +
-                "WHERE _id = NEW.training;" +
+                "WHERE id = NEW.training;" +
                 "END;")
     }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
index bf30b7f02..95d82d41f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
@@ -29,7 +29,6 @@ import kotlinx.android.parcel.Parcelize
 @Parcelize
 @Entity
 data class Arrow(
-        @ColumnInfo(name = "_id")
         @PrimaryKey(autoGenerate = true)
         override var id: Long = 0,
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
index 186c885dd..9683c0d10 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
@@ -16,7 +16,6 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
-import android.arch.persistence.room.ColumnInfo
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.ForeignKey
 import android.arch.persistence.room.ForeignKey.CASCADE
@@ -29,17 +28,15 @@ import kotlinx.android.parcel.Parcelize
 @Parcelize
 @Entity(foreignKeys = [
     ForeignKey(entity = Arrow::class,
-            parentColumns = ["_id"],
-            childColumns = ["arrow"],
+            parentColumns = ["id"],
+            childColumns = ["arrowId"],
             onDelete = CASCADE)
 ])
 data class ArrowImage(
-        @ColumnInfo(name = "_id")
         @PrimaryKey(autoGenerate = true)
         var id: Long = 0,
 
         override var fileName: String = "",
 
-        @ColumnInfo(name = "arrow")
         var arrowId: Long? = null
 ) : Image, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
index d110d9bad..760b03b22 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
@@ -29,7 +29,6 @@ import kotlinx.android.parcel.Parcelize
 @Parcelize
 @Entity
 data class Bow(
-        @ColumnInfo(name = "_id")
         @PrimaryKey(autoGenerate = true)
         override var id: Long = 0,
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
index 8e7084d83..c422b0867 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
@@ -16,7 +16,6 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
-import android.arch.persistence.room.ColumnInfo
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.ForeignKey
 import android.arch.persistence.room.ForeignKey.CASCADE
@@ -29,17 +28,15 @@ import kotlinx.android.parcel.Parcelize
 @Parcelize
 @Entity(foreignKeys = [
     ForeignKey(entity = Bow::class,
-            parentColumns = ["_id"],
-            childColumns = ["bow"],
+            parentColumns = ["id"],
+            childColumns = ["bowId"],
             onDelete = CASCADE)
 ])
 data class BowImage(
-        @ColumnInfo(name = "_id")
         @PrimaryKey(autoGenerate = true)
         var id: Long = 0,
 
         override var fileName: String = "",
 
-        @ColumnInfo(name = "bow")
         var bowId: Long? = null
 ) : Image, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
index 89c42fa98..3fa54646a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
@@ -16,8 +16,11 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
-import android.arch.persistence.room.*
+import android.arch.persistence.room.Embedded
+import android.arch.persistence.room.Entity
+import android.arch.persistence.room.ForeignKey
 import android.arch.persistence.room.ForeignKey.CASCADE
+import android.arch.persistence.room.PrimaryKey
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.IIdSettable
 import de.dreier.mytargets.shared.models.Score
@@ -28,19 +31,17 @@ import org.threeten.bp.LocalTime
 @Parcelize
 @Entity(foreignKeys = [
     ForeignKey(entity = Round::class,
-            parentColumns = ["_id"],
-            childColumns = ["round"],
+            parentColumns = ["id"],
+            childColumns = ["roundId"],
             onDelete = CASCADE)
 ])
 data class End(
 
-        @ColumnInfo(name = "_id")
         @PrimaryKey(autoGenerate = true)
         override var id: Long = 0,
 
         var index: Int = 0,
 
-        @ColumnInfo(name = "round")
         var roundId: Long? = null,
 
         var exact: Boolean = false,
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
index b21856aee..662ec8b89 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.ColumnInfo
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.ForeignKey
 import android.arch.persistence.room.ForeignKey.CASCADE
@@ -24,34 +23,36 @@ import android.os.Parcel
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Image
 
-@Entity(foreignKeys = [
-    ForeignKey(entity = End::class,
-            parentColumns = ["_id"],
-            childColumns = ["end"],
-            onDelete = CASCADE)
-])
+@Entity(
+    foreignKeys = [
+        ForeignKey(
+            entity = End::class,
+            parentColumns = ["id"],
+            childColumns = ["endId"],
+            onDelete = CASCADE
+        )
+    ]
+)
 data class EndImage(
-        @ColumnInfo(name = "_id")
-        @PrimaryKey(autoGenerate = true)
-        var _id: Long = 0,
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0,
 
-        override var fileName: String = "",
+    override var fileName: String = "",
 
-        @ColumnInfo(name = "end")
-        var endId: Long? = null
+    var endId: Long? = null
 ) : Image, Parcelable {
     constructor(imageFile: String) : this(fileName = imageFile)
 
     constructor(source: Parcel) : this(
-            source.readLong(),
-            source.readString(),
-            source.readValue(Long::class.java.classLoader) as Long?
+        source.readLong(),
+        source.readString(),
+        source.readValue(Long::class.java.classLoader) as Long?
     )
 
     override fun describeContents() = 0
 
     override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) {
-        writeLong(_id)
+        writeLong(id)
         writeString(fileName)
         writeValue(endId)
     }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
index 0ad6b0126..7e487e4a1 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
@@ -16,8 +16,11 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
-import android.arch.persistence.room.*
+import android.arch.persistence.room.Embedded
+import android.arch.persistence.room.Entity
+import android.arch.persistence.room.ForeignKey
 import android.arch.persistence.room.ForeignKey.CASCADE
+import android.arch.persistence.room.PrimaryKey
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.IIdSettable
@@ -29,16 +32,14 @@ import kotlinx.android.parcel.Parcelize
 @Parcelize
 @Entity(foreignKeys = [
     ForeignKey(entity = Training::class,
-            parentColumns = ["_id"],
-            childColumns = ["training"],
+            parentColumns = ["id"],
+            childColumns = ["trainingId"],
             onDelete = CASCADE)
 ])
 data class Round(
-        @ColumnInfo(name = "_id")
         @PrimaryKey(autoGenerate = true)
         override var id: Long = 0,
 
-        @ColumnInfo(name = "training")
         var trainingId: Long? = null,
 
         var index: Int = 0,
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
index 39be5467e..951807700 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
@@ -24,26 +24,24 @@ import de.dreier.mytargets.shared.models.IIdSettable
 import de.dreier.mytargets.shared.models.Target
 
 @Entity(foreignKeys = [(ForeignKey(entity = StandardRound::class,
-        parentColumns = ["_id"],
-        childColumns = ["standardRound"],
+        parentColumns = ["id"],
+        childColumns = ["standardRoundId"],
         onDelete = CASCADE))])
 data class RoundTemplate(
-        @ColumnInfo(name = "_id")
-        @PrimaryKey(autoGenerate = true)
+    @PrimaryKey(autoGenerate = true)
         override var id: Long = 0,
 
-        @ColumnInfo(name = "standardRound")
-        var standardRound: Long? = null,
+        var standardRoundId: Long? = null,
 
-        var index: Int = 0,
+    var index: Int = 0,
 
-        var shotsPerEnd: Int = 0,
+    var shotsPerEnd: Int = 0,
 
-        var endCount: Int = 0,
+    var endCount: Int = 0,
 
-        var distance: Dimension = Dimension.UNKNOWN,
+    var distance: Dimension = Dimension.UNKNOWN,
 
-        @Embedded
+    @Embedded
         var targetTemplate: Target = Target()
 ) : IIdSettable, Parcelable {
     constructor(source: Parcel) : this(
@@ -60,7 +58,7 @@ data class RoundTemplate(
 
     override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) {
         writeLong(id)
-        writeValue(standardRound)
+        writeValue(standardRoundId)
         writeInt(index)
         writeInt(shotsPerEnd)
         writeInt(endCount)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
index fb2d775d7..e19573638 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.ColumnInfo
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.ForeignKey
 import android.arch.persistence.room.ForeignKey.CASCADE
@@ -25,18 +24,16 @@ import android.os.Parcelable
 import de.dreier.mytargets.shared.models.IIdSettable
 
 @Entity(foreignKeys = [(ForeignKey(entity = End::class,
-                parentColumns = ["_id"],
-                childColumns = ["end"],
+                parentColumns = ["id"],
+                childColumns = ["endId"],
                 onDelete = CASCADE))])
 data class Shot(
-        @ColumnInfo(name = "_id")
         @PrimaryKey(autoGenerate = true)
         override var id: Long = 0,
 
         // The index of the shot in the containing end
         var index: Int = 0,
 
-        @ColumnInfo(name = "end")
         var endId: Long? = null,
 
         var x: Float = 0f,
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
index 5a9c5adec..102b5b342 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
@@ -15,7 +15,6 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
-import android.arch.persistence.room.ColumnInfo
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.ForeignKey
 import android.arch.persistence.room.ForeignKey.CASCADE
@@ -29,15 +28,13 @@ import kotlinx.android.parcel.Parcelize
 @SuppressLint("ParcelCreator")
 @Parcelize
 @Entity(foreignKeys = [(ForeignKey(entity = Bow::class,
-                parentColumns = ["_id"],
-                childColumns = ["bow"],
+                parentColumns = ["id"],
+                childColumns = ["bowId"],
                 onDelete = CASCADE))])
 data class SightMark(
-        @ColumnInfo(name = "_id")
         @PrimaryKey(autoGenerate = true)
         override var id: Long = 0,
 
-        @ColumnInfo(name = "bow")
         var bowId: Long? = null,
 
         var distance: Dimension = Dimension(18f, METER),
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt
index b997a0e24..d5f976d75 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Signature.kt
@@ -26,7 +26,6 @@ import de.dreier.mytargets.shared.utils.writeBitmap
 
 @Entity
 data class Signature(
-        @ColumnInfo(name = "_id")
         @PrimaryKey(autoGenerate = true)
         var id: Long = 0,
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
index 3fd768279..e7c6bd406 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
@@ -15,7 +15,6 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
-import android.arch.persistence.room.ColumnInfo
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.PrimaryKey
 import android.os.Parcelable
@@ -26,7 +25,6 @@ import kotlinx.android.parcel.Parcelize
 @Parcelize
 @Entity
 data class StandardRound(
-        @ColumnInfo(name = "_id")
         @PrimaryKey(autoGenerate = true)
         override var id: Long = 0,
         var club: Int = 0,
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
index d02ace083..42bd8bdef 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
@@ -16,8 +16,11 @@
 package de.dreier.mytargets.shared.models.db
 
 import android.annotation.SuppressLint
-import android.arch.persistence.room.*
+import android.arch.persistence.room.Embedded
+import android.arch.persistence.room.Entity
+import android.arch.persistence.room.ForeignKey
 import android.arch.persistence.room.ForeignKey.SET_NULL
+import android.arch.persistence.room.PrimaryKey
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Environment
 import de.dreier.mytargets.shared.models.IIdSettable
@@ -29,64 +32,57 @@ import org.threeten.bp.format.FormatStyle
 
 @SuppressLint("ParcelCreator")
 @Parcelize
-@Entity(foreignKeys = [
-    ForeignKey(entity = Arrow::class,
-            parentColumns = ["_id"],
-            childColumns = ["arrow"],
-            onDelete = SET_NULL),
-    ForeignKey(entity = Bow::class,
-            parentColumns = ["_id"],
-            childColumns = ["bow"],
-            onDelete = SET_NULL),
-    ForeignKey(entity = StandardRound::class,
-            parentColumns = ["_id"],
-            childColumns = ["standardRound"],
-            onDelete = SET_NULL),
-    ForeignKey(entity = Signature::class,
-            parentColumns = ["_id"],
-            childColumns = ["archerSignature"],
-            onDelete = SET_NULL),
-    ForeignKey(entity = Signature::class,
-            parentColumns = ["_id"],
-            childColumns = ["witnessSignature"],
-            onDelete = SET_NULL)
-])
+@Entity(
+    foreignKeys = [
+        ForeignKey(
+            entity = Arrow::class,
+            parentColumns = ["id"],
+            childColumns = ["arrowId"],
+            onDelete = SET_NULL
+        ),
+        ForeignKey(
+            entity = Bow::class,
+            parentColumns = ["id"],
+            childColumns = ["bowId"],
+            onDelete = SET_NULL
+        ),
+        ForeignKey(
+            entity = StandardRound::class,
+            parentColumns = ["id"],
+            childColumns = ["standardRoundId"],
+            onDelete = SET_NULL
+        ),
+        ForeignKey(
+            entity = Signature::class,
+            parentColumns = ["id"],
+            childColumns = ["archerSignatureId"],
+            onDelete = SET_NULL
+        ),
+        ForeignKey(
+            entity = Signature::class,
+            parentColumns = ["id"],
+            childColumns = ["witnessSignatureId"],
+            onDelete = SET_NULL
+        )
+    ]
+)
 data class Training(
 
-        @ColumnInfo(name = "_id")
-        @PrimaryKey(autoGenerate = true)
-        override var id: Long = 0L,
-
-        var title: String = "",
-        var date: LocalDate = LocalDate.now(),
-
-        @ColumnInfo(name = "standardRound")
-        var standardRoundId: Long? = null,
-
-        @ColumnInfo(name = "bow")
-        var bowId: Long? = null,
-
-        @ColumnInfo(name = "arrow")
-        var arrowId: Long? = null,
-
-        var arrowNumbering: Boolean = false,
-
-        @Embedded
-        var environment: Environment = Environment(),
-
-        var comment: String = "",
-
-        @ColumnInfo(name = "archerSignature")
-        var archerSignatureId: Long? = null,
-
-        @ColumnInfo(name = "witnessSignature")
-        var witnessSignatureId: Long? = null,
-
-        @Embedded
-        var score: Score = Score()
+    @PrimaryKey(autoGenerate = true)
+    override var id: Long = 0L,
+    var title: String = "",
+    var date: LocalDate = LocalDate.now(),
+    var standardRoundId: Long? = null,
+    var bowId: Long? = null,
+    var arrowId: Long? = null,
+    var arrowNumbering: Boolean = false,
+    @Embedded var environment: Environment = Environment(),
+    var comment: String = "",
+    var archerSignatureId: Long? = null,
+    var witnessSignatureId: Long? = null,
+    @Embedded var score: Score = Score()
 
 ) : IIdSettable, Parcelable {
-
     val formattedDate: String
         get() = date.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM))
 }

From 01189b5d85e84ef2fcaa42252f23c76d8b323436 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Thu, 22 Mar 2018 22:12:40 +0100
Subject: [PATCH 071/102] Fixed Schema, but second Training is gone

---
 .../26.json                                   | 12 ++--
 .../base/db/migrations/Migration26.kt         | 62 ++++++++++---------
 .../db/migrations/RoomCreationCallback.kt     | 60 ++++++++++++------
 .../dreier/mytargets/shared/models/Target.kt  |  2 +-
 .../shared/models/db/RoundTemplate.kt         | 42 ++++++++-----
 5 files changed, 104 insertions(+), 74 deletions(-)

diff --git a/app/schemas/de.dreier.mytargets.base.db.AppDatabase/26.json b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/26.json
index d55ac90df..81e3b617b 100644
--- a/app/schemas/de.dreier.mytargets.base.db.AppDatabase/26.json
+++ b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/26.json
@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 26,
-    "identityHash": "b6d6b0158fa45fc088c7bc0db5d85fb7",
+    "identityHash": "b555dd5093c13ff4448ebc4fb7f3b8ed",
     "entities": [
       {
         "tableName": "Arrow",
@@ -468,7 +468,7 @@
       },
       {
         "tableName": "Round",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `trainingId` INTEGER, `index` INTEGER NOT NULL, `shotsPerEnd` INTEGER NOT NULL, `maxEndCount` INTEGER, `distance` TEXT NOT NULL, `comment` TEXT NOT NULL, `targetId` INTEGER NOT NULL, `targetScoringStyle` INTEGER NOT NULL, `targetDiameter` TEXT NOT NULL, `reachedPoints` INTEGER NOT NULL, `totalPoints` INTEGER NOT NULL, `shotCount` INTEGER NOT NULL, FOREIGN KEY(`trainingId`) REFERENCES `Training`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `trainingId` INTEGER, `index` INTEGER NOT NULL, `shotsPerEnd` INTEGER NOT NULL, `maxEndCount` INTEGER, `distance` TEXT NOT NULL, `comment` TEXT NOT NULL, `targetId` INTEGER NOT NULL, `targetScoringStyleIndex` INTEGER NOT NULL, `targetDiameter` TEXT NOT NULL, `reachedPoints` INTEGER NOT NULL, `totalPoints` INTEGER NOT NULL, `shotCount` INTEGER NOT NULL, FOREIGN KEY(`trainingId`) REFERENCES `Training`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
         "fields": [
           {
             "fieldPath": "id",
@@ -520,7 +520,7 @@
           },
           {
             "fieldPath": "target.scoringStyleIndex",
-            "columnName": "targetScoringStyle",
+            "columnName": "targetScoringStyleIndex",
             "affinity": "INTEGER",
             "notNull": true
           },
@@ -572,7 +572,7 @@
       },
       {
         "tableName": "RoundTemplate",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `standardRoundId` INTEGER, `index` INTEGER NOT NULL, `shotsPerEnd` INTEGER NOT NULL, `endCount` INTEGER NOT NULL, `distance` TEXT NOT NULL, `targetId` INTEGER NOT NULL, `targetScoringStyle` INTEGER NOT NULL, `targetDiameter` TEXT NOT NULL, FOREIGN KEY(`standardRoundId`) REFERENCES `StandardRound`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `standardRoundId` INTEGER, `index` INTEGER NOT NULL, `shotsPerEnd` INTEGER NOT NULL, `endCount` INTEGER NOT NULL, `distance` TEXT NOT NULL, `targetId` INTEGER NOT NULL, `targetScoringStyleIndex` INTEGER NOT NULL, `targetDiameter` TEXT NOT NULL, FOREIGN KEY(`standardRoundId`) REFERENCES `StandardRound`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
         "fields": [
           {
             "fieldPath": "id",
@@ -618,7 +618,7 @@
           },
           {
             "fieldPath": "targetTemplate.scoringStyleIndex",
-            "columnName": "targetScoringStyle",
+            "columnName": "targetScoringStyleIndex",
             "affinity": "INTEGER",
             "notNull": true
           },
@@ -1013,7 +1013,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"b6d6b0158fa45fc088c7bc0db5d85fb7\")"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"b555dd5093c13ff4448ebc4fb7f3b8ed\")"
     ]
   }
 }
\ No newline at end of file
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
index e57cdb5a0..696a8ea09 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
@@ -24,23 +24,24 @@ import de.dreier.mytargets.shared.models.db.Shot
 object Migration26 : Migration(25, 26) {
     override fun migrate(database: SupportSQLiteDatabase) {
 
-        database.execSQL("ALTER TABLE `Training` ADD COLUMN reachedPoints INTEGER;")
-        database.execSQL("ALTER TABLE `Training` ADD COLUMN totalPoints INTEGER;")
-        database.execSQL("ALTER TABLE `Training` ADD COLUMN shotCount INTEGER;")
+        database.execSQL("ALTER TABLE `Training` ADD COLUMN reachedPoints INTEGER DEFAULT 0;")
+        database.execSQL("ALTER TABLE `Training` ADD COLUMN totalPoints INTEGER DEFAULT 0;")
+        database.execSQL("ALTER TABLE `Training` ADD COLUMN shotCount INTEGER DEFAULT 0;")
 
-        database.execSQL("ALTER TABLE `Round` ADD COLUMN reachedPoints INTEGER;")
-        database.execSQL("ALTER TABLE `Round` ADD COLUMN totalPoints INTEGER;")
-        database.execSQL("ALTER TABLE `Round` ADD COLUMN shotCount INTEGER;")
+        database.execSQL("ALTER TABLE `Round` ADD COLUMN reachedPoints INTEGER DEFAULT 0;")
+        database.execSQL("ALTER TABLE `Round` ADD COLUMN totalPoints INTEGER DEFAULT 0;")
+        database.execSQL("ALTER TABLE `Round` ADD COLUMN shotCount INTEGER DEFAULT 0;")
 
-        database.execSQL("ALTER TABLE `End` ADD COLUMN reachedPoints INTEGER;")
-        database.execSQL("ALTER TABLE `End` ADD COLUMN totalPoints INTEGER;")
-        database.execSQL("ALTER TABLE `End` ADD COLUMN shotCount INTEGER;")
+        database.execSQL("ALTER TABLE `End` ADD COLUMN reachedPoints INTEGER DEFAULT 0;")
+        database.execSQL("ALTER TABLE `End` ADD COLUMN totalPoints INTEGER DEFAULT 0;")
+        database.execSQL("ALTER TABLE `End` ADD COLUMN shotCount INTEGER DEFAULT 0;")
+
+        recreateTablesWithNonNull(database)
 
         RoomCreationCallback.createScoreTriggers(database)
 
         val rounds = database.query(
-            "SELECT id, targetId, targetScoringStyle, targetDiameter " +
-                    "FROM Round"
+            "SELECT id, targetId, targetScoringStyleIndex, targetDiameter FROM Round"
         )
 
         while (rounds.moveToNext()) {
@@ -52,12 +53,12 @@ object Migration26 : Migration(25, 26) {
             val target = Target(rounds.getLong(1), rounds.getInt(2), diameter)
             val roundId = rounds.getLong(0)
 
-            val ends = database.query("SELECT _id FROM `End` WHERE round = $roundId")
+            val ends = database.query("SELECT id FROM `End` WHERE roundId = $roundId")
             while (ends.moveToNext()) {
                 val endId = ends.getLong(0)
 
                 val shotsCursor =
-                    database.query("SELECT `index`, scoringRing FROM Shot WHERE end = $endId ORDER BY `index`")
+                    database.query("SELECT `index`, scoringRing FROM Shot WHERE endId = $endId ORDER BY `index`")
                 val shots = mutableListOf<Shot>()
                 while (shotsCursor.moveToNext()) {
                     val shot =
@@ -71,11 +72,13 @@ object Migration26 : Migration(25, 26) {
                             "reachedPoints = ${score.reachedPoints}, " +
                             "totalPoints = ${score.totalPoints}, " +
                             "shotCount = ${score.shotCount} " +
-                            "WHERE _id = $endId"
+                            "WHERE id = $endId"
                 )
             }
         }
+    }
 
+    private fun recreateTablesWithNonNull(database: SupportSQLiteDatabase) {
         val migrations = listOf(
             TableMigrationBuilder("Arrow")
                 .field(
@@ -161,7 +164,7 @@ object Migration26 : Migration(25, 26) {
                     refColumn = "id",
                     onDelete = "CASCADE"
                 ),
-            
+
             TableMigrationBuilder("StandardRound")
                 .field(
                     name = "id",
@@ -181,7 +184,7 @@ object Migration26 : Migration(25, 26) {
                 )
                 .field(
                     name = "standardRoundId",
-                    columnName = "standardRoundId",
+                    columnName = "standardRound",
                     affinity = "INTEGER",
                     refTable = "StandardRound",
                     refColumn = "id",
@@ -248,7 +251,7 @@ object Migration26 : Migration(25, 26) {
                 .field(name = "date", notNull = true)
                 .field(
                     name = "standardRoundId",
-                    columnName = "standardRoundId",
+                    columnName = "standardRound",
                     affinity = "INTEGER",
                     refTable = "StandardRound",
                     refColumn = "id",
@@ -296,7 +299,7 @@ object Migration26 : Migration(25, 26) {
                 .field(name = "reachedPoints", affinity = "INTEGER", notNull = true)
                 .field(name = "totalPoints", affinity = "INTEGER", notNull = true)
                 .field(name = "shotCount", affinity = "INTEGER", notNull = true),
-            
+
             TableMigrationBuilder("Round")
                 .field(
                     name = "id",
@@ -318,18 +321,17 @@ object Migration26 : Migration(25, 26) {
                 .field(name = "distance", notNull = true)
                 .field(name = "comment", notNull = true)
                 .field(
-                    name = "target.id",
-                    columnName = "targetId",
+                    name = "targetId",
                     affinity = "INTEGER",
                     notNull = true
                 )
                 .field(
-                    name = "target.scoringStyleIndex",
+                    name = "targetScoringStyleIndex",
                     columnName = "targetScoringStyle",
                     affinity = "INTEGER",
                     notNull = true
                 )
-                .field(name = "target.diameter", columnName = "targetDiameter", notNull = true)
+                .field(name = "targetDiameter", notNull = true)
                 .field(name = "reachedPoints", affinity = "INTEGER", notNull = true)
                 .field(name = "totalPoints", affinity = "INTEGER", notNull = true)
                 .field(name = "shotCount", affinity = "INTEGER", notNull = true),
@@ -426,8 +428,8 @@ class TableMigrationBuilder(val tableName: String) {
     ): TableMigrationBuilder {
         fieldMigrations.add(
             FieldMigration(
-                name = name,
-                columnName = columnName ?: name,
+                name = "`$name`",
+                columnName = "`${columnName ?: name}`",
                 affinity = affinity,
                 notNull = notNull,
                 refTable = refTable,
@@ -450,13 +452,13 @@ class TableMigrationBuilder(val tableName: String) {
 
     fun copyData(database: SupportSQLiteDatabase) {
         database.execSQL("INSERT INTO `$newTableName` (" + fieldMigrations.joinToString(separator = ", ") { it.name } + ") "
-                + "SELECT " + fieldMigrations.joinToString(separator = ", ") { it.columnName }
-                + " FROM $tableName")
+                + "SELECT " + fieldMigrations.joinToString(separator = ", ") {  it.columnName }
+                + " FROM `$tableName`")
     }
 
     fun replaceOldTableWithNewTable(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE $tableName")
-        database.execSQL("ALTER TABLE $newTableName RENAME TO $tableName")
+        database.execSQL("DROP TABLE `$tableName`")
+        database.execSQL("ALTER TABLE `$newTableName` RENAME TO `$tableName`")
     }
 }
 
@@ -471,10 +473,10 @@ data class FieldMigration(
     val onDelete: String
 ) {
     override fun toString(): String {
-        return "`$name` $affinity${if (notNull) " NOT NULL" else ""}"
+        return "$name $affinity${if (notNull) " NOT NULL" else ""}"
     }
 
     fun referenceToString(): String {
-        return "FOREIGN KEY(`$name`) REFERENCES `$refTable`(`$refColumn`) ON UPDATE $onUpdate ON DELETE $onDelete"
+        return "FOREIGN KEY($name) REFERENCES `$refTable`(`$refColumn`) ON UPDATE $onUpdate ON DELETE $onDelete"
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
index 631f97930..2018e1d7c 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
@@ -17,40 +17,60 @@ package de.dreier.mytargets.base.db.migrations
 
 import android.arch.persistence.db.SupportSQLiteDatabase
 import android.arch.persistence.room.RoomDatabase
+import de.dreier.mytargets.base.db.StandardRoundFactory
 import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.StandardRound
-import de.dreier.mytargets.base.db.StandardRoundFactory
 
 object RoomCreationCallback : RoomDatabase.Callback() {
 
     override fun onCreate(db: SupportSQLiteDatabase) {
-        fillStandardRound(db)
+        fillStandardRound(db, "id", "standardRoundId")
         createScoreTriggers(db)
     }
 
-    fun fillStandardRound(db: SupportSQLiteDatabase) {
+    fun fillStandardRound(
+        db: SupportSQLiteDatabase,
+        idColumn: String,
+        standardRoundColumn: String
+    ) {
         val standardRounds = StandardRoundFactory.initTable()
         for (standardRound in standardRounds) {
-            saveStandardRound(db, standardRound.standardRound, standardRound.roundTemplates)
+            saveStandardRound(
+                db,
+                standardRound.standardRound,
+                standardRound.roundTemplates,
+                idColumn,
+                standardRoundColumn
+            )
         }
     }
 
-    private fun saveStandardRound(db: SupportSQLiteDatabase, standardRound: StandardRound,
-                                  roundTemplates: List<RoundTemplate>) {
-        insertStandardRound(db, standardRound)
+    private fun saveStandardRound(
+        db: SupportSQLiteDatabase,
+        standardRound: StandardRound,
+        roundTemplates: List<RoundTemplate>,
+        idColumn: String,
+        standardRoundColumn: String
+    ) {
+        insertStandardRound(db, standardRound, idColumn)
         for (roundTemplate in roundTemplates) {
             roundTemplate.standardRoundId = standardRound.id
-            insertRoundTemplate(db, roundTemplate)
+            insertRoundTemplate(db, roundTemplate, idColumn, standardRoundColumn)
         }
     }
 
-    private fun insertStandardRound(db: SupportSQLiteDatabase, standardRound: StandardRound) {
-        db.execSQL("INSERT OR REPLACE INTO StandardRound(id, club, name) VALUES (?,?,?)",
+    private fun insertStandardRound(db: SupportSQLiteDatabase, standardRound: StandardRound, idColumn: String) {
+        db.execSQL("INSERT OR REPLACE INTO StandardRound($idColumn, club, name) VALUES (?,?,?)",
                 arrayOf(standardRound.id, standardRound.club, standardRound.name))
     }
 
-    private fun insertRoundTemplate(db: SupportSQLiteDatabase, roundTemplate: RoundTemplate) {
-        db.execSQL("INSERT OR REPLACE INTO RoundTemplate(id, standardRoundId, `index`, " +
+    private fun insertRoundTemplate(
+        db: SupportSQLiteDatabase,
+        roundTemplate: RoundTemplate,
+        idColumn: String,
+        standardRoundColumn: String
+    ) {
+        db.execSQL("INSERT OR REPLACE INTO RoundTemplate($idColumn, $standardRoundColumn, `index`, " +
                 "shotsPerEnd, endCount, distance, targetId, targetScoringStyle, targetDiameter) " +
                 "VALUES (?,?,?,?,?,?,?,?,?)",
                 arrayOf(roundTemplate.id, roundTemplate.standardRoundId, roundTemplate.index,
@@ -67,20 +87,20 @@ object RoomCreationCallback : RoomDatabase.Callback() {
                 "AFTER UPDATE ON `End` " +
                 "BEGIN " +
                 "UPDATE `Round` SET " +
-                "reachedPoints = (SELECT SUM(reachedPoints) FROM `End` WHERE round = NEW.round), " +
-                "totalPoints = (SELECT SUM(totalPoints) FROM `End` WHERE round = NEW.round), " +
-                "shotCount = (SELECT SUM(shotCount) FROM `End` WHERE round = NEW.round) " +
-                "WHERE id = NEW.round;" +
+                "reachedPoints = (SELECT SUM(reachedPoints) FROM `End` WHERE roundId = NEW.roundId), " +
+                "totalPoints = (SELECT SUM(totalPoints) FROM `End` WHERE roundId = NEW.roundId), " +
+                "shotCount = (SELECT SUM(shotCount) FROM `End` WHERE roundId = NEW.roundId) " +
+                "WHERE id = NEW.roundId;" +
                 "END;")
 
         database.execSQL("CREATE TRIGGER training_sum_score " +
                 "AFTER UPDATE ON `Round` " +
                 "BEGIN " +
                 "UPDATE `Training` SET " +
-                "reachedPoints = (SELECT SUM(reachedPoints) FROM `Round` WHERE training = NEW.training), " +
-                "totalPoints = (SELECT SUM(totalPoints) FROM `Round` WHERE training = NEW.training), " +
-                "shotCount = (SELECT SUM(shotCount) FROM `Round` WHERE training = NEW.training) " +
-                "WHERE id = NEW.training;" +
+                "reachedPoints = (SELECT SUM(reachedPoints) FROM `Round` WHERE trainingId = NEW.trainingId), " +
+                "totalPoints = (SELECT SUM(totalPoints) FROM `Round` WHERE trainingId = NEW.trainingId), " +
+                "shotCount = (SELECT SUM(shotCount) FROM `Round` WHERE trainingId = NEW.trainingId) " +
+                "WHERE id = NEW.trainingId;" +
                 "END;")
     }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
index 28d9d90ba..fe4ee03ca 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
@@ -36,7 +36,7 @@ import kotlinx.android.parcel.Parcelize
 data class Target(
         @ColumnInfo(name = "targetId")
         override var id: Long = 0,
-        @ColumnInfo(name = "targetScoringStyle")
+        @ColumnInfo(name = "targetScoringStyleIndex")
         var scoringStyleIndex: Int = 0,
         @ColumnInfo(name = "targetDiameter")
         var diameter: Dimension = Dimension.UNKNOWN
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
index 951807700..aa7d5615c 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
@@ -15,23 +15,30 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.*
+import android.arch.persistence.room.Embedded
+import android.arch.persistence.room.Entity
+import android.arch.persistence.room.ForeignKey
 import android.arch.persistence.room.ForeignKey.CASCADE
+import android.arch.persistence.room.PrimaryKey
 import android.os.Parcel
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.IIdSettable
 import de.dreier.mytargets.shared.models.Target
 
-@Entity(foreignKeys = [(ForeignKey(entity = StandardRound::class,
+@Entity(
+    foreignKeys = [(ForeignKey(
+        entity = StandardRound::class,
         parentColumns = ["id"],
         childColumns = ["standardRoundId"],
-        onDelete = CASCADE))])
+        onDelete = CASCADE
+    ))]
+)
 data class RoundTemplate(
     @PrimaryKey(autoGenerate = true)
-        override var id: Long = 0,
+    override var id: Long = 0,
 
-        var standardRoundId: Long? = null,
+    var standardRoundId: Long? = null,
 
     var index: Int = 0,
 
@@ -42,16 +49,16 @@ data class RoundTemplate(
     var distance: Dimension = Dimension.UNKNOWN,
 
     @Embedded
-        var targetTemplate: Target = Target()
+    var targetTemplate: Target = Target()
 ) : IIdSettable, Parcelable {
     constructor(source: Parcel) : this(
-            source.readLong(),
-            source.readValue(Long::class.java.classLoader) as Long?,
-            source.readInt(),
-            source.readInt(),
-            source.readInt(),
-            source.readParcelable<Dimension>(Dimension::class.java.classLoader),
-            source.readParcelable<Target>(Target::class.java.classLoader)
+        source.readLong(),
+        source.readValue(Long::class.java.classLoader) as Long?,
+        source.readInt(),
+        source.readInt(),
+        source.readInt(),
+        source.readParcelable<Dimension>(Dimension::class.java.classLoader),
+        source.readParcelable<Target>(Target::class.java.classLoader)
     )
 
     override fun describeContents() = 0
@@ -68,9 +75,10 @@ data class RoundTemplate(
 
     companion object {
         @JvmField
-        val CREATOR: Parcelable.Creator<RoundTemplate> = object : Parcelable.Creator<RoundTemplate> {
-            override fun createFromParcel(source: Parcel): RoundTemplate = RoundTemplate(source)
-            override fun newArray(size: Int): Array<RoundTemplate?> = arrayOfNulls(size)
-        }
+        val CREATOR: Parcelable.Creator<RoundTemplate> =
+            object : Parcelable.Creator<RoundTemplate> {
+                override fun createFromParcel(source: Parcel): RoundTemplate = RoundTemplate(source)
+                override fun newArray(size: Int): Array<RoundTemplate?> = arrayOfNulls(size)
+            }
     }
 }

From d7dc8ff660c19ab49727be41c51e06108f961932 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Sat, 24 Mar 2018 10:40:33 +0100
Subject: [PATCH 072/102] Fixed MigrationTest

---
 .../16.json                                   | 656 +++++++++++++++++-
 build.gradle                                  |   2 +-
 2 files changed, 656 insertions(+), 2 deletions(-)

diff --git a/app/schemas/de.dreier.mytargets.base.db.AppDatabase/16.json b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/16.json
index ed7cd1a12..2363f8d50 100644
--- a/app/schemas/de.dreier.mytargets.base.db.AppDatabase/16.json
+++ b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/16.json
@@ -643,7 +643,661 @@
     "identityHash": "cc22aefa9081b7cc1e4247705865e22d",
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"cc22aefa9081b7cc1e4247705865e22d\")"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"cc22aefa9081b7cc1e4247705865e22d\")",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (1,'Australian Kombiniert Halle',2,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (2,'Australian Halle 1',2,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (3,'Australian Halle 2',2,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (4,'DAIR 380',1,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (5,'WA 18 (40cm)',128,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (6,'WA 18 (60cm)',128,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (7,'WA 25',128,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (8,'WA Kombiniert',128,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (9,'Match Round',128,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (10,'Stafford',4,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (11,'Bray I',4,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (12,'Bray II',4,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (13,'Portsmouth',4,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (14,'Worcester',4,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (15,'Vegas 300',4,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (16,'IFAA 150 Indoor: Erwachsene/Jugend',8,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (17,'IFAA 150 Indoor: Cub',8,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (18,'NASP 300',16,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (19,'NFAA 420',32,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (20,'NFAA/IFAA 300: Cub',32,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (21,'Flint Bowman Indoor',32,1)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (22,'WA 50',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (23,'WA 60',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (24,'WA 70',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (25,'WA 900',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (26,'WA Bowman',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (27,'WA 1440 Schüler männlich',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (28,'WA 1440 Schüler weiblich',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (29,'WA Compound Einzelwertung',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (30,'WA Compound Qualifikation',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (31,'WA Cub',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (32,'WA Standard',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (33,'Olympische Runde',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (34,'WA 1440 Junioren männlich',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (35,'WA 1440 Junioren weiblich',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (36,'WA 1440 Herren Master 50+',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (37,'WA 1440 Herren Master 60+',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (38,'WA 1440 Herren Master 70+',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (39,'WA 1440 Herren Senior',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (40,'WA 1440 Damen Master 50+',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (41,'WA 1440 Damen Master 60+',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (42,'WA 1440 Damen Master 70+',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (43,'WA 1440 Damen Senior',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (44,'Half WA 1440 Schüler männlich',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (45,'Half WA 1440 Schüler weiblich',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (46,'Half WA 1440 Junioren männlich',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (47,'Half WA 1440 Junioren weiblich',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (48,'Half WA 1440 Herren Master 50+',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (49,'Half WA 1440 Herren Master 60+',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (50,'Half WA 1440 Herren Master 70+',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (51,'Half WA 1440 Herren Senior',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (52,'Half WA 1440 Damen Master 50+',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (53,'Half WA 1440 Damen Master 60+',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (54,'Half WA 1440 Damen Master 70+',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (55,'Half WA 1440 Damen Senior',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (56,'WA Doppel 720 30m (80cm)',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (57,'WA Doppel 720 40m (80cm)',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (58,'WA Doppel 720 40m (122cm)',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (59,'WA Doppel 720 50m (80cm)',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (60,'WA Doppel 720 50m (122cm)',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (61,'WA Doppel 720 60m (122cm)',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (62,'WA Doppel 720 70m (122cm)',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (63,'WA Elimination Einzelwettbewerb Compound 18m',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (64,'WA Elimination Einzelwettbewerb Compound 40m',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (65,'WA Elimination Einzelwettbewerb Compound 50m',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (66,'WA Elimination Recurve 18m',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (67,'WA Elimination Recurve 50m',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (68,'WA Elimination Recurve 60m',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (69,'WA Elimination Recurve 70m',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (70,'Albion',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (71,'American',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (72,'Bristol I',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (73,'Bristol II',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (74,'Bristol III',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (75,'Bristol IV',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (76,'Bristol V',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (77,'Hereford',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (78,'Short Junior National',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (79,'Short Junior Warwick',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (80,'Short Junior Western',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (81,'Short Junior Windsor',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (82,'Junior National',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (83,'Junior Warwick',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (84,'Junior Western',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (85,'Junior Windsor',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (86,'Short National',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (87,'Short Warwick',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (88,'Short Western',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (89,'Short Windsor',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (90,'National',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (91,'St. George',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (92,'St. Nicholas',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (93,'Warwick',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (94,'Western',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (95,'Windsor',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (96,'York',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (97,'Long National',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (98,'Long Warwick',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (99,'Long Western',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (100,'New National',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (101,'New Warwick',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (102,'New Western',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (103,'Frostbite',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (104,'Half Metric I',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (105,'Half Metric II',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (106,'Half Metric III',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (107,'Half Metric IV',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (108,'Half Metric V',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (109,'Short Metric I',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (110,'Short Metric II',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (111,'Short Metric III',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (112,'Short Metric IV',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (113,'Short Metric V',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (114,'Metric I',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (115,'Metric II',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (116,'Metric III',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (117,'Metric IV',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (118,'Metric V',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (119,'Long Metric I',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (120,'Long Metric II',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (121,'Long Metric III',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (122,'Long Metric IV',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (123,'Long Metric V',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (124,'Long Metric (Herren)',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (125,'Long Metric (Damen)',4,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (126,'Adelaide',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (127,'Brisbane',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (128,'Canberra',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (129,'Darwin',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (130,'Drake',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (131,'Fremantle',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (132,'Geelong',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (133,'Grange',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (134,'Hobart',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (135,'Holt',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (136,'Horsham',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (137,'Intermediate',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (138,'Junior Canberra',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (139,'Launcheston',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (140,'Long Brisbane',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (141,'Long Sydney',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (142,'Melbourne',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (143,'Newcastle',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (144,'Perth',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (145,'Short Adelaide',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (146,'Short Canberra',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (147,'Sydney',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (148,'Townsville',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (149,'Wollongong',2,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (150,'NFAA 600',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (151,'NFAA 600 Klassisch/Dakota',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (152,'NFAA 600 Klassisch/Dakota: Cub',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (153,'NFAA 600 Klassisch/Dakota: Junioren',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (154,'NFAA 600: Cub',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (155,'NFAA 600: Junioren',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (156,'NFAA/American 810',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (157,'NFAA/American 810: Cub',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (158,'NFAA/American 810: Junioren',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (159,'NFAA/American 900',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (160,'NFAA/American 900: Cub',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (161,'NFAA/American 900: Junioren',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (162,'Canadian 900',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (163,'T2S 900',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (164,'IFAA Animal 280',8,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (165,'IFAA Animal 300',8,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (166,'IFAA Animal 560',8,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (167,'NFAA/IFAA International 150',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (168,'NFAA/IFAA International 300',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (169,'NFAA Animal 280',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (170,'NFAA Animal 300',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (171,'NFAA Animal 588',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (172,'NFAA Lake of the Woods',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (173,'NFAA/IFAA Expert Field 300',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (174,'NFAA/IFAA Expert Field Nur 560',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (175,'NFAA/IFAA Field 280',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (176,'NFAA/IFAA Field 300',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (177,'NFAA/IFAA Field 560',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (178,'NFAA/IFAA Hunter 280',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (179,'NFAA/IFAA Hunter 300',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (180,'NFAA/IFAA Hunter 560',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (181,'NFAA/IFAA Field/Hunter 560',32,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (182,'WA Field 12 Unmarkiert/12 Markiert: Rote Pflöcke',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (183,'WA Field Markiert 12: Rote Pflöcke',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (184,'WA Field Markiert 24: Rote Pflöcke',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (185,'WA Field Unmarkiert 12: Rote Pflöcke',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (186,'WA Field Unmarkiert 24: Rote Pflöcke',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (187,'WA Field 12 Unmarkiert/12 Markiert: Blaue Pflöcke',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (188,'WA Field Markiert 12: Blaue Pflöcke',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (189,'WA Field Markiert 24: Blaue Pflöcke',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (190,'WA Field Unmarkiert 12: Blaue Pflöcke',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (191,'WA Field Unmarkiert 24: Blaue Pflöcke',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (192,'WA Field 12 Unmarkiert/12 Markiert: Gelbe Pflöcke',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (193,'WA Field Markiert 12: Gelbe Pflöcke',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (194,'WA Field Markiert 24: Gelbe Pflöcke',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (195,'WA Field Unmarkiert 12: Gelbe Pflöcke',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (196,'WA Field Unmarkiert 24: Gelbe Pflöcke',128,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (197,'Großes Spiel 36',64,0)",
+      "INSERT INTO `STANDARD_ROUND_TEMPLATE` (_id,name,club,indoor) VALUES (198,'Großes Spiel 40',64,0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (1,1,0,18,'m',10,3,2,40,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (2,1,1,25,'m',10,3,2,60,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (3,2,0,18,'m',10,3,2,40,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (4,3,0,25,'m',10,3,2,60,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (5,4,0,25,'m',10,3,19,60,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (6,5,0,18,'m',20,3,2,40,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (7,6,0,18,'m',20,3,2,60,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (8,7,0,25,'m',20,3,0,60,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (9,8,0,25,'m',20,3,0,60,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (10,8,1,18,'m',20,3,0,40,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (11,9,0,18,'m',4,3,5,40,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (12,10,0,30,'m',24,3,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (13,11,0,20,'yd',5,6,0,40,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (14,12,0,25,'yd',5,6,0,60,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (15,13,0,20,'yd',20,3,0,60,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (16,14,0,20,'yd',12,5,12,16,'in',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (17,15,0,20,'yd',20,3,2,40,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (18,16,0,20,'yd',6,5,2,40,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (19,17,0,10,'yd',6,5,2,40,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (20,18,0,10,'m',3,5,2,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (21,18,1,15,'m',3,5,2,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (22,19,0,10,'yd',12,5,10,40,'cm',2)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (23,20,0,20,'yd',12,5,10,40,'cm',2)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (24,21,0,-1,'yd',7,4,7,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (25,22,0,50,'m',12,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (26,23,0,60,'m',12,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (27,24,0,70,'m',12,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (28,25,0,60,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (29,25,1,50,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (30,25,2,40,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (31,26,0,30,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (32,26,1,25,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (33,26,2,25,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (34,26,3,20,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (35,27,0,70,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (36,27,1,60,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (37,27,2,50,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (38,27,3,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (39,28,0,60,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (40,28,1,50,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (41,28,2,40,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (42,28,3,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (43,29,0,50,'m',5,3,1,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (44,30,0,50,'m',12,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (45,31,0,50,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (46,31,1,40,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (47,31,2,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (48,31,3,20,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (49,32,0,50,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (50,32,1,30,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (51,33,0,70,'m',4,3,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (52,34,0,90,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (53,34,1,70,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (54,34,2,50,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (55,34,3,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (56,35,0,70,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (57,35,1,60,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (58,35,2,50,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (59,35,3,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (60,36,0,70,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (61,36,1,60,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (62,36,2,50,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (63,36,3,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (64,37,0,70,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (65,37,1,60,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (66,37,2,50,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (67,37,3,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (68,38,0,60,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (69,38,1,50,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (70,38,2,40,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (71,38,3,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (72,39,0,90,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (73,39,1,70,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (74,39,2,50,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (75,39,3,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (76,40,0,60,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (77,40,1,50,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (78,40,2,40,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (79,40,3,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (80,41,0,60,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (81,41,1,50,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (82,41,2,40,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (83,41,3,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (84,42,0,60,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (85,42,1,50,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (86,42,2,40,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (87,42,3,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (88,43,0,70,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (89,43,1,60,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (90,43,2,50,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (91,43,3,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (92,44,0,70,'m',3,6,0,122,'m',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (93,44,1,60,'m',3,6,0,122,'m',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (94,44,2,50,'m',3,6,0,80,'m',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (95,44,3,30,'m',3,6,0,80,'m',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (96,45,0,60,'m',3,6,0,122,'m',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (97,45,1,50,'m',3,6,0,122,'m',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (98,45,2,40,'m',3,6,0,80,'m',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (99,45,3,30,'m',3,6,0,80,'m',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (100,46,0,90,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (101,46,1,70,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (102,46,2,50,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (103,46,3,30,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (104,47,0,70,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (105,47,1,60,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (106,47,2,50,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (107,47,3,30,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (108,48,0,70,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (109,48,1,60,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (110,48,2,50,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (111,48,3,30,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (112,49,0,70,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (113,49,1,60,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (114,49,2,50,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (115,49,3,30,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (116,50,0,60,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (117,50,1,50,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (118,50,2,40,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (119,50,3,30,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (120,51,0,90,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (121,51,1,70,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (122,51,2,50,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (123,51,3,30,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (124,52,0,60,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (125,52,1,50,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (126,52,2,40,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (127,52,3,30,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (128,53,0,60,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (129,53,1,50,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (130,53,2,40,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (131,53,3,30,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (132,54,0,60,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (133,54,1,50,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (134,54,2,40,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (135,54,3,30,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (136,55,0,70,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (137,55,1,60,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (138,55,2,50,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (139,55,3,30,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (140,56,0,30,'m',12,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (141,56,1,30,'m',12,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (142,57,0,40,'m',12,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (143,57,1,40,'m',12,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (144,58,0,40,'m',12,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (145,58,1,40,'m',12,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (146,59,0,50,'m',12,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (147,59,1,50,'m',12,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (148,60,0,50,'m',12,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (149,60,1,50,'m',12,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (150,61,0,60,'m',12,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (151,61,1,60,'m',12,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (152,62,0,70,'m',12,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (153,62,1,70,'m',12,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (154,63,0,18,'m',5,3,0,40,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (155,64,0,40,'m',5,3,1,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (156,65,0,50,'m',5,3,1,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (157,66,0,18,'m',5,3,0,40,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (158,67,0,50,'m',5,3,1,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (159,68,0,60,'m',5,3,1,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (160,69,0,70,'m',5,3,1,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (161,70,0,80,'yd',6,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (162,70,1,60,'yd',6,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (163,70,2,50,'yd',6,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (164,71,0,60,'yd',5,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (165,71,1,50,'yd',5,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (166,71,2,40,'yd',5,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (167,72,0,80,'yd',12,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (168,72,1,60,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (169,72,2,50,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (170,73,0,60,'yd',12,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (171,73,1,50,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (172,73,2,40,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (173,74,0,50,'yd',12,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (174,74,1,40,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (175,74,2,30,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (176,75,0,40,'yd',12,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (177,75,1,30,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (178,75,2,20,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (179,76,0,30,'yd',12,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (180,76,1,20,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (181,76,2,10,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (182,77,0,80,'yd',12,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (183,77,1,60,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (184,77,2,50,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (185,78,0,30,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (186,78,1,20,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (187,79,0,30,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (188,79,1,20,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (189,80,0,30,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (190,80,1,20,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (191,81,0,30,'yd',6,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (192,81,1,20,'yd',6,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (193,81,2,10,'yd',6,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (194,82,0,40,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (195,82,1,30,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (196,83,0,40,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (197,83,1,30,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (198,84,0,40,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (199,84,1,30,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (200,85,0,40,'yd',6,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (201,85,1,30,'yd',6,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (202,85,2,20,'yd',6,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (203,86,0,50,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (204,86,1,40,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (205,87,0,50,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (206,87,1,40,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (207,88,0,50,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (208,88,1,40,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (209,89,0,50,'yd',6,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (210,89,1,40,'yd',6,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (211,89,2,30,'yd',6,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (212,90,0,60,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (213,90,1,50,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (214,91,0,100,'yd',6,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (215,91,1,80,'yd',6,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (216,91,2,60,'yd',6,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (217,92,0,40,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (218,92,1,30,'yd',6,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (219,93,0,60,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (220,93,1,50,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (221,94,0,60,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (222,94,1,50,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (223,95,0,60,'yd',6,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (224,95,1,50,'yd',6,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (225,95,2,40,'yd',6,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (226,96,0,100,'yd',12,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (227,96,1,80,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (228,96,2,60,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (229,97,0,80,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (230,97,1,60,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (231,98,0,80,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (232,98,1,60,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (233,99,0,80,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (234,99,1,60,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (235,100,0,100,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (236,100,1,80,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (237,101,0,100,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (238,101,1,80,'yd',4,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (239,102,0,100,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (240,102,1,80,'yd',8,6,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (241,103,0,30,'m',12,3,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (242,104,0,70,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (243,104,1,60,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (244,104,2,50,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (245,104,3,30,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (246,105,0,60,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (247,105,1,50,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (248,105,2,40,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (249,105,3,30,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (250,106,0,50,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (251,106,1,40,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (252,106,2,30,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (253,106,3,20,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (254,107,0,40,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (255,107,1,30,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (256,107,2,20,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (257,107,3,10,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (258,108,0,30,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (259,108,1,20,'m',3,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (260,108,2,15,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (261,108,3,10,'m',3,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (262,109,0,50,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (263,109,1,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (264,110,0,40,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (265,110,1,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (266,111,0,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (267,111,1,20,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (268,112,0,20,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (269,112,1,10,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (270,113,0,15,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (271,113,1,10,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (272,114,0,70,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (273,114,1,60,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (274,114,2,50,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (275,114,3,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (276,115,0,60,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (277,115,1,50,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (278,115,2,40,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (279,115,3,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (280,116,0,50,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (281,116,1,40,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (282,116,2,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (283,116,3,20,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (284,117,0,40,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (285,117,1,30,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (286,117,2,20,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (287,117,3,10,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (288,118,0,30,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (289,118,1,20,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (290,118,2,15,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (291,118,3,10,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (292,119,0,70,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (293,119,1,60,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (294,120,0,60,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (295,120,1,50,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (296,121,0,50,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (297,121,1,40,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (298,122,0,40,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (299,122,1,30,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (300,123,0,30,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (301,123,1,20,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (302,124,0,90,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (303,124,1,70,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (304,125,0,70,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (305,125,1,60,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (306,126,0,60,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (307,126,1,50,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (308,126,2,40,'m',5,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (309,126,3,30,'m',5,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (310,127,0,70,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (311,127,1,60,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (312,127,2,50,'m',5,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (313,127,3,40,'m',5,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (314,128,0,60,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (315,128,1,50,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (316,128,2,40,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (317,129,0,40,'m',15,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (318,130,0,30,'m',15,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (319,131,0,60,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (320,131,1,50,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (321,131,2,40,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (322,131,3,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (323,132,0,30,'m',15,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (324,133,0,60,'m',15,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (325,134,0,90,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (326,134,1,70,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (327,134,2,50,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (328,135,0,50,'m',15,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (329,136,0,40,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (330,136,1,35,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (331,136,2,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (332,136,3,25,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (333,137,0,55,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (334,137,1,45,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (335,137,2,35,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (336,137,3,25,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (337,138,0,40,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (338,138,1,30,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (339,138,2,20,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (340,139,0,50,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (341,139,1,30,'m',6,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (342,140,0,90,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (343,140,1,70,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (344,140,2,60,'m',5,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (345,140,3,50,'m',5,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (346,141,0,90,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (347,141,1,70,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (348,141,2,60,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (349,141,3,50,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (350,142,0,90,'m',15,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (351,143,0,20,'m',15,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (352,144,0,70,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (353,144,1,60,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (354,144,2,50,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (355,145,0,50,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (356,145,1,40,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (357,145,2,30,'m',5,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (358,145,3,20,'m',5,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (359,146,0,50,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (360,146,1,40,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (361,146,2,30,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (362,147,0,70,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (363,147,1,60,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (364,147,2,50,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (365,147,3,40,'m',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (366,148,0,60,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (367,148,1,50,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (368,149,0,90,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (369,149,1,70,'m',6,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (370,150,0,60,'yd',4,5,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (371,150,1,50,'yd',4,5,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (372,150,2,40,'yd',4,5,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (373,151,0,40,'yd',4,5,0,92,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (374,151,1,50,'yd',4,5,0,92,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (375,151,2,60,'yd',4,5,0,92,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (376,152,0,10,'yd',4,5,0,92,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (377,152,1,20,'yd',4,5,0,92,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (378,152,2,30,'yd',4,5,0,92,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (379,153,0,30,'yd',4,5,0,92,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (380,153,1,40,'yd',4,5,0,92,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (381,153,2,50,'yd',4,5,0,92,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (382,154,0,30,'yd',4,5,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (383,154,1,20,'yd',4,5,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (384,154,2,10,'yd',4,5,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (385,155,0,50,'yd',4,5,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (386,155,1,40,'yd',4,5,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (387,155,2,30,'yd',4,5,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (388,156,0,60,'yd',6,5,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (389,156,1,50,'yd',6,5,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (390,156,2,40,'yd',6,5,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (391,157,0,30,'yd',6,5,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (392,157,1,20,'yd',6,5,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (393,157,2,10,'yd',6,5,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (394,158,0,50,'yd',6,5,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (395,158,1,40,'yd',6,5,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (396,158,2,30,'yd',6,5,0,122,'cm',4)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (397,159,0,60,'yd',6,5,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (398,159,1,50,'yd',6,5,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (399,159,2,40,'yd',6,5,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (400,160,0,30,'yd',6,5,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (401,160,1,20,'yd',6,5,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (402,160,2,10,'yd',6,5,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (403,161,0,50,'yd',6,5,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (404,161,1,40,'yd',6,5,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (405,161,2,30,'yd',6,5,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (406,162,0,55,'yd',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (407,162,1,45,'yd',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (408,162,2,35,'yd',5,6,0,122,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (409,163,0,35,'yd',5,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (410,163,1,30,'yd',5,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (411,163,2,25,'yd',5,6,0,80,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (412,164,0,-1,'m',14,3,20,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (413,165,0,-1,'m',15,3,20,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (414,166,0,-1,'m',14,3,20,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (415,166,1,-1,'m',14,3,20,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (416,167,0,-1,'m',10,3,9,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (417,168,0,-1,'m',10,3,9,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (418,168,1,-1,'m',10,3,9,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (419,169,0,-1,'m',14,3,21,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (420,170,0,-1,'m',15,3,21,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (421,171,0,-1,'m',14,3,21,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (422,171,1,-1,'m',14,3,21,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (423,172,0,-1,'m',10,3,0,-1,'cm',3)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (424,173,0,-1,'m',15,4,8,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (425,174,0,-1,'m',14,4,8,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (426,174,1,-1,'m',14,4,8,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (427,175,0,-1,'m',14,4,7,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (428,176,0,-1,'m',15,4,7,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (429,177,0,-1,'m',14,4,7,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (430,177,1,-1,'m',14,4,7,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (431,178,0,-1,'m',14,4,9,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (432,179,0,-1,'m',15,4,9,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (433,180,0,-1,'m',14,4,9,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (434,180,1,-1,'m',14,4,9,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (435,181,0,-1,'m',14,4,7,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (436,181,1,-1,'m',14,4,9,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (437,182,0,-1,'m',12,3,13,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (438,182,1,-1,'m',12,3,13,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (439,183,0,-1,'m',12,3,13,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (440,184,0,-1,'m',24,3,13,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (441,185,0,-1,'m',12,3,13,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (442,186,0,-1,'m',24,3,13,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (443,187,0,-1,'m',12,3,13,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (444,187,1,-1,'m',12,3,13,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (445,188,0,-1,'m',12,3,13,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (446,189,0,-1,'m',24,3,13,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (447,190,0,-1,'m',12,3,13,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (448,191,0,-1,'m',24,3,13,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (449,192,0,-1,'m',12,3,13,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (450,192,1,-1,'m',12,3,13,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (451,193,0,-1,'m',12,3,13,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (452,194,0,-1,'m',24,3,13,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (453,195,0,-1,'m',12,3,13,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (454,196,0,-1,'m',24,3,13,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (455,197,0,-1,'m',24,3,22,-1,'cm',0)",
+      "INSERT INTO `ROUND_TEMPLATE` (_id,sid,r_index,distance,unit,passes,arrows,target,size,target_unit,scoring_style) VALUES (456,198,0,-1,'m',40,3,22,-1,'cm',0)"
     ],
     "version": 16
   },
diff --git a/build.gradle b/build.gradle
index 41a0a1d6d..e9a4cf001 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@
 
 buildscript {
     ext.androidPluginVersion = '3.0.1'
-    ext.kotlinVersion = '1.2.30'
+    ext.kotlinVersion = '1.2.31'
     repositories {
         jcenter()
         google()

From eb3733abe8707b2b6573b0cd3f65147792731132 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Sat, 24 Mar 2018 16:29:27 +0100
Subject: [PATCH 073/102] Upgraded to Android Studio 3.1

---
 .gitignore                                    |   2 +
 .idea/codeStyleSettings.xml                   |   3 -
 .idea/codeStyles/Project.xml                  | 234 ++++++++++++++++++
 .idea/codeStyles/codeStyleConfig.xml          |   5 +
 MyTargets.iml                                 |   2 +-
 app/build.gradle                              |   2 -
 .../adapters/header/ExpandableListAdapter.kt  |   3 +-
 .../base/adapters/header/HeaderListAdapter.kt |   3 +-
 .../base/db/migrations/Migration22.kt         |   7 +-
 .../db/migrations/RoomCreationCallback.kt     |  24 +-
 .../SelectPureListItemFragmentBase.kt         |   2 +-
 .../features/arrows/EditArrowListFragment.kt  |   2 +-
 .../features/arrows/EditArrowViewModel.kt     |   2 +-
 .../mytargets/features/bows/BowAdapter.kt     |   3 +-
 .../features/bows/EditBowFragment.kt          |   3 +-
 .../features/distance/DistanceGridFragment.kt |   2 +-
 .../settings/about/DonationAdapter.kt         |   4 +-
 .../features/statistics/ArrowStatistic.kt     |  71 +++---
 .../features/statistics/StatisticsFragment.kt |   2 +-
 .../mytargets/features/statistics/Tag.kt      |  23 +-
 .../features/training/RoundFragment.kt        |   2 +-
 .../training/details/TrainingFragment.kt      |   2 +-
 .../features/training/input/InputActivity.kt  |   4 +-
 .../features/training/input/LoaderResult.kt   |  17 +-
 .../training/overview/TrainingsFragment.kt    |   2 +-
 .../EditStandardRoundFragment.kt              |   4 +-
 .../StandardRoundListFragment.kt              |   6 +-
 .../training/target/TargetListFragment.kt     |   2 +-
 .../de/dreier/mytargets/utils/ImageList.kt    |   8 +-
 .../mytargets/views/selector/ArrowSelector.kt |   3 +-
 .../mytargets/views/selector/BowSelector.kt   |   3 +-
 .../views/selector/DistanceSelector.kt        |   3 +-
 .../views/selector/EnvironmentSelector.kt     |   3 +-
 .../views/selector/SimpleDistanceSelector.kt  |   3 +-
 .../views/selector/StandardRoundSelector.kt   |   3 +-
 .../views/selector/TargetSelector.kt          |   3 +-
 .../views/selector/WindDirectionSelector.kt   |   3 +-
 .../views/selector/WindSpeedSelector.kt       |   3 +-
 build.gradle                                  |   2 +-
 dependencies.gradle                           |   2 -
 gradle/wrapper/gradle-wrapper.properties      |  19 +-
 .../analysis/aggregation/average/Average.kt   |  39 +--
 .../mytargets/shared/models/Dimension.kt      |  15 +-
 .../mytargets/shared/models/Environment.kt    |  12 +-
 .../dreier/mytargets/shared/models/Score.kt   |  34 ++-
 .../dreier/mytargets/shared/models/Target.kt  |   2 -
 .../mytargets/shared/models/Thumbnail.kt      |  27 +-
 .../mytargets/shared/models/WindDirection.kt  |  72 ++++--
 .../mytargets/shared/models/WindSpeed.kt      |  88 +++++--
 .../mytargets/shared/models/db/Arrow.kt       |  32 ++-
 .../mytargets/shared/models/db/ArrowImage.kt  |  22 +-
 .../dreier/mytargets/shared/models/db/Bow.kt  |  54 ++--
 .../mytargets/shared/models/db/BowImage.kt    |  22 +-
 .../dreier/mytargets/shared/models/db/End.kt  |  32 +--
 .../mytargets/shared/models/db/Round.kt       |  48 ++--
 .../mytargets/shared/models/db/SightMark.kt   |  29 +--
 .../shared/models/db/StandardRound.kt         |  10 +-
 .../mytargets/shared/models/db/Training.kt    |   2 -
 .../mytargets/shared/utils/EndRenderer.kt     |  91 ++++---
 wearable/build.gradle                         |   2 -
 .../java/de/dreier/mytargets/TimerActivity.kt |   2 +-
 61 files changed, 732 insertions(+), 399 deletions(-)
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml

diff --git a/.gitignore b/.gitignore
index bdbd9f4ab..e16ed0aef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,5 @@ googlePlayAndroidDeveloper.json
 google-services.json
 firebase-crashreporting.json
 services.tar
+
+\.idea/caches/build_file_checksums\.ser
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index e0cf5608a..9079deb73 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -34,9 +34,6 @@
         <AndroidXmlCodeStyleSettings>
           <option name="USE_CUSTOM_SETTINGS" value="true" />
         </AndroidXmlCodeStyleSettings>
-        <JetCodeStyleSettings>
-          <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-        </JetCodeStyleSettings>
         <Objective-C-extensions>
           <file>
             <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 000000000..e471265c6
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,234 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="RIGHT_MARGIN" value="100" />
+    <AndroidXmlCodeStyleSettings>
+      <option name="USE_CUSTOM_SETTINGS" value="true" />
+    </AndroidXmlCodeStyleSettings>
+    <JavaCodeStyleSettings>
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+        <value />
+      </option>
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="android" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="com" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="junit" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="net" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="javax" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="true" />
+          <emptyLine />
+        </value>
+      </option>
+    </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <Objective-C-extensions>
+      <file>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
+      <extensions>
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
+    <XML>
+      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+    </XML>
+    <codeStyleSettings language="JAVA">
+      <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="BINARY_OPERATION_WRAP" value="1" />
+      <option name="TERNARY_OPERATION_WRAP" value="1" />
+    </codeStyleSettings>
+    <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:layout_width</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:layout_height</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:layout_.*</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:width</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:height</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 000000000..79ee123c2
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/MyTargets.iml b/MyTargets.iml
index 0199edbd2..1f40e2223 100644
--- a/MyTargets.iml
+++ b/MyTargets.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="MyTargets" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="MyTargets" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
diff --git a/app/build.gradle b/app/build.gradle
index 6ad574644..2b5cf4219 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -130,8 +130,6 @@ apply from: '../tools/script-play-store.gradle'
 dependencies {
     Map<String, String> dependencies = rootProject.ext.dependencies
 
-    kapt dependencies.databindingCompiler
-
     implementation dependencies.kotlinStdlibJre7
 
     implementation dependencies.supportCompat
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt
index 8b3d28e06..2bbe2d968 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.base.adapters.header
 
-import android.databinding.DataBindingUtil
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -129,7 +128,7 @@ abstract class ExpandableListAdapter<P : IIdProvider, C : IIdProvider>(
     }
 
     class HeaderViewHolder<P> internal constructor(itemView: View) : ExpandableHeaderBindingHolder<P>(itemView, R.id.expand_collapse) {
-        private val binding: ItemHeaderExpandableBinding = DataBindingUtil.bind(itemView)
+        private val binding = ItemHeaderExpandableBinding.bind(itemView)
 
         override fun bindItem(item: P) {
             binding.header.text = item.toString()
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapter.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapter.kt
index 6028b92df..5b1e871d7 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapter.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.base.adapters.header
 
-import android.databinding.DataBindingUtil
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -55,7 +54,7 @@ abstract class HeaderListAdapter<C : IIdProvider>(parentPartition: PartitionDele
     }
 
     inner class HeaderViewHolder internal constructor(itemView: View) : HeaderBindingHolder<SimpleHeader>(itemView) {
-        private val binding: ItemHeaderBinding = DataBindingUtil.bind(itemView)
+        private val binding = ItemHeaderBinding.bind(itemView)
 
         override fun bindItem(item: SimpleHeader) {
             binding.header.text = item.title
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
index f73a970cd..3564f185f 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration22.kt
@@ -20,6 +20,11 @@ import android.arch.persistence.room.migration.Migration
 
 object Migration22 : Migration(21, 22) {
     override fun migrate(database: SupportSQLiteDatabase) {
-        RoomCreationCallback.fillStandardRound(database, "_id", "standardRound")
+        RoomCreationCallback.fillStandardRound(
+            database,
+            "_id",
+            "standardRound",
+            "targetScoringStyle"
+        )
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
index 2018e1d7c..3a67b12e6 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
@@ -24,14 +24,15 @@ import de.dreier.mytargets.shared.models.db.StandardRound
 object RoomCreationCallback : RoomDatabase.Callback() {
 
     override fun onCreate(db: SupportSQLiteDatabase) {
-        fillStandardRound(db, "id", "standardRoundId")
+        fillStandardRound(db, "id", "standardRoundId", "targetScoringStyleIndex")
         createScoreTriggers(db)
     }
 
     fun fillStandardRound(
         db: SupportSQLiteDatabase,
         idColumn: String,
-        standardRoundColumn: String
+        standardRoundColumn: String,
+        scoringStyleColumn: String
     ) {
         val standardRounds = StandardRoundFactory.initTable()
         for (standardRound in standardRounds) {
@@ -40,7 +41,8 @@ object RoomCreationCallback : RoomDatabase.Callback() {
                 standardRound.standardRound,
                 standardRound.roundTemplates,
                 idColumn,
-                standardRoundColumn
+                standardRoundColumn,
+                scoringStyleColumn
             )
         }
     }
@@ -50,12 +52,19 @@ object RoomCreationCallback : RoomDatabase.Callback() {
         standardRound: StandardRound,
         roundTemplates: List<RoundTemplate>,
         idColumn: String,
-        standardRoundColumn: String
+        standardRoundColumn: String,
+        scoringStyleColumn: String
     ) {
         insertStandardRound(db, standardRound, idColumn)
         for (roundTemplate in roundTemplates) {
             roundTemplate.standardRoundId = standardRound.id
-            insertRoundTemplate(db, roundTemplate, idColumn, standardRoundColumn)
+            insertRoundTemplate(
+                db,
+                roundTemplate,
+                idColumn,
+                standardRoundColumn,
+                scoringStyleColumn
+            )
         }
     }
 
@@ -68,10 +77,11 @@ object RoomCreationCallback : RoomDatabase.Callback() {
         db: SupportSQLiteDatabase,
         roundTemplate: RoundTemplate,
         idColumn: String,
-        standardRoundColumn: String
+        standardRoundColumn: String,
+        scoringStyleColumn: String
     ) {
         db.execSQL("INSERT OR REPLACE INTO RoundTemplate($idColumn, $standardRoundColumn, `index`, " +
-                "shotsPerEnd, endCount, distance, targetId, targetScoringStyle, targetDiameter) " +
+                "shotsPerEnd, endCount, distance, targetId, $scoringStyleColumn, targetDiameter) " +
                 "VALUES (?,?,?,?,?,?,?,?,?)",
                 arrayOf(roundTemplate.id, roundTemplate.standardRoundId, roundTemplate.index,
                         roundTemplate.shotsPerEnd, roundTemplate.endCount,
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt
index 25c86d8a8..972a86172 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt
@@ -68,7 +68,7 @@ abstract class SelectPureListItemFragmentBase<T>(
     }
 
     private inner class ViewHolder(itemView: View) : SelectableViewHolder<T>(itemView, selector, this@SelectPureListItemFragmentBase) {
-        internal var binding: ItemImageSimpleBinding = DataBindingUtil.bind(itemView)
+        internal var binding = ItemImageSimpleBinding.bind(itemView)
 
         override fun bindItem(item: T) {
             binding.name.text = getName(item)
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
index c7eaa9472..f2769438c 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
@@ -103,7 +103,7 @@ class EditArrowListFragment : EditableListFragmentBase<Arrow, SimpleListAdapterB
     }
 
     internal inner class ViewHolder(itemView: View) : SelectableViewHolder<Arrow>(itemView, selector, this@EditArrowListFragment, this@EditArrowListFragment) {
-        private val binding: ItemImageDetailsBinding = DataBindingUtil.bind(itemView)
+        private val binding = ItemImageDetailsBinding.bind(itemView)
 
         override fun bindItem(item: Arrow) {
             binding.name.text = item.name
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
index 1996eeabe..235b53942 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
@@ -96,7 +96,7 @@ class EditArrowViewModel(app: ApplicationInstance) : AndroidViewModel(app) {
         }
         val arrow = Arrow()
         arrow.id = arrowId.value ?: 0
-        arrow.name = name.get()
+        arrow.name = name.get() ?: ""
         arrow.maxArrowNumber = maxArrowNumber.get()
         arrow.length = length.get()
         arrow.material = material.get()
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
index e72536c96..75faaae1b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.features.bows
 
-import android.databinding.DataBindingUtil
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -47,7 +46,7 @@ internal class BowAdapter(
 
     internal inner class ViewHolder(itemView: View) : SelectableViewHolder<Bow>(itemView, selector, clickListener, longClickListener) {
 
-        val binding: ItemImageDetailsBinding = DataBindingUtil.bind(itemView)
+        val binding = ItemImageDetailsBinding.bind(itemView)
 
         override fun bindItem(item: Bow) {
             binding.name.text = item.name
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
index f244190ac..d5d588d0b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
@@ -17,7 +17,6 @@ package de.dreier.mytargets.features.bows
 
 import android.app.Activity
 import android.content.Intent
-import android.databinding.DataBindingUtil
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.text.Editable
@@ -160,7 +159,7 @@ class EditBowFragment : EditWithImageFragmentBase<BowImage>(R.drawable.recurve_b
 
     private inner class SightSettingHolder internal constructor(view: View) : DynamicItemHolder<SightMark>(view) {
 
-        private val binding: ItemSightMarkBinding = DataBindingUtil.bind(view)
+        private val binding = ItemSightMarkBinding.bind(view)
 
         init {
             binding.sightSetting.addTextChangedListener(object : TextWatcher {
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
index 6e68a1fbc..27f023692 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
@@ -97,7 +97,7 @@ class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapter
 
     internal inner class ViewHolder(itemView: View) : SelectableViewHolder<Dimension>(itemView, selector, this@DistanceGridFragment) {
 
-        private val binding: ItemDistanceBinding = DataBindingUtil.bind(itemView)
+        private val binding = ItemDistanceBinding.bind(itemView)
 
         override fun bindItem(item: Dimension) {
             binding.distance.text = item.toString()
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/about/DonationAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/settings/about/DonationAdapter.kt
index 98ca53cd5..dd1784649 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/about/DonationAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/about/DonationAdapter.kt
@@ -16,12 +16,10 @@
 package de.dreier.mytargets.features.settings.about
 
 import android.content.Context
-import android.databinding.DataBindingUtil
 import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-
 import de.dreier.mytargets.R
 import de.dreier.mytargets.databinding.ItemDonationBinding
 
@@ -63,6 +61,6 @@ class DonationAdapter(context: Context, private val listener: (Int) -> Unit) : R
     }
 
     class DonationViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        var binding: ItemDonationBinding = DataBindingUtil.bind(itemView)
+        var binding = ItemDonationBinding.bind(itemView)
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
index e377e59e5..e768f6e0c 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/ArrowStatistic.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.features.statistics
 
-import android.annotation.SuppressLint
 import android.os.Parcelable
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
@@ -30,17 +29,16 @@ import de.dreier.mytargets.shared.models.sum
 import kotlinx.android.parcel.Parcelize
 import java.lang.Math.ceil
 
-@SuppressLint("ParcelCreator")
 @Parcelize
 data class ArrowStatistic(
-        var arrowName: String? = null,
-        var arrowNumber: String? = null,
-        var target: Target,
-        var shots: MutableList<Shot> = mutableListOf(),
-        var average: Average = Average(),
-        var totalScore: Score = Score(),
-        var arrowDiameter: Dimension = Dimension(5f, Dimension.Unit.MILLIMETER),
-        var exportFileName: String? = null
+    var arrowName: String? = null,
+    var arrowNumber: String? = null,
+    var target: Target,
+    var shots: MutableList<Shot> = mutableListOf(),
+    var average: Average = Average(),
+    var totalScore: Score = Score(),
+    var arrowDiameter: Dimension = Dimension(5f, Dimension.Unit.MILLIMETER),
+    var exportFileName: String? = null
 ) : Parcelable {
 
     val appropriateBgColor: Int
@@ -51,37 +49,52 @@ data class ArrowStatistic(
 
     constructor(target: Target, shots: List<Shot>) : this(null, null, target, shots)
 
-    private constructor(arrowName: String?, arrowNumber: String?, target: Target, shots: List<Shot>) : this(
-            arrowName = arrowName,
-            arrowNumber = arrowNumber,
-            target = target
+    private constructor(
+        arrowName: String?,
+        arrowNumber: String?,
+        target: Target,
+        shots: List<Shot>
+    ) : this(
+        arrowName = arrowName,
+        arrowNumber = arrowNumber,
+        target = target
     ) {
         this.average.computeAll(shots)
         this.shots.addAll(shots)
         this.totalScore = shots
-                .map { shot -> target.getScoringStyle().getReachedScore(shot) }
-                .sum()
+            .map { shot -> target.getScoringStyle().getReachedScore(shot) }
+            .sum()
     }
 
 
     companion object {
-        private val BG_COLORS = intArrayOf(-0xbbcca, -0xa8de, -0x6800, -0x3ef9, -0x14c5, -0x3223c7, -0x743cb6, -0xb350b0)
-        private val TEXT_COLORS = intArrayOf(-0x1, -0x1, -0xfffffe, -0xfffffe, -0xfffffe, -0xfffffe, -0xfffffe, -0xfffffe)
+        private val BG_COLORS = intArrayOf(
+            -0xbbcca,
+            -0xa8de,
+            -0x6800,
+            -0x3ef9,
+            -0x14c5,
+            -0x3223c7,
+            -0x743cb6,
+            -0xb350b0
+        )
+        private val TEXT_COLORS =
+            intArrayOf(-0x1, -0x1, -0xfffffe, -0xfffffe, -0xfffffe, -0xfffffe, -0xfffffe, -0xfffffe)
 
         fun getAll(target: Target, rounds: List<Round>): List<ArrowStatistic> {
             val db = ApplicationInstance.db
             return rounds
-                    .groupBy { r -> db.trainingDAO().loadTraining(r.trainingId!!).arrowId ?: 0 }
-                    .flatMap { t ->
-                        val arrow = db.arrowDAO().loadArrowOrNull(t.key)
-                        val name = arrow?.name ?: SharedApplicationInstance.getStr(R.string.unknown)
-                        t.value.flatMap { db.roundDAO().loadEnds(it.id) }
-                                .flatMap { db.endDAO().loadShots(it.id) }
-                                .filter { it.arrowNumber != null }
-                                .groupBy {it.arrowNumber!! }
-                                .filter { it.value.size > 1 }
-                                .map { (key, value) -> ArrowStatistic(name, key, target, value) }
-                    }
+                .groupBy { r -> db.trainingDAO().loadTraining(r.trainingId!!).arrowId ?: 0 }
+                .flatMap { t ->
+                    val arrow = db.arrowDAO().loadArrowOrNull(t.key)
+                    val name = arrow?.name ?: SharedApplicationInstance.getStr(R.string.unknown)
+                    t.value.flatMap { db.roundDAO().loadEnds(it.id) }
+                        .flatMap { db.endDAO().loadShots(it.id) }
+                        .filter { it.arrowNumber != null }
+                        .groupBy { it.arrowNumber!! }
+                        .filter { it.value.size > 1 }
+                        .map { (key, value) -> ArrowStatistic(name, key, target, value) }
+                }
         }
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
index 8f482e3db..2836163df 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
@@ -509,7 +509,7 @@ class StatisticsFragment : FragmentBase() {
 
         init {
             itemView.isClickable = true
-            binding = DataBindingUtil.bind(itemView)
+            binding = ItemImageSimpleBinding.bind(itemView)
             binding.content.setOnClickListener { onItemClicked() }
         }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/Tag.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/Tag.kt
index 616218ce5..a7d368c36 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/Tag.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/Tag.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.features.statistics
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.databinding.DataBindingUtil
 import android.graphics.drawable.Drawable
@@ -29,13 +28,12 @@ import de.dreier.mytargets.shared.models.Thumbnail
 import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
 
-@SuppressLint("ParcelCreator")
 @Parcelize
 class Tag @JvmOverloads constructor(
-        var id: Long?,
-        var text: String,
-        var image: Thumbnail? = null,
-        var isChecked: Boolean = true
+    var id: Long?,
+    var text: String,
+    var image: Thumbnail? = null,
+    var isChecked: Boolean = true
 ) : Parcelable {
 
     @IgnoredOnParcel
@@ -43,12 +41,19 @@ class Tag @JvmOverloads constructor(
 
     fun getView(context: Context, parent: ViewGroup): ViewChipsBinding {
         val binding = DataBindingUtil
-                .inflate<ViewChipsBinding>(LayoutInflater.from(context), R.layout.view_chips, parent, false)
+            .inflate<ViewChipsBinding>(
+                LayoutInflater.from(context),
+                R.layout.view_chips,
+                parent,
+                false
+            )
         binding.tag = this
         binding.root.isActivated = !isChecked
         val mDensity = context.resources.displayMetrics.density
-        binding.root.layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
-                (CHIP_HEIGHT * mDensity).toInt())
+        binding.root.layoutParams = RelativeLayout.LayoutParams(
+            ViewGroup.LayoutParams.WRAP_CONTENT,
+            (CHIP_HEIGHT * mDensity).toInt()
+        )
         return binding
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
index 6f05964cb..008b13087 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
@@ -180,7 +180,7 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
 
     private inner class EndViewHolder internal constructor(itemView: View) : SelectableViewHolder<AugmentedEnd>(itemView, selector, this@RoundFragment, this@RoundFragment) {
 
-        private val binding: ItemEndBinding = DataBindingUtil.bind(itemView)
+        private val binding = ItemEndBinding.bind(itemView)
 
         override fun bindItem(item: AugmentedEnd) {
             val shots = item.shots
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index b42338304..ee52b3754 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -213,7 +213,7 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
     }
 
     private inner class ViewHolder internal constructor(itemView: View) : SelectableViewHolder<Round>(itemView, selector, this@TrainingFragment, this@TrainingFragment) {
-        private val binding: ItemRoundBinding = DataBindingUtil.bind(itemView)
+        private val binding = ItemRoundBinding.bind(itemView)
 
         override fun bindItem(item: Round) {
             binding.title.text = resources.getQuantityString(R.plurals.rounds, item
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
index 904cf8c59..41d80998e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
@@ -297,9 +297,9 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
     private fun onDataLoadFinished() {
         title = data!!.training.training.title
         if (!binding.targetViewStub.isInflated) {
-            binding.targetViewStub.viewStub.inflate()
+            binding.targetViewStub.viewStub?.inflate()
         }
-        targetView = binding.targetViewStub.binding.root as TargetView
+        targetView = binding.targetViewStub.binding?.root as TargetView
         targetView!!.initWithTarget(data!!.currentRound.round.target)
         targetView!!.setArrow(
             data!!.arrowDiameter, data!!.training.training.arrowNumbering, data!!
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt
index a9dd75274..817443f02 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/LoaderResult.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.features.training.input
 
-import android.annotation.SuppressLint
 import android.os.Parcelable
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.Dimension
@@ -28,16 +27,16 @@ import de.dreier.mytargets.shared.views.TargetViewBase
 import de.dreier.mytargets.utils.addEnd
 import kotlinx.android.parcel.Parcelize
 
-@SuppressLint("ParcelCreator")
 @Parcelize
 class LoaderResult @JvmOverloads constructor(
-        val training: AugmentedTraining,
-        var standardRound: StandardRound? = null,
-        var arrowDiameter: Dimension = Dimension(5f, Dimension.Unit.MILLIMETER),
-        var sightMark: SightMark? = null,
-        var roundIndex: Int = 0,
-        var endIndex: Int = 0,
-        var maxArrowNumber: Int = 12) : Parcelable {
+    val training: AugmentedTraining,
+    var standardRound: StandardRound? = null,
+    var arrowDiameter: Dimension = Dimension(5f, Dimension.Unit.MILLIMETER),
+    var sightMark: SightMark? = null,
+    var roundIndex: Int = 0,
+    var endIndex: Int = 0,
+    var maxArrowNumber: Int = 12
+) : Parcelable {
 
     val currentRound: AugmentedRound
         get() = training.rounds[roundIndex]
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
index c5cbb66f1..abcedabf1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
@@ -193,7 +193,7 @@ class TrainingsFragment : ExpandableListFragment<Header, Training>() {
     }
 
     private inner class ViewHolder(itemView: View) : SelectableViewHolder<Training>(itemView, selector, this@TrainingsFragment, this@TrainingsFragment) {
-        internal var binding: ItemTrainingBinding = DataBindingUtil.bind(itemView)
+        internal var binding = ItemTrainingBinding.bind(itemView)
 
         override fun bindItem(item: Training) {
             binding.training.text = item.title
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
index 78b1966c2..26f293bf6 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
@@ -27,6 +27,7 @@ import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.adapters.dynamicitem.DynamicItemAdapter
 import de.dreier.mytargets.base.adapters.dynamicitem.DynamicItemHolder
+import de.dreier.mytargets.base.db.StandardRoundFactory
 import de.dreier.mytargets.base.fragments.EditFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.INTENT
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
@@ -36,7 +37,6 @@ import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
 import de.dreier.mytargets.shared.models.db.RoundTemplate
 import de.dreier.mytargets.shared.models.db.StandardRound
-import de.dreier.mytargets.base.db.StandardRoundFactory
 import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.Utils
 import de.dreier.mytargets.views.selector.DistanceSelector
@@ -170,7 +170,7 @@ class EditStandardRoundFragment : EditFragmentBase() {
 
     private inner class RoundTemplateHolder internal constructor(view: View) : DynamicItemHolder<RoundTemplate>(view) {
 
-        internal var binding: ItemRoundTemplateBinding = DataBindingUtil.bind(view)
+        internal var binding = ItemRoundTemplateBinding.bind(view)
 
         override fun onBind(item: RoundTemplate, position: Int, fragment: Fragment, removeListener: View.OnClickListener) {
             this.item = item
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
index 9f9770886..7826b754e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
@@ -30,6 +30,7 @@ import com.evernote.android.state.State
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.adapters.header.HeaderListAdapter
+import de.dreier.mytargets.base.db.StandardRoundFactory
 import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.base.fragments.SelectItemFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
@@ -37,10 +38,9 @@ import de.dreier.mytargets.databinding.FragmentListBinding
 import de.dreier.mytargets.databinding.ItemStandardRoundBinding
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
-import de.dreier.mytargets.base.db.StandardRoundFactory
-import de.dreier.mytargets.utils.contains
 import de.dreier.mytargets.utils.SlideInItemAnimator
 import de.dreier.mytargets.utils.ToolbarUtils
+import de.dreier.mytargets.utils.contains
 import de.dreier.mytargets.utils.multiselector.OnItemLongClickListener
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 
@@ -215,7 +215,7 @@ class StandardRoundListFragment : SelectItemFragmentBase<AugmentedStandardRound,
     private inner class ViewHolder(itemView: View) : SelectableViewHolder<AugmentedStandardRound>(itemView,
             selector, this@StandardRoundListFragment, this@StandardRoundListFragment) {
 
-        private val binding: ItemStandardRoundBinding = DataBindingUtil.bind(itemView)
+        private val binding = ItemStandardRoundBinding.bind(itemView)
 
         override fun bindItem(item: AugmentedStandardRound) {
             binding.name.text = item.standardRound.name
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
index 597586b3d..a9cea702f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
@@ -201,7 +201,7 @@ class TargetListFragment : SelectItemFragmentBase<Target, ExpandableListAdapter<
     }
 
     private inner class ViewHolder(itemView: View) : SelectableViewHolder<Target>(itemView, selector, this@TargetListFragment) {
-        private val binding: ItemImageSimpleBinding = DataBindingUtil.bind(itemView)
+        private val binding = ItemImageSimpleBinding.bind(itemView)
 
         override fun bindItem(item: Target) {
             binding.name.text = item.model.toString()
diff --git a/app/src/main/java/de/dreier/mytargets/utils/ImageList.kt b/app/src/main/java/de/dreier/mytargets/utils/ImageList.kt
index 07388496d..638e78b1c 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/ImageList.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/ImageList.kt
@@ -15,17 +15,15 @@
 
 package de.dreier.mytargets.utils
 
-import android.annotation.SuppressLint
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Image
 import de.dreier.mytargets.shared.models.db.EndImage
 import kotlinx.android.parcel.Parcelize
 
-@SuppressLint("ParcelCreator")
 @Parcelize
 class ImageList(
-        internal var images: MutableList<String> = mutableListOf(),
-        private var removed: MutableList<String> = mutableListOf()
+    internal var images: MutableList<String> = mutableListOf(),
+    private var removed: MutableList<String> = mutableListOf()
 ) : Parcelable {
 
     val isEmpty: Boolean
@@ -35,7 +33,7 @@ class ImageList(
         get() = removed
 
     constructor(images: List<Image>) : this(
-            images = images.map(Image::fileName).toMutableList()
+        images = images.map(Image::fileName).toMutableList()
     )
 
     fun size(): Int {
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
index 58d0a0aea..f62f9f048 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
@@ -18,7 +18,6 @@ package de.dreier.mytargets.views.selector
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.databinding.DataBindingUtil
 import android.util.AttributeSet
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
@@ -35,7 +34,7 @@ class ArrowSelector @JvmOverloads constructor(
     private val arrowDAO = ApplicationInstance.db.arrowDAO()
 
     override fun bindView(item: Arrow) {
-        binding = DataBindingUtil.bind(view)
+        binding = SelectorItemImageDetailsBinding.bind(view)
         binding.name.text = item.name
         binding.image.setImageDrawable(item.thumbnail!!.roundDrawable)
     }
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
index 6cf223ae2..1de0fd300 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
@@ -18,7 +18,6 @@ package de.dreier.mytargets.views.selector
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.databinding.DataBindingUtil
 import android.util.AttributeSet
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
@@ -36,7 +35,7 @@ class BowSelector @JvmOverloads constructor(
     private val bowDAO = database.bowDAO()
 
     override fun bindView(item: Bow) {
-        binding = DataBindingUtil.bind(view)
+        binding = SelectorItemImageDetailsBinding.bind(view)
         binding.name.text = item.name
         binding.image.setImageDrawable(item.thumbnail!!.roundDrawable)
     }
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/DistanceSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/DistanceSelector.kt
index f047ec98a..90a3ce01a 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/DistanceSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/DistanceSelector.kt
@@ -16,7 +16,6 @@
 package de.dreier.mytargets.views.selector
 
 import android.content.Context
-import android.databinding.DataBindingUtil
 import android.util.AttributeSet
 import de.dreier.mytargets.R
 import de.dreier.mytargets.databinding.SelectorItemDistanceBinding
@@ -25,7 +24,7 @@ import de.dreier.mytargets.shared.models.Dimension
 class DistanceSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : SelectorBase<Dimension>(context, attrs, R.layout.selector_item_distance, DISTANCE_REQUEST_CODE) {
 
     override fun bindView(item: Dimension) {
-        val binding = DataBindingUtil.bind<SelectorItemDistanceBinding>(view)
+        val binding = SelectorItemDistanceBinding.bind(view)
         binding.distanceValue.text = item.toString()
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
index 210d50eef..c6cf98671 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
@@ -21,7 +21,6 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.pm.PackageManager
-import android.databinding.DataBindingUtil
 import android.location.Geocoder
 import android.location.Location
 import android.support.annotation.RequiresPermission
@@ -56,7 +55,7 @@ class EnvironmentSelector @JvmOverloads constructor(context: Context, attrs: Att
         }
 
     override fun bindView(item: Environment) {
-        binding = DataBindingUtil.bind(view)
+        binding = SelectorItemImageDetailsBinding.bind(view)
 
         if (item.indoor) {
             binding.name.setText(de.dreier.mytargets.shared.R.string.indoor)
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/SimpleDistanceSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/SimpleDistanceSelector.kt
index 02f329bf0..f1469bb98 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/SimpleDistanceSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/SimpleDistanceSelector.kt
@@ -16,7 +16,6 @@
 package de.dreier.mytargets.views.selector
 
 import android.content.Context
-import android.databinding.DataBindingUtil
 import android.util.AttributeSet
 import de.dreier.mytargets.R
 import de.dreier.mytargets.databinding.SelectorItemSimpleTextBinding
@@ -28,7 +27,7 @@ class SimpleDistanceSelector @JvmOverloads constructor(
 ) : SelectorBase<Dimension>(context, attrs, R.layout.selector_item_simple_text, SIMPLE_DISTANCE_REQUEST_CODE) {
 
     override fun bindView(item: Dimension) {
-        val binding = DataBindingUtil.bind<SelectorItemSimpleTextBinding>(view)
+        val binding = SelectorItemSimpleTextBinding.bind(view)
         binding.text.text = item.toString()
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
index b3afe1f26..47247973e 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
@@ -16,7 +16,6 @@
 package de.dreier.mytargets.views.selector
 
 import android.content.Context
-import android.databinding.DataBindingUtil
 import android.util.AttributeSet
 import android.view.View
 import de.dreier.mytargets.R
@@ -32,7 +31,7 @@ class StandardRoundSelector @JvmOverloads constructor(context: Context, attrs: A
     private val standardRoundDAO = ApplicationInstance.db.standardRoundDAO()
 
     override fun bindView(item: AugmentedStandardRound) {
-        binding = DataBindingUtil.bind(view)
+        binding = SelectorItemImageDetailsBinding.bind(view)
         binding.name.text = item.standardRound.name
         binding.details.visibility = View.VISIBLE
         binding.details.text = item.getDescription(context)
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/TargetSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/TargetSelector.kt
index 1f9bf9e8f..5b6c39cba 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/TargetSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/TargetSelector.kt
@@ -16,7 +16,6 @@
 package de.dreier.mytargets.views.selector
 
 import android.content.Context
-import android.databinding.DataBindingUtil
 import android.util.AttributeSet
 import android.view.View
 import de.dreier.mytargets.R
@@ -29,7 +28,7 @@ class TargetSelector @JvmOverloads constructor(context: Context, attrs: Attribut
     private lateinit var binding: SelectorItemImageDetailsBinding
 
     override fun bindView(item: Target) {
-        binding = DataBindingUtil.bind(view)
+        binding = SelectorItemImageDetailsBinding.bind(view)
         binding.name.text = item.name
         binding.details.visibility = View.VISIBLE
         binding.details.text = item.getDetails()
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/WindDirectionSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/WindDirectionSelector.kt
index 078d9ae77..8d2e5e3d1 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/WindDirectionSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/WindDirectionSelector.kt
@@ -16,7 +16,6 @@
 package de.dreier.mytargets.views.selector
 
 import android.content.Context
-import android.databinding.DataBindingUtil
 import android.util.AttributeSet
 import android.view.View
 import de.dreier.mytargets.R
@@ -29,7 +28,7 @@ class WindDirectionSelector @JvmOverloads constructor(context: Context, attrs: A
     private lateinit var binding: SelectorItemImageDetailsBinding
 
     override fun bindView(item: WindDirection) {
-        binding = DataBindingUtil.bind(view)
+        binding = SelectorItemImageDetailsBinding.bind(view)
         binding.name.text = item.name
         binding.image.setImageResource(item.drawable)
         binding.title.visibility = View.VISIBLE
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/WindSpeedSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/WindSpeedSelector.kt
index f042277f0..b8fac4a15 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/WindSpeedSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/WindSpeedSelector.kt
@@ -16,7 +16,6 @@
 package de.dreier.mytargets.views.selector
 
 import android.content.Context
-import android.databinding.DataBindingUtil
 import android.util.AttributeSet
 import android.view.View
 import de.dreier.mytargets.R
@@ -29,7 +28,7 @@ class WindSpeedSelector @JvmOverloads constructor(context: Context, attrs: Attri
     private lateinit var binding: SelectorItemImageDetailsBinding
 
     override fun bindView(item: WindSpeed) {
-        binding = DataBindingUtil.bind(view)
+        binding = SelectorItemImageDetailsBinding.bind(view)
         binding.name.text = item.name
         binding.image.setImageResource(item.drawable)
         binding.title.visibility = View.VISIBLE
diff --git a/build.gradle b/build.gradle
index e9a4cf001..01006bcf3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@
  */
 
 buildscript {
-    ext.androidPluginVersion = '3.0.1'
+    ext.androidPluginVersion = '3.1.0-rc03'
     ext.kotlinVersion = '1.2.31'
     repositories {
         jcenter()
diff --git a/dependencies.gradle b/dependencies.gradle
index 50eb8dd98..54e60bf77 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -58,8 +58,6 @@ ext {
     ]
 
     dependencies = [
-            databindingCompiler           : "com.android.databinding:compiler:$androidPluginVersion",
-
             supportCompat                 : "com.android.support:support-compat:$libraryVersion.support",
             supportCoreUtils              : "com.android.support:support-core-utils:$libraryVersion.support",
             supportCoreUi                 : "com.android.support:support-core-ui:$libraryVersion.support",
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aca76d7e6..70937cc7f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,21 +1,6 @@
-#
-# Copyright (C) 2018 Florian Dreier
-#
-# This file is part of MyTargets.
-#
-# MyTargets is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2
-# as published by the Free Software Foundation.
-#
-# MyTargets is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-
-#Sun Sep 10 15:20:25 CEST 2017
+#Sat Mar 24 14:45:28 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/average/Average.kt b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/average/Average.kt
index 21faca80f..785620338 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/average/Average.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/average/Average.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.shared.analysis.aggregation.average
 
-import android.annotation.SuppressLint
 import android.graphics.PointF
 import android.graphics.RectF
 import android.os.Parcelable
@@ -23,14 +22,15 @@ import android.os.Parcelable
 import de.dreier.mytargets.shared.models.db.Shot
 import kotlinx.android.parcel.Parcelize
 
-@SuppressLint("ParcelCreator")
 @Parcelize
-class Average constructor(var dataPointCount: Int = 0,
-                          var average: PointF = PointF(0.0f, 0.0f),
-                          var weightedAverage: PointF = PointF(0.0f, 0.0f),
-                          var nonUniformStdDev: RectF = RectF(-1.0f, -1.0f, -1.0f, -1.0f),
-                          private var stdDevX: Double = -1.0,
-                          private var stdDevY: Double = -1.0) : Parcelable {
+class Average constructor(
+    var dataPointCount: Int = 0,
+    var average: PointF = PointF(0.0f, 0.0f),
+    var weightedAverage: PointF = PointF(0.0f, 0.0f),
+    var nonUniformStdDev: RectF = RectF(-1.0f, -1.0f, -1.0f, -1.0f),
+    private var stdDevX: Double = -1.0,
+    private var stdDevY: Double = -1.0
+) : Parcelable {
 
     val stdDev: Double
         get() = (stdDevX + stdDevY) / 2.0
@@ -89,24 +89,26 @@ class Average constructor(var dataPointCount: Int = 0,
             }
         }
 
-        nonUniformStdDev.set(Math.sqrt(negSquaredXError / negCountX.toDouble()).toFloat(),
-                Math.sqrt(posSquaredYError / posCountY.toDouble()).toFloat(),
-                Math.sqrt(posSquaredXError / posCountX.toDouble()).toFloat(),
-                Math.sqrt(negSquaredYError / negCountY.toDouble()).toFloat())
+        nonUniformStdDev.set(
+            Math.sqrt(negSquaredXError / negCountX.toDouble()).toFloat(),
+            Math.sqrt(posSquaredYError / posCountY.toDouble()).toFloat(),
+            Math.sqrt(posSquaredXError / posCountX.toDouble()).toFloat(),
+            Math.sqrt(negSquaredYError / negCountY.toDouble()).toFloat()
+        )
     }
 
     fun computeStdDevX(data: List<Shot>) {
         val sumSquaredXError = data
-                .map { (it.x - average.x).toDouble() }
-                .sumByDouble { it * it }
+            .map { (it.x - average.x).toDouble() }
+            .sumByDouble { it * it }
 
         stdDevX = Math.sqrt(sumSquaredXError / data.size.toDouble())
     }
 
     fun computeStdDevY(data: List<Shot>) {
         val sumSquaredYError = data
-                .map { (it.y - average.y).toDouble() }
-                .sumByDouble { it * it }
+            .map { (it.y - average.y).toDouble() }
+            .sumByDouble { it * it }
 
         stdDevY = Math.sqrt(sumSquaredYError / data.size.toDouble())
     }
@@ -120,6 +122,9 @@ class Average constructor(var dataPointCount: Int = 0,
             sumY += point.y.toDouble()
         }
 
-        average.set((sumX / data.size.toDouble()).toFloat(), (sumY / data.size.toDouble()).toFloat())
+        average.set(
+            (sumX / data.size.toDouble()).toFloat(),
+            (sumY / data.size.toDouble()).toFloat()
+        )
     }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Dimension.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Dimension.kt
index 8b3c03c32..a3e0bc395 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Dimension.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Dimension.kt
@@ -14,18 +14,17 @@
  */
 package de.dreier.mytargets.shared.models
 
-import android.annotation.SuppressLint
 import android.os.Parcelable
 import de.dreier.mytargets.shared.R
 import de.dreier.mytargets.shared.SharedApplicationInstance
 import kotlinx.android.parcel.Parcelize
 
-@SuppressLint("ParcelCreator")
 @Parcelize
-data class Dimension(val value: Float, val unit: Unit?) : IIdProvider, Comparable<Dimension>, Parcelable {
+data class Dimension(val value: Float, val unit: Unit?) : IIdProvider, Comparable<Dimension>,
+    Parcelable {
 
     override fun compareTo(other: Dimension) =
-            compareBy({ unit?.abbreviation }, Dimension::value).compare(this, other)
+        compareBy({ unit?.abbreviation }, Dimension::value).compare(this, other)
 
     override fun toString(): String {
         val context = SharedApplicationInstance.context
@@ -55,9 +54,11 @@ data class Dimension(val value: Float, val unit: Unit?) : IIdProvider, Comparabl
         return Dimension(newValue, unit)
     }
 
-    enum class Unit(internal val abbreviation: String,
-            /* factor <units> = 1 meter */
-                    internal val factor: Float) {
+    enum class Unit(
+        internal val abbreviation: String,
+        /* factor <units> = 1 meter */
+        internal val factor: Float
+    ) {
         CENTIMETER("cm", 100f),
         INCH("in", 39.3701f),
         METER("m", 1f),
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Environment.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Environment.kt
index a32d682e6..9904b904b 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Environment.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Environment.kt
@@ -14,19 +14,17 @@
  */
 package de.dreier.mytargets.shared.models
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Parcelable
 import kotlinx.android.parcel.Parcelize
 
-@SuppressLint("ParcelCreator")
 @Parcelize
 data class Environment(
-        var indoor: Boolean = false,
-        var weather: EWeather = EWeather.SUNNY,
-        var windSpeed: Int = 0,
-        var windDirection: Int = 0,
-        var location: String = ""
+    var indoor: Boolean = false,
+    var weather: EWeather = EWeather.SUNNY,
+    var windSpeed: Int = 0,
+    var windDirection: Int = 0,
+    var location: String = ""
 ) : Parcelable {
 
     fun getWindSpeed(context: Context): String {
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Score.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Score.kt
index de718430e..6f177c5ae 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Score.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Score.kt
@@ -15,35 +15,33 @@
 
 package de.dreier.mytargets.shared.models
 
-import android.annotation.SuppressLint
 import android.os.Parcelable
 import kotlinx.android.parcel.Parcelize
 import java.util.*
 
-@SuppressLint("ParcelCreator")
 @Parcelize
 data class Score(
-        var reachedPoints: Int = 0,
-        var totalPoints: Int = 0,
-        var shotCount: Int = 0
+    var reachedPoints: Int = 0,
+    var totalPoints: Int = 0,
+    var shotCount: Int = 0
 ) : Parcelable {
 
     constructor() : this(
-            reachedPoints = 0,
-            totalPoints = 0,
-            shotCount = 0
+        reachedPoints = 0,
+        totalPoints = 0,
+        shotCount = 0
     )
 
     constructor(reachedScore: Int, totalScore: Int) : this(
-            reachedPoints = reachedScore,
-            totalPoints = totalScore,
-            shotCount = 1
+        reachedPoints = reachedScore,
+        totalPoints = totalScore,
+        shotCount = 1
     )
 
     constructor(totalScore: Int) : this(
-            reachedPoints = 0,
-            totalPoints = totalScore,
-            shotCount = 0
+        reachedPoints = 0,
+        totalPoints = totalScore,
+        shotCount = 0
     )
 
     val shotAverage: Float
@@ -104,10 +102,10 @@ data class Score(
     }
 
     data class Configuration(
-            var showReachedScore: Boolean = false,
-            var showTotalScore: Boolean = false,
-            var showPercentage: Boolean = false,
-            var showAverage: Boolean = false
+        var showReachedScore: Boolean = false,
+        var showTotalScore: Boolean = false,
+        var showPercentage: Boolean = false,
+        var showAverage: Boolean = false
     )
 }
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
index fe4ee03ca..9e0bf5874 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.shared.models
 
-import android.annotation.SuppressLint
 import android.arch.persistence.room.ColumnInfo
 import android.arch.persistence.room.Ignore
 import android.os.Parcelable
@@ -31,7 +30,6 @@ import kotlinx.android.parcel.Parcelize
  * Represents a target face, which is in contrast to a [TargetModelBase] bound to a specific
  * scoring style and diameter.
  */
-@SuppressLint("ParcelCreator")
 @Parcelize
 data class Target(
         @ColumnInfo(name = "targetId")
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Thumbnail.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Thumbnail.kt
index d74a86479..d898d8f8a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Thumbnail.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Thumbnail.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.shared.models
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
@@ -25,16 +24,16 @@ import android.os.Parcelable
 import android.support.annotation.DrawableRes
 import de.dreier.mytargets.shared.utils.RoundedAvatarDrawable
 import de.dreier.mytargets.shared.utils.toByteArray
+import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
 import timber.log.Timber
 import java.io.File
 import java.util.*
 
-@SuppressLint("ParcelCreator")
 @Parcelize
 class Thumbnail(val data: ByteArray) : Parcelable {
 
-    @Suppress("PLUGIN_WARNING")
+    @IgnoredOnParcel
     val roundDrawable: Drawable by lazy {
         val bitmap = BitmapFactory.decodeByteArray(data, 0, data.size)
         if (bitmap == null) {
@@ -52,18 +51,26 @@ class Thumbnail(val data: ByteArray) : Parcelable {
         private const val TARGET_SIZE_MICRO_THUMBNAIL = 96
 
         fun from(bitmap: Bitmap): Thumbnail {
-            val thumbnail = ThumbnailUtils.extractThumbnail(bitmap,
-                    TARGET_SIZE_MICRO_THUMBNAIL,
-                    TARGET_SIZE_MICRO_THUMBNAIL,
-                    ThumbnailUtils.OPTIONS_RECYCLE_INPUT)
+            val thumbnail = ThumbnailUtils.extractThumbnail(
+                bitmap,
+                TARGET_SIZE_MICRO_THUMBNAIL,
+                TARGET_SIZE_MICRO_THUMBNAIL,
+                ThumbnailUtils.OPTIONS_RECYCLE_INPUT
+            )
             return Thumbnail(thumbnail.toByteArray())
         }
 
         fun from(imageFile: File): Thumbnail {
             val thumbnail = ThumbnailUtils
-                    .extractThumbnail(BitmapFactory.decodeFile(imageFile.path),
-                            TARGET_SIZE_MICRO_THUMBNAIL, TARGET_SIZE_MICRO_THUMBNAIL)
-                    ?: Bitmap.createBitmap(TARGET_SIZE_MICRO_THUMBNAIL, TARGET_SIZE_MICRO_THUMBNAIL, Bitmap.Config.RGB_565)
+                .extractThumbnail(
+                    BitmapFactory.decodeFile(imageFile.path),
+                    TARGET_SIZE_MICRO_THUMBNAIL, TARGET_SIZE_MICRO_THUMBNAIL
+                )
+                    ?: Bitmap.createBitmap(
+                        TARGET_SIZE_MICRO_THUMBNAIL,
+                        TARGET_SIZE_MICRO_THUMBNAIL,
+                        Bitmap.Config.RGB_565
+                    )
             return Thumbnail(thumbnail.toByteArray())
         }
 
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/WindDirection.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/WindDirection.kt
index 98b5d25bc..235e4e1d3 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/WindDirection.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/WindDirection.kt
@@ -14,19 +14,17 @@
  */
 package de.dreier.mytargets.shared.models
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Parcelable
 import de.dreier.mytargets.shared.R
 import kotlinx.android.parcel.Parcelize
 import java.util.*
 
-@SuppressLint("ParcelCreator")
 @Parcelize
 data class WindDirection internal constructor(
-        override var id: Long,
-        val name: String,
-        var drawable: Int
+    override var id: Long,
+    val name: String,
+    var drawable: Int
 ) : IIdProvider, Comparable<WindDirection>, Parcelable {
 
     override fun compareTo(other: WindDirection) = compareBy(WindDirection::id).compare(this, other)
@@ -34,22 +32,54 @@ data class WindDirection internal constructor(
     companion object {
         fun getList(context: Context): List<WindDirection> {
             val list = ArrayList<WindDirection>()
-            list.add(WindDirection(0, context.getString(R.string.front),
-                    R.drawable.ic_arrow_downward_black_24dp))
-            list.add(WindDirection(1, context.getString(R.string.back),
-                    R.drawable.ic_arrow_upward_black_24dp))
-            list.add(WindDirection(2, context.getString(R.string.left),
-                    R.drawable.ic_arrow_right_black_24px))
-            list.add(WindDirection(3, context.getString(R.string.right),
-                    R.drawable.ic_arrow_left_black_24dp))
-            list.add(WindDirection(4, context.getString(R.string.left_front),
-                    R.drawable.ic_arrow_bottom_right_black_24dp))
-            list.add(WindDirection(5, context.getString(R.string.right_front),
-                    R.drawable.ic_arrow_bottom_left_black_24dp))
-            list.add(WindDirection(6, context.getString(R.string.left_back),
-                    R.drawable.ic_arrow_up_right_black_24dp))
-            list.add(WindDirection(7, context.getString(R.string.right_back),
-                    R.drawable.ic_arrow_up_left_black_24dp))
+            list.add(
+                WindDirection(
+                    0, context.getString(R.string.front),
+                    R.drawable.ic_arrow_downward_black_24dp
+                )
+            )
+            list.add(
+                WindDirection(
+                    1, context.getString(R.string.back),
+                    R.drawable.ic_arrow_upward_black_24dp
+                )
+            )
+            list.add(
+                WindDirection(
+                    2, context.getString(R.string.left),
+                    R.drawable.ic_arrow_right_black_24px
+                )
+            )
+            list.add(
+                WindDirection(
+                    3, context.getString(R.string.right),
+                    R.drawable.ic_arrow_left_black_24dp
+                )
+            )
+            list.add(
+                WindDirection(
+                    4, context.getString(R.string.left_front),
+                    R.drawable.ic_arrow_bottom_right_black_24dp
+                )
+            )
+            list.add(
+                WindDirection(
+                    5, context.getString(R.string.right_front),
+                    R.drawable.ic_arrow_bottom_left_black_24dp
+                )
+            )
+            list.add(
+                WindDirection(
+                    6, context.getString(R.string.left_back),
+                    R.drawable.ic_arrow_up_right_black_24dp
+                )
+            )
+            list.add(
+                WindDirection(
+                    7, context.getString(R.string.right_back),
+                    R.drawable.ic_arrow_up_left_black_24dp
+                )
+            )
             return list
         }
     }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/WindSpeed.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/WindSpeed.kt
index b66774b7e..53092abb7 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/WindSpeed.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/WindSpeed.kt
@@ -14,19 +14,17 @@
  */
 package de.dreier.mytargets.shared.models
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Parcelable
 import de.dreier.mytargets.shared.R
 import kotlinx.android.parcel.Parcelize
 import java.util.*
 
-@SuppressLint("ParcelCreator")
 @Parcelize
 data class WindSpeed(
-        override var id: Long,
-        var name: String,
-        var drawable: Int
+    override var id: Long,
+    var name: String,
+    var drawable: Int
 ) : IIdProvider, Comparable<WindSpeed>, Parcelable {
 
     override fun compareTo(other: WindSpeed) = compareBy(WindSpeed::id).compare(this, other)
@@ -34,26 +32,66 @@ data class WindSpeed(
     companion object {
         fun getList(context: Context): List<WindSpeed> {
             val list = ArrayList<WindSpeed>()
-            list.add(WindSpeed(0, context.getString(R.string.bft_0),
-                    R.drawable.ic_bft_0_black_24dp))
-            list.add(WindSpeed(1, context.getString(R.string.bft_1),
-                    R.drawable.ic_bft_1_black_24dp))
-            list.add(WindSpeed(2, context.getString(R.string.bft_2),
-                    R.drawable.ic_bft_2_black_24dp))
-            list.add(WindSpeed(3, context.getString(R.string.bft_3),
-                    R.drawable.ic_bft_3_black_24dp))
-            list.add(WindSpeed(4, context.getString(R.string.bft_4),
-                    R.drawable.ic_bft_4_black_24dp))
-            list.add(WindSpeed(5, context.getString(R.string.bft_5),
-                    R.drawable.ic_bft_5_black_24dp))
-            list.add(WindSpeed(6, context.getString(R.string.bft_6),
-                    R.drawable.ic_bft_6_black_24dp))
-            list.add(WindSpeed(7, context.getString(R.string.bft_7),
-                    R.drawable.ic_bft_7_black_24dp))
-            list.add(WindSpeed(8, context.getString(R.string.bft_8),
-                    R.drawable.ic_bft_8_black_24dp))
-            list.add(WindSpeed(9, context.getString(R.string.bft_9),
-                    R.drawable.ic_bft_9_black_24dp))
+            list.add(
+                WindSpeed(
+                    0, context.getString(R.string.bft_0),
+                    R.drawable.ic_bft_0_black_24dp
+                )
+            )
+            list.add(
+                WindSpeed(
+                    1, context.getString(R.string.bft_1),
+                    R.drawable.ic_bft_1_black_24dp
+                )
+            )
+            list.add(
+                WindSpeed(
+                    2, context.getString(R.string.bft_2),
+                    R.drawable.ic_bft_2_black_24dp
+                )
+            )
+            list.add(
+                WindSpeed(
+                    3, context.getString(R.string.bft_3),
+                    R.drawable.ic_bft_3_black_24dp
+                )
+            )
+            list.add(
+                WindSpeed(
+                    4, context.getString(R.string.bft_4),
+                    R.drawable.ic_bft_4_black_24dp
+                )
+            )
+            list.add(
+                WindSpeed(
+                    5, context.getString(R.string.bft_5),
+                    R.drawable.ic_bft_5_black_24dp
+                )
+            )
+            list.add(
+                WindSpeed(
+                    6, context.getString(R.string.bft_6),
+                    R.drawable.ic_bft_6_black_24dp
+                )
+            )
+            list.add(
+                WindSpeed(
+                    7, context.getString(R.string.bft_7),
+                    R.drawable.ic_bft_7_black_24dp
+                )
+            )
+            list.add(
+                WindSpeed(
+                    8, context.getString(R.string.bft_8),
+                    R.drawable.ic_bft_8_black_24dp
+                )
+            )
+            list.add(
+                WindSpeed(
+                    9, context.getString(R.string.bft_9),
+                    R.drawable.ic_bft_9_black_24dp
+                )
+            )
             return list
         }
     }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
index 95d82d41f..48635eff7 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Arrow.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.annotation.SuppressLint
 import android.arch.persistence.room.ColumnInfo
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.PrimaryKey
@@ -25,25 +24,24 @@ import de.dreier.mytargets.shared.models.IIdSettable
 import de.dreier.mytargets.shared.models.Thumbnail
 import kotlinx.android.parcel.Parcelize
 
-@SuppressLint("ParcelCreator")
 @Parcelize
 @Entity
 data class Arrow(
-        @PrimaryKey(autoGenerate = true)
-        override var id: Long = 0,
+    @PrimaryKey(autoGenerate = true)
+    override var id: Long = 0,
 
-        var name: String = "",
-        var maxArrowNumber: Int = 12,
-        var length: String? = "",
-        var material: String? = "",
-        var spine: String? = "",
-        var weight: String? = "",
-        var tipWeight: String? = "",
-        var vanes: String? = "",
-        var nock: String? = "",
-        var comment: String? = "",
-        var diameter: Dimension = Dimension(5f, Dimension.Unit.MILLIMETER),
+    var name: String = "",
+    var maxArrowNumber: Int = 12,
+    var length: String? = "",
+    var material: String? = "",
+    var spine: String? = "",
+    var weight: String? = "",
+    var tipWeight: String? = "",
+    var vanes: String? = "",
+    var nock: String? = "",
+    var comment: String? = "",
+    var diameter: Dimension = Dimension(5f, Dimension.Unit.MILLIMETER),
 
-        @ColumnInfo(typeAffinity = ColumnInfo.BLOB)
-        var thumbnail: Thumbnail? = null
+    @ColumnInfo(typeAffinity = ColumnInfo.BLOB)
+    var thumbnail: Thumbnail? = null
 ) : IIdSettable, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
index 9683c0d10..3e4c63fa0 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.annotation.SuppressLint
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.ForeignKey
 import android.arch.persistence.room.ForeignKey.CASCADE
@@ -24,19 +23,22 @@ import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Image
 import kotlinx.android.parcel.Parcelize
 
-@SuppressLint("ParcelCreator")
 @Parcelize
-@Entity(foreignKeys = [
-    ForeignKey(entity = Arrow::class,
+@Entity(
+    foreignKeys = [
+        ForeignKey(
+            entity = Arrow::class,
             parentColumns = ["id"],
             childColumns = ["arrowId"],
-            onDelete = CASCADE)
-])
+            onDelete = CASCADE
+        )
+    ]
+)
 data class ArrowImage(
-        @PrimaryKey(autoGenerate = true)
-        var id: Long = 0,
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0,
 
-        override var fileName: String = "",
+    override var fileName: String = "",
 
-        var arrowId: Long? = null
+    var arrowId: Long? = null
 ) : Image, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
index 760b03b22..ba2e0e3b4 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Bow.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.annotation.SuppressLint
 import android.arch.persistence.room.ColumnInfo
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.PrimaryKey
@@ -25,37 +24,36 @@ import de.dreier.mytargets.shared.models.IIdSettable
 import de.dreier.mytargets.shared.models.Thumbnail
 import kotlinx.android.parcel.Parcelize
 
-@SuppressLint("ParcelCreator")
 @Parcelize
 @Entity
 data class Bow(
-        @PrimaryKey(autoGenerate = true)
-        override var id: Long = 0,
+    @PrimaryKey(autoGenerate = true)
+    override var id: Long = 0,
 
-        var name: String = "",
-        var type: EBowType? = EBowType.RECURVE_BOW,
-        var brand: String? = "",
-        var size: String? = "",
-        var braceHeight: String? = "",
-        var tiller: String? = "",
-        var limbs: String? = "",
-        var sight: String? = "",
-        var drawWeight: String? = "",
-        var stabilizer: String? = "",
-        var clicker: String? = "",
-        var button: String? = "",
-        var string: String? = "",
-        var nockingPoint: String? = "",
-        var letoffWeight: String? = "",
-        var arrowRest: String? = "",
-        var restHorizontalPosition: String? = "",
-        var restVerticalPosition: String? = "",
-        var restStiffness: String? = "",
-        var camSetting: String? = "",
-        var scopeMagnification: String? = "",
-        var description: String? = "",
-        @ColumnInfo(typeAffinity = ColumnInfo.BLOB)
-        var thumbnail: Thumbnail? = null
+    var name: String = "",
+    var type: EBowType? = EBowType.RECURVE_BOW,
+    var brand: String? = "",
+    var size: String? = "",
+    var braceHeight: String? = "",
+    var tiller: String? = "",
+    var limbs: String? = "",
+    var sight: String? = "",
+    var drawWeight: String? = "",
+    var stabilizer: String? = "",
+    var clicker: String? = "",
+    var button: String? = "",
+    var string: String? = "",
+    var nockingPoint: String? = "",
+    var letoffWeight: String? = "",
+    var arrowRest: String? = "",
+    var restHorizontalPosition: String? = "",
+    var restVerticalPosition: String? = "",
+    var restStiffness: String? = "",
+    var camSetting: String? = "",
+    var scopeMagnification: String? = "",
+    var description: String? = "",
+    @ColumnInfo(typeAffinity = ColumnInfo.BLOB)
+    var thumbnail: Thumbnail? = null
 ) : IIdSettable, Parcelable {
 
     fun areAllPropertiesSet(): Boolean {
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
index c422b0867..d794795c8 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.annotation.SuppressLint
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.ForeignKey
 import android.arch.persistence.room.ForeignKey.CASCADE
@@ -24,19 +23,22 @@ import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Image
 import kotlinx.android.parcel.Parcelize
 
-@SuppressLint("ParcelCreator")
 @Parcelize
-@Entity(foreignKeys = [
-    ForeignKey(entity = Bow::class,
+@Entity(
+    foreignKeys = [
+        ForeignKey(
+            entity = Bow::class,
             parentColumns = ["id"],
             childColumns = ["bowId"],
-            onDelete = CASCADE)
-])
+            onDelete = CASCADE
+        )
+    ]
+)
 data class BowImage(
-        @PrimaryKey(autoGenerate = true)
-        var id: Long = 0,
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0,
 
-        override var fileName: String = "",
+    override var fileName: String = "",
 
-        var bowId: Long? = null
+    var bowId: Long? = null
 ) : Image, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
index 3fa54646a..bf73b50a4 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.annotation.SuppressLint
 import android.arch.persistence.room.Embedded
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.ForeignKey
@@ -27,29 +26,32 @@ import de.dreier.mytargets.shared.models.Score
 import kotlinx.android.parcel.Parcelize
 import org.threeten.bp.LocalTime
 
-@SuppressLint("ParcelCreator")
 @Parcelize
-@Entity(foreignKeys = [
-    ForeignKey(entity = Round::class,
+@Entity(
+    foreignKeys = [
+        ForeignKey(
+            entity = Round::class,
             parentColumns = ["id"],
             childColumns = ["roundId"],
-            onDelete = CASCADE)
-])
+            onDelete = CASCADE
+        )
+    ]
+)
 data class End(
 
-        @PrimaryKey(autoGenerate = true)
-        override var id: Long = 0,
+    @PrimaryKey(autoGenerate = true)
+    override var id: Long = 0,
 
-        var index: Int = 0,
+    var index: Int = 0,
 
-        var roundId: Long? = null,
+    var roundId: Long? = null,
 
-        var exact: Boolean = false,
+    var exact: Boolean = false,
 
-        var saveTime: LocalTime? = null,
+    var saveTime: LocalTime? = null,
 
-        var comment: String = "",
+    var comment: String = "",
 
-        @Embedded
-        var score: Score = Score()
+    @Embedded
+    var score: Score = Score()
 ) : IIdSettable, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
index 7e487e4a1..4c0e04aef 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.annotation.SuppressLint
 import android.arch.persistence.room.Embedded
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.ForeignKey
@@ -28,42 +27,45 @@ import de.dreier.mytargets.shared.models.Score
 import de.dreier.mytargets.shared.models.Target
 import kotlinx.android.parcel.Parcelize
 
-@SuppressLint("ParcelCreator")
 @Parcelize
-@Entity(foreignKeys = [
-    ForeignKey(entity = Training::class,
+@Entity(
+    foreignKeys = [
+        ForeignKey(
+            entity = Training::class,
             parentColumns = ["id"],
             childColumns = ["trainingId"],
-            onDelete = CASCADE)
-])
+            onDelete = CASCADE
+        )
+    ]
+)
 data class Round(
-        @PrimaryKey(autoGenerate = true)
-        override var id: Long = 0,
+    @PrimaryKey(autoGenerate = true)
+    override var id: Long = 0,
 
-        var trainingId: Long? = null,
+    var trainingId: Long? = null,
 
-        var index: Int = 0,
+    var index: Int = 0,
 
-        var shotsPerEnd: Int = 0,
+    var shotsPerEnd: Int = 0,
 
-        var maxEndCount: Int? = null,
+    var maxEndCount: Int? = null,
 
-        var distance: Dimension = Dimension.UNKNOWN,
+    var distance: Dimension = Dimension.UNKNOWN,
 
-        var comment: String = "",
+    var comment: String = "",
 
-        @Embedded
-        var target: Target = Target(),
+    @Embedded
+    var target: Target = Target(),
 
-        @Embedded
-        var score: Score = Score()
+    @Embedded
+    var score: Score = Score()
 ) : IIdSettable, Parcelable {
 
     constructor(info: RoundTemplate) : this(
-            distance = info.distance,
-            shotsPerEnd = info.shotsPerEnd,
-            maxEndCount = info.endCount,
-            index = info.index,
-            target = info.targetTemplate.copy()
+        distance = info.distance,
+        shotsPerEnd = info.shotsPerEnd,
+        maxEndCount = info.endCount,
+        index = info.index,
+        target = info.targetTemplate.copy()
     )
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
index 102b5b342..7f3ac153f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
@@ -14,7 +14,6 @@
  */
 package de.dreier.mytargets.shared.models.db
 
-import android.annotation.SuppressLint
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.ForeignKey
 import android.arch.persistence.room.ForeignKey.CASCADE
@@ -25,19 +24,21 @@ import de.dreier.mytargets.shared.models.Dimension.Unit.METER
 import de.dreier.mytargets.shared.models.IIdSettable
 import kotlinx.android.parcel.Parcelize
 
-@SuppressLint("ParcelCreator")
 @Parcelize
-@Entity(foreignKeys = [(ForeignKey(entity = Bow::class,
-                parentColumns = ["id"],
-                childColumns = ["bowId"],
-                onDelete = CASCADE))])
+@Entity(
+    foreignKeys = [
+        ForeignKey(
+            entity = Bow::class,
+            parentColumns = ["id"],
+            childColumns = ["bowId"],
+            onDelete = CASCADE
+        )
+    ]
+)
 data class SightMark(
-        @PrimaryKey(autoGenerate = true)
-        override var id: Long = 0,
-
-        var bowId: Long? = null,
-
-        var distance: Dimension = Dimension(18f, METER),
-
-        var value: String? = ""
+    @PrimaryKey(autoGenerate = true)
+    override var id: Long = 0,
+    var bowId: Long? = null,
+    var distance: Dimension = Dimension(18f, METER),
+    var value: String? = ""
 ) : IIdSettable, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
index e7c6bd406..66a26b263 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/StandardRound.kt
@@ -14,19 +14,17 @@
  */
 package de.dreier.mytargets.shared.models.db
 
-import android.annotation.SuppressLint
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.PrimaryKey
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.IIdSettable
 import kotlinx.android.parcel.Parcelize
 
-@SuppressLint("ParcelCreator")
 @Parcelize
 @Entity
 data class StandardRound(
-        @PrimaryKey(autoGenerate = true)
-        override var id: Long = 0,
-        var club: Int = 0,
-        var name: String = ""
+    @PrimaryKey(autoGenerate = true)
+    override var id: Long = 0,
+    var club: Int = 0,
+    var name: String = ""
 ) : IIdSettable, Parcelable
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
index 42bd8bdef..e0937180f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
@@ -15,7 +15,6 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.annotation.SuppressLint
 import android.arch.persistence.room.Embedded
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.ForeignKey
@@ -30,7 +29,6 @@ import org.threeten.bp.LocalDate
 import org.threeten.bp.format.DateTimeFormatter
 import org.threeten.bp.format.FormatStyle
 
-@SuppressLint("ParcelCreator")
 @Parcelize
 @Entity(
     foreignKeys = [
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/EndRenderer.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/EndRenderer.kt
index 4c17ffd2a..95f895925 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/EndRenderer.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/EndRenderer.kt
@@ -18,7 +18,6 @@ package de.dreier.mytargets.shared.utils
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.animation.ValueAnimator
-import android.annotation.SuppressLint
 import android.graphics.*
 import android.os.Parcelable
 import android.view.View
@@ -28,32 +27,44 @@ import de.dreier.mytargets.shared.models.db.Shot
 import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
 
-@SuppressLint("ParcelCreator")
 @Parcelize
 class EndRenderer(
-        private var shotList: List<Shot>? = null,
-        private var pressed: Int = NO_SELECTION,
-        internal var selected: Int = NO_SELECTION,
-        private var selectedPosition: PointF? = null,
-        private var selectedRadius: Int = 0,
-        private var oldCoordinate: Array<PointF?> = arrayOfNulls(0),
-        internal var currentAnimationProgress: Float = -1f,
-        private var ambientMode: Boolean = false
+    private var shotList: List<Shot>? = null,
+    private var pressed: Int = NO_SELECTION,
+    internal var selected: Int = NO_SELECTION,
+    private var selectedPosition: PointF? = null,
+    private var selectedRadius: Int = 0,
+    private var oldCoordinate: Array<PointF?> = arrayOfNulls(0),
+    internal var currentAnimationProgress: Float = -1f,
+    private var ambientMode: Boolean = false
 ) : Parcelable {
 
-    @IgnoredOnParcel private var circle: Circle? = null
-    @IgnoredOnParcel private var parent: View? = null
-    @IgnoredOnParcel private var rect: RectF? = null
-    @IgnoredOnParcel private var radius: Int = 0
-    @IgnoredOnParcel private var grayBackground = Paint()
-    @IgnoredOnParcel private var density: Float = 0.toFloat()
-    @IgnoredOnParcel private var shotsPerRow: Int = 0
-    @IgnoredOnParcel private var rowHeight: Float = 0.toFloat()
-    @IgnoredOnParcel private var columnWidth: Float = 0.toFloat()
-    @IgnoredOnParcel private var oldRadius: Int = 0
-    @IgnoredOnParcel private var oldSelected: Int = 0
-    @IgnoredOnParcel private var oldSelectedRadius: Int = 0
-    @IgnoredOnParcel private lateinit var target: Target
+    @IgnoredOnParcel
+    private var circle: Circle? = null
+    @IgnoredOnParcel
+    private var parent: View? = null
+    @IgnoredOnParcel
+    private var rect: RectF? = null
+    @IgnoredOnParcel
+    private var radius: Int = 0
+    @IgnoredOnParcel
+    private var grayBackground = Paint()
+    @IgnoredOnParcel
+    private var density: Float = 0.toFloat()
+    @IgnoredOnParcel
+    private var shotsPerRow: Int = 0
+    @IgnoredOnParcel
+    private var rowHeight: Float = 0.toFloat()
+    @IgnoredOnParcel
+    private var columnWidth: Float = 0.toFloat()
+    @IgnoredOnParcel
+    private var oldRadius: Int = 0
+    @IgnoredOnParcel
+    private var oldSelected: Int = 0
+    @IgnoredOnParcel
+    private var oldSelectedRadius: Int = 0
+    @IgnoredOnParcel
+    private lateinit var target: Target
 
     private val animator: ValueAnimator
         get() {
@@ -92,8 +103,11 @@ class EndRenderer(
         var neededRows: Int
         var maxRows: Int
         do {
-            neededRows = Math.ceil((radius.toFloat() * 2f * density * shotList!!.size.toFloat() / rect.width()).toDouble()).toInt()
-            maxRows = Math.floor((rect.height() / (radius.toFloat() * 2f * density)).toDouble()).toInt()
+            neededRows =
+                    Math.ceil((radius.toFloat() * 2f * density * shotList!!.size.toFloat() / rect.width()).toDouble())
+                        .toInt()
+            maxRows = Math.floor((rect.height() / (radius.toFloat() * 2f * density)).toDouble())
+                .toInt()
             radius--
         } while (neededRows > maxRows)
         radius -= MIN_PADDING
@@ -129,14 +143,18 @@ class EndRenderer(
             if (radius > 0) {
                 // Draw touch feedback if arrow is pressed
                 if (pressed == shot.index) {
-                    canvas.drawRect(coordinate.x - radius, coordinate.y - radius,
-                            coordinate.x + radius, coordinate.y + radius, grayBackground)
+                    canvas.drawRect(
+                        coordinate.x - radius, coordinate.y - radius,
+                        coordinate.x + radius, coordinate.y + radius, grayBackground
+                    )
                 }
 
                 // Draw circle
-                circle!!.draw(canvas, coordinate.x, coordinate.y, shot.scoringRing, radius,
-                        shot.index,
-                        shot.arrowNumber, ambientMode, target)
+                circle!!.draw(
+                    canvas, coordinate.x, coordinate.y, shot.scoringRing, radius,
+                    shot.index,
+                    shot.arrowNumber, ambientMode, target
+                )
             }
         }
     }
@@ -181,7 +199,12 @@ class EndRenderer(
         }
     }
 
-    fun getAnimationToSelection(selectedShot: Int, c: PointF?, radius: Int, rect: RectF?): Animator? {
+    fun getAnimationToSelection(
+        selectedShot: Int,
+        c: PointF?,
+        radius: Int,
+        rect: RectF?
+    ): Animator? {
         if (rect == null) {
             setSelection(selectedShot, c, radius)
             return null
@@ -239,8 +262,10 @@ class EndRenderer(
     fun getBoundsForShot(index: Int): Rect {
         val position = getPosition(index, shotList!![index])
         val radius = getRadius(shotList!![index]) * density
-        return Rect((position.x - radius).toInt(), (position.y - radius).toInt(),
-                (position.x + radius).toInt(), (position.y + radius).toInt())
+        return Rect(
+            (position.x - radius).toInt(), (position.y - radius).toInt(),
+            (position.x + radius).toInt(), (position.y + radius).toInt()
+        )
     }
 
     companion object {
diff --git a/wearable/build.gradle b/wearable/build.gradle
index 8b20162ef..b932cbe44 100644
--- a/wearable/build.gradle
+++ b/wearable/build.gradle
@@ -72,8 +72,6 @@ android {
 dependencies {
     Map<String, String> dependencies = rootProject.ext.dependencies
 
-    kapt dependencies.databindingCompiler
-
     implementation dependencies.supportWearable
     compileOnly dependencies.wearable
     implementation dependencies.supportCompat
diff --git a/wearable/src/main/java/de/dreier/mytargets/TimerActivity.kt b/wearable/src/main/java/de/dreier/mytargets/TimerActivity.kt
index a8b78c04c..4e75bf68e 100644
--- a/wearable/src/main/java/de/dreier/mytargets/TimerActivity.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/TimerActivity.kt
@@ -110,7 +110,7 @@ class TimerActivity : WearableActivity(), MenuItem.OnMenuItemClickListener {
         private lateinit var binding: FragmentTimerBinding
 
         override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-            binding = DataBindingUtil.inflate(inflater, R.layout.fragment_timer, container, false)
+            binding = FragmentTimerBinding.inflate(inflater, container, false)
             binding.startTimer.setOnClickListener(this)
             return binding.root
         }

From 6b92a778e4c2fb027031161908f7484c42e670cb Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Sat, 24 Mar 2018 17:22:21 +0100
Subject: [PATCH 074/102] Added indices

---
 app/build.gradle                              |  20 +--
 .../26.json                                   | 135 ++++++++++++++++--
 .../base/db/migrations/Migration26.kt         |  55 ++++---
 build.gradle                                  |   1 -
 shared/build.gradle                           |   1 -
 .../mytargets/shared/models/db/ArrowImage.kt  |   4 +
 .../mytargets/shared/models/db/BowImage.kt    |   4 +
 .../dreier/mytargets/shared/models/db/End.kt  |   8 +-
 .../mytargets/shared/models/db/EndImage.kt    |   4 +
 .../mytargets/shared/models/db/Round.kt       |   8 +-
 .../shared/models/db/RoundTemplate.kt         |  22 +--
 .../dreier/mytargets/shared/models/db/Shot.kt |  52 ++++---
 .../mytargets/shared/models/db/SightMark.kt   |   4 +
 .../mytargets/shared/models/db/Training.kt    |  12 +-
 14 files changed, 236 insertions(+), 94 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2b5cf4219..7d90360cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,7 +18,6 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.github.triplet.play'
-apply plugin: 'jacoco-android'
 apply plugin: 'com.getkeepsafe.dexcount'
 apply plugin: 'io.fabric'
 
@@ -107,24 +106,7 @@ android {
     }
 }
 
-project.afterEvaluate {
-    android.applicationVariants.all { variant ->
-        def realVariantName = variant.name
-        def variantName = variant.name.capitalize()
-
-        def task = project.tasks["jacocoTest${variantName}UnitTestReport"]
-        def defaultExcludes = task.classDirectories.excludes
-
-        def excludes = defaultExcludes
-
-        def kotlinDebugTree = fileTree(dir: "${buildDir}/tmp/kotlin-classes/${realVariantName}", excludes: excludes)
-
-        task.classDirectories.excludes = excludes
-        task.classDirectories += kotlinDebugTree
-    }
-}
-
-apply from: '../tools/script-codacy.gradle'
+//apply from: '../tools/script-codacy.gradle'
 apply from: '../tools/script-play-store.gradle'
 
 dependencies {
diff --git a/app/schemas/de.dreier.mytargets.base.db.AppDatabase/26.json b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/26.json
index 81e3b617b..cd581fae5 100644
--- a/app/schemas/de.dreier.mytargets.base.db.AppDatabase/26.json
+++ b/app/schemas/de.dreier.mytargets.base.db.AppDatabase/26.json
@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 26,
-    "identityHash": "b555dd5093c13ff4448ebc4fb7f3b8ed",
+    "identityHash": "f21bd6c3cff16a8f2b423d078c5c8294",
     "entities": [
       {
         "tableName": "Arrow",
@@ -125,7 +125,16 @@
           ],
           "autoGenerate": true
         },
-        "indices": [],
+        "indices": [
+          {
+            "name": "index_ArrowImage_arrowId",
+            "unique": false,
+            "columnNames": [
+              "arrowId"
+            ],
+            "createSql": "CREATE  INDEX `index_ArrowImage_arrowId` ON `${TABLE_NAME}` (`arrowId`)"
+          }
+        ],
         "foreignKeys": [
           {
             "table": "Arrow",
@@ -327,7 +336,16 @@
           ],
           "autoGenerate": true
         },
-        "indices": [],
+        "indices": [
+          {
+            "name": "index_BowImage_bowId",
+            "unique": false,
+            "columnNames": [
+              "bowId"
+            ],
+            "createSql": "CREATE  INDEX `index_BowImage_bowId` ON `${TABLE_NAME}` (`bowId`)"
+          }
+        ],
         "foreignKeys": [
           {
             "table": "Bow",
@@ -407,7 +425,16 @@
           ],
           "autoGenerate": true
         },
-        "indices": [],
+        "indices": [
+          {
+            "name": "index_End_roundId",
+            "unique": false,
+            "columnNames": [
+              "roundId"
+            ],
+            "createSql": "CREATE  INDEX `index_End_roundId` ON `${TABLE_NAME}` (`roundId`)"
+          }
+        ],
         "foreignKeys": [
           {
             "table": "Round",
@@ -451,7 +478,16 @@
           ],
           "autoGenerate": true
         },
-        "indices": [],
+        "indices": [
+          {
+            "name": "index_EndImage_endId",
+            "unique": false,
+            "columnNames": [
+              "endId"
+            ],
+            "createSql": "CREATE  INDEX `index_EndImage_endId` ON `${TABLE_NAME}` (`endId`)"
+          }
+        ],
         "foreignKeys": [
           {
             "table": "End",
@@ -555,7 +591,16 @@
           ],
           "autoGenerate": true
         },
-        "indices": [],
+        "indices": [
+          {
+            "name": "index_Round_trainingId",
+            "unique": false,
+            "columnNames": [
+              "trainingId"
+            ],
+            "createSql": "CREATE  INDEX `index_Round_trainingId` ON `${TABLE_NAME}` (`trainingId`)"
+          }
+        ],
         "foreignKeys": [
           {
             "table": "Training",
@@ -635,7 +680,16 @@
           ],
           "autoGenerate": true
         },
-        "indices": [],
+        "indices": [
+          {
+            "name": "index_RoundTemplate_standardRoundId",
+            "unique": false,
+            "columnNames": [
+              "standardRoundId"
+            ],
+            "createSql": "CREATE  INDEX `index_RoundTemplate_standardRoundId` ON `${TABLE_NAME}` (`standardRoundId`)"
+          }
+        ],
         "foreignKeys": [
           {
             "table": "StandardRound",
@@ -703,7 +757,16 @@
           ],
           "autoGenerate": true
         },
-        "indices": [],
+        "indices": [
+          {
+            "name": "index_Shot_endId",
+            "unique": false,
+            "columnNames": [
+              "endId"
+            ],
+            "createSql": "CREATE  INDEX `index_Shot_endId` ON `${TABLE_NAME}` (`endId`)"
+          }
+        ],
         "foreignKeys": [
           {
             "table": "End",
@@ -753,7 +816,16 @@
           ],
           "autoGenerate": true
         },
-        "indices": [],
+        "indices": [
+          {
+            "name": "index_SightMark_bowId",
+            "unique": false,
+            "columnNames": [
+              "bowId"
+            ],
+            "createSql": "CREATE  INDEX `index_SightMark_bowId` ON `${TABLE_NAME}` (`bowId`)"
+          }
+        ],
         "foreignKeys": [
           {
             "table": "Bow",
@@ -951,7 +1023,48 @@
           ],
           "autoGenerate": true
         },
-        "indices": [],
+        "indices": [
+          {
+            "name": "index_Training_arrowId",
+            "unique": false,
+            "columnNames": [
+              "arrowId"
+            ],
+            "createSql": "CREATE  INDEX `index_Training_arrowId` ON `${TABLE_NAME}` (`arrowId`)"
+          },
+          {
+            "name": "index_Training_bowId",
+            "unique": false,
+            "columnNames": [
+              "bowId"
+            ],
+            "createSql": "CREATE  INDEX `index_Training_bowId` ON `${TABLE_NAME}` (`bowId`)"
+          },
+          {
+            "name": "index_Training_standardRoundId",
+            "unique": false,
+            "columnNames": [
+              "standardRoundId"
+            ],
+            "createSql": "CREATE  INDEX `index_Training_standardRoundId` ON `${TABLE_NAME}` (`standardRoundId`)"
+          },
+          {
+            "name": "index_Training_archerSignatureId",
+            "unique": false,
+            "columnNames": [
+              "archerSignatureId"
+            ],
+            "createSql": "CREATE  INDEX `index_Training_archerSignatureId` ON `${TABLE_NAME}` (`archerSignatureId`)"
+          },
+          {
+            "name": "index_Training_witnessSignatureId",
+            "unique": false,
+            "columnNames": [
+              "witnessSignatureId"
+            ],
+            "createSql": "CREATE  INDEX `index_Training_witnessSignatureId` ON `${TABLE_NAME}` (`witnessSignatureId`)"
+          }
+        ],
         "foreignKeys": [
           {
             "table": "Arrow",
@@ -1013,7 +1126,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"b555dd5093c13ff4448ebc4fb7f3b8ed\")"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"f21bd6c3cff16a8f2b423d078c5c8294\")"
     ]
   }
 }
\ No newline at end of file
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
index 696a8ea09..67b4c1ff7 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
@@ -24,25 +24,26 @@ import de.dreier.mytargets.shared.models.db.Shot
 object Migration26 : Migration(25, 26) {
     override fun migrate(database: SupportSQLiteDatabase) {
 
-        database.execSQL("ALTER TABLE `Training` ADD COLUMN reachedPoints INTEGER DEFAULT 0;")
-        database.execSQL("ALTER TABLE `Training` ADD COLUMN totalPoints INTEGER DEFAULT 0;")
-        database.execSQL("ALTER TABLE `Training` ADD COLUMN shotCount INTEGER DEFAULT 0;")
+        database.execSQL("ALTER TABLE `Training` ADD COLUMN `reachedPoints` INTEGER DEFAULT 0;")
+        database.execSQL("ALTER TABLE `Training` ADD COLUMN `totalPoints` INTEGER DEFAULT 0;")
+        database.execSQL("ALTER TABLE `Training` ADD COLUMN `shotCount` INTEGER DEFAULT 0;")
 
-        database.execSQL("ALTER TABLE `Round` ADD COLUMN reachedPoints INTEGER DEFAULT 0;")
-        database.execSQL("ALTER TABLE `Round` ADD COLUMN totalPoints INTEGER DEFAULT 0;")
-        database.execSQL("ALTER TABLE `Round` ADD COLUMN shotCount INTEGER DEFAULT 0;")
+        database.execSQL("ALTER TABLE `Round` ADD COLUMN `reachedPoints` INTEGER DEFAULT 0;")
+        database.execSQL("ALTER TABLE `Round` ADD COLUMN `totalPoints` INTEGER DEFAULT 0;")
+        database.execSQL("ALTER TABLE `Round` ADD COLUMN `shotCount` INTEGER DEFAULT 0;")
 
-        database.execSQL("ALTER TABLE `End` ADD COLUMN reachedPoints INTEGER DEFAULT 0;")
-        database.execSQL("ALTER TABLE `End` ADD COLUMN totalPoints INTEGER DEFAULT 0;")
-        database.execSQL("ALTER TABLE `End` ADD COLUMN shotCount INTEGER DEFAULT 0;")
+        database.execSQL("ALTER TABLE `End` ADD COLUMN `reachedPoints` INTEGER DEFAULT 0;")
+        database.execSQL("ALTER TABLE `End` ADD COLUMN `totalPoints` INTEGER DEFAULT 0;")
+        database.execSQL("ALTER TABLE `End` ADD COLUMN `shotCount` INTEGER DEFAULT 0;")
 
         recreateTablesWithNonNull(database)
 
         RoomCreationCallback.createScoreTriggers(database)
 
-        val rounds = database.query(
-            "SELECT id, targetId, targetScoringStyleIndex, targetDiameter FROM Round"
-        )
+        createIndices(database)
+
+        val rounds =
+            database.query("SELECT `id`, `targetId`, `targetScoringStyleIndex`, `targetDiameter` FROM `Round`")
 
         while (rounds.moveToNext()) {
             val diameterData = rounds.getString(3)
@@ -53,12 +54,12 @@ object Migration26 : Migration(25, 26) {
             val target = Target(rounds.getLong(1), rounds.getInt(2), diameter)
             val roundId = rounds.getLong(0)
 
-            val ends = database.query("SELECT id FROM `End` WHERE roundId = $roundId")
+            val ends = database.query("SELECT `id` FROM `End` WHERE `roundId` = $roundId")
             while (ends.moveToNext()) {
                 val endId = ends.getLong(0)
 
                 val shotsCursor =
-                    database.query("SELECT `index`, scoringRing FROM Shot WHERE endId = $endId ORDER BY `index`")
+                    database.query("SELECT `index`, `scoringRing` FROM `Shot` WHERE `endId` = $endId ORDER BY `index`")
                 val shots = mutableListOf<Shot>()
                 while (shotsCursor.moveToNext()) {
                     val shot =
@@ -69,15 +70,31 @@ object Migration26 : Migration(25, 26) {
                 val score = target.getReachedScore(shots)
                 database.execSQL(
                     "UPDATE `End` SET " +
-                            "reachedPoints = ${score.reachedPoints}, " +
-                            "totalPoints = ${score.totalPoints}, " +
-                            "shotCount = ${score.shotCount} " +
-                            "WHERE id = $endId"
+                            "`reachedPoints` = ${score.reachedPoints}, " +
+                            "`totalPoints` = ${score.totalPoints}, " +
+                            "`shotCount` = ${score.shotCount} " +
+                            "WHERE `id` = $endId"
                 )
             }
         }
     }
 
+    private fun createIndices(database: SupportSQLiteDatabase) {
+        database.execSQL("CREATE  INDEX `index_ArrowImage_arrowId` ON `ArrowImage` (`arrowId`)")
+        database.execSQL("CREATE  INDEX `index_BowImage_bowId` ON `BowImage` (`bowId`)")
+        database.execSQL("CREATE  INDEX `index_End_roundId` ON `End` (`roundId`)")
+        database.execSQL("CREATE  INDEX `index_EndImage_endId` ON `EndImage` (`endId`)")
+        database.execSQL("CREATE  INDEX `index_Round_trainingId` ON `Round` (`trainingId`)")
+        database.execSQL("CREATE  INDEX `index_RoundTemplate_standardRoundId` ON `RoundTemplate` (`standardRoundId`)")
+        database.execSQL("CREATE  INDEX `index_Shot_endId` ON `Shot` (`endId`)")
+        database.execSQL("CREATE  INDEX `index_SightMark_bowId` ON `SightMark` (`bowId`)")
+        database.execSQL("CREATE  INDEX `index_Training_arrowId` ON `Training` (`arrowId`)")
+        database.execSQL("CREATE  INDEX `index_Training_bowId` ON `Training` (`bowId`)")
+        database.execSQL("CREATE  INDEX `index_Training_standardRoundId` ON `Training` (`standardRoundId`)")
+        database.execSQL("CREATE  INDEX `index_Training_archerSignatureId` ON `Training` (`archerSignatureId`)")
+        database.execSQL("CREATE  INDEX `index_Training_witnessSignatureId` ON `Training` (`witnessSignatureId`)")
+    }
+
     private fun recreateTablesWithNonNull(database: SupportSQLiteDatabase) {
         val migrations = listOf(
             TableMigrationBuilder("Arrow")
@@ -452,7 +469,7 @@ class TableMigrationBuilder(val tableName: String) {
 
     fun copyData(database: SupportSQLiteDatabase) {
         database.execSQL("INSERT INTO `$newTableName` (" + fieldMigrations.joinToString(separator = ", ") { it.name } + ") "
-                + "SELECT " + fieldMigrations.joinToString(separator = ", ") {  it.columnName }
+                + "SELECT " + fieldMigrations.joinToString(separator = ", ") { it.columnName }
                 + " FROM `$tableName`")
     }
 
diff --git a/build.gradle b/build.gradle
index 01006bcf3..98c46ff64 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,6 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:$androidPluginVersion"
         classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
-        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.2'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
         classpath 'com.google.gms:google-services:3.2.0'
         classpath 'com.google.firebase:firebase-plugins:1.1.5'
diff --git a/shared/build.gradle b/shared/build.gradle
index c98a4adf9..087289113 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -17,7 +17,6 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'jacoco-android'
 
 android {
     compileOptions {
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
index 3e4c63fa0..85a820695 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/ArrowImage.kt
@@ -18,6 +18,7 @@ package de.dreier.mytargets.shared.models.db
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.ForeignKey
 import android.arch.persistence.room.ForeignKey.CASCADE
+import android.arch.persistence.room.Index
 import android.arch.persistence.room.PrimaryKey
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Image
@@ -32,6 +33,9 @@ import kotlinx.android.parcel.Parcelize
             childColumns = ["arrowId"],
             onDelete = CASCADE
         )
+    ],
+    indices = [
+        Index(value = ["arrowId"])
     ]
 )
 data class ArrowImage(
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
index d794795c8..df0225f2d 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/BowImage.kt
@@ -18,6 +18,7 @@ package de.dreier.mytargets.shared.models.db
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.ForeignKey
 import android.arch.persistence.room.ForeignKey.CASCADE
+import android.arch.persistence.room.Index
 import android.arch.persistence.room.PrimaryKey
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Image
@@ -32,6 +33,9 @@ import kotlinx.android.parcel.Parcelize
             childColumns = ["bowId"],
             onDelete = CASCADE
         )
+    ],
+    indices = [
+        Index(value = ["bowId"])
     ]
 )
 data class BowImage(
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
index bf73b50a4..742c5a4a9 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/End.kt
@@ -15,11 +15,8 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.Embedded
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.ForeignKey
+import android.arch.persistence.room.*
 import android.arch.persistence.room.ForeignKey.CASCADE
-import android.arch.persistence.room.PrimaryKey
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.IIdSettable
 import de.dreier.mytargets.shared.models.Score
@@ -35,6 +32,9 @@ import org.threeten.bp.LocalTime
             childColumns = ["roundId"],
             onDelete = CASCADE
         )
+    ],
+    indices = [
+        Index(value = ["roundId"])
     ]
 )
 data class End(
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
index 662ec8b89..7ccfccc48 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/EndImage.kt
@@ -18,6 +18,7 @@ package de.dreier.mytargets.shared.models.db
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.ForeignKey
 import android.arch.persistence.room.ForeignKey.CASCADE
+import android.arch.persistence.room.Index
 import android.arch.persistence.room.PrimaryKey
 import android.os.Parcel
 import android.os.Parcelable
@@ -31,6 +32,9 @@ import de.dreier.mytargets.shared.models.Image
             childColumns = ["endId"],
             onDelete = CASCADE
         )
+    ],
+    indices = [
+        Index(value = ["endId"])
     ]
 )
 data class EndImage(
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
index 4c0e04aef..995fed98f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Round.kt
@@ -15,11 +15,8 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.Embedded
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.ForeignKey
+import android.arch.persistence.room.*
 import android.arch.persistence.room.ForeignKey.CASCADE
-import android.arch.persistence.room.PrimaryKey
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.IIdSettable
@@ -36,6 +33,9 @@ import kotlinx.android.parcel.Parcelize
             childColumns = ["trainingId"],
             onDelete = CASCADE
         )
+    ],
+    indices = [
+        Index(value = ["trainingId"])
     ]
 )
 data class Round(
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
index aa7d5615c..dd649dc42 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/RoundTemplate.kt
@@ -15,11 +15,8 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.Embedded
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.ForeignKey
+import android.arch.persistence.room.*
 import android.arch.persistence.room.ForeignKey.CASCADE
-import android.arch.persistence.room.PrimaryKey
 import android.os.Parcel
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Dimension
@@ -27,12 +24,17 @@ import de.dreier.mytargets.shared.models.IIdSettable
 import de.dreier.mytargets.shared.models.Target
 
 @Entity(
-    foreignKeys = [(ForeignKey(
-        entity = StandardRound::class,
-        parentColumns = ["id"],
-        childColumns = ["standardRoundId"],
-        onDelete = CASCADE
-    ))]
+    foreignKeys = [
+        ForeignKey(
+            entity = StandardRound::class,
+            parentColumns = ["id"],
+            childColumns = ["standardRoundId"],
+            onDelete = CASCADE
+        )
+    ],
+    indices = [
+        Index(value = ["standardRoundId"])
+    ]
 )
 data class RoundTemplate(
     @PrimaryKey(autoGenerate = true)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
index e19573638..cbcee2428 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Shot.kt
@@ -18,32 +18,42 @@ package de.dreier.mytargets.shared.models.db
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.ForeignKey
 import android.arch.persistence.room.ForeignKey.CASCADE
+import android.arch.persistence.room.Index
 import android.arch.persistence.room.PrimaryKey
 import android.os.Parcel
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.IIdSettable
 
-@Entity(foreignKeys = [(ForeignKey(entity = End::class,
-                parentColumns = ["id"],
-                childColumns = ["endId"],
-                onDelete = CASCADE))])
+@Entity(
+    foreignKeys = [
+        ForeignKey(
+            entity = End::class,
+            parentColumns = ["id"],
+            childColumns = ["endId"],
+            onDelete = CASCADE
+        )
+    ],
+    indices = [
+        Index(value = ["endId"])
+    ]
+)
 data class Shot(
-        @PrimaryKey(autoGenerate = true)
-        override var id: Long = 0,
+    @PrimaryKey(autoGenerate = true)
+    override var id: Long = 0,
 
-        // The index of the shot in the containing end
-        var index: Int = 0,
+    // The index of the shot in the containing end
+    var index: Int = 0,
 
-        var endId: Long? = null,
+    var endId: Long? = null,
 
-        var x: Float = 0f,
+    var x: Float = 0f,
 
-        var y: Float = 0f,
+    var y: Float = 0f,
 
-        var scoringRing: Int = NOTHING_SELECTED,
+    var scoringRing: Int = NOTHING_SELECTED,
 
-        // Is the actual number of the arrow not its index, arrow id or something else
-        var arrowNumber: String? = null
+    // Is the actual number of the arrow not its index, arrow id or something else
+    var arrowNumber: String? = null
 ) : IIdSettable, Comparable<Shot>, Parcelable {
     constructor(i: Int) : this(index = i)
 
@@ -58,13 +68,13 @@ data class Shot(
     }
 
     constructor(source: Parcel) : this(
-            source.readLong(),
-            source.readInt(),
-            source.readValue(Long::class.java.classLoader) as Long?,
-            source.readFloat(),
-            source.readFloat(),
-            source.readInt(),
-            source.readString()
+        source.readLong(),
+        source.readInt(),
+        source.readValue(Long::class.java.classLoader) as Long?,
+        source.readFloat(),
+        source.readFloat(),
+        source.readInt(),
+        source.readString()
     )
 
     override fun describeContents() = 0
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
index 7f3ac153f..7b48b482b 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/SightMark.kt
@@ -17,6 +17,7 @@ package de.dreier.mytargets.shared.models.db
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.ForeignKey
 import android.arch.persistence.room.ForeignKey.CASCADE
+import android.arch.persistence.room.Index
 import android.arch.persistence.room.PrimaryKey
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Dimension
@@ -33,6 +34,9 @@ import kotlinx.android.parcel.Parcelize
             childColumns = ["bowId"],
             onDelete = CASCADE
         )
+    ],
+    indices = [
+        Index(value = ["bowId"])
     ]
 )
 data class SightMark(
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
index e0937180f..eb59a1104 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/db/Training.kt
@@ -15,11 +15,8 @@
 
 package de.dreier.mytargets.shared.models.db
 
-import android.arch.persistence.room.Embedded
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.ForeignKey
+import android.arch.persistence.room.*
 import android.arch.persistence.room.ForeignKey.SET_NULL
-import android.arch.persistence.room.PrimaryKey
 import android.os.Parcelable
 import de.dreier.mytargets.shared.models.Environment
 import de.dreier.mytargets.shared.models.IIdSettable
@@ -62,6 +59,13 @@ import org.threeten.bp.format.FormatStyle
             childColumns = ["witnessSignatureId"],
             onDelete = SET_NULL
         )
+    ],
+    indices = [
+        Index(value = ["arrowId"]),
+        Index(value = ["bowId"]),
+        Index(value = ["standardRoundId"]),
+        Index(value = ["archerSignatureId"]),
+        Index(value = ["witnessSignatureId"])
     ]
 )
 data class Training(

From 2c74b4d023fe72b24480052b4d4e4c91a2c0ab8e Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Sun, 25 Mar 2018 11:03:03 +0200
Subject: [PATCH 075/102] Fixed DbTestRules and Databinding in Selector classes

---
 .../test/utils/rules/DbTestRuleBase.kt        |  8 ++-
 .../test/utils/rules/MiniDbTestRule.kt        |  2 -
 .../test/utils/rules/SimpleDbTestRule.kt      |  6 --
 .../dreier/mytargets/base/db/AppDatabase.kt   |  2 +-
 .../de/dreier/mytargets/base/db/dao/EndDAO.kt | 12 ++--
 .../dreier/mytargets/base/db/dao/RoundDAO.kt  |  4 +-
 .../mytargets/views/selector/ArrowSelector.kt | 18 +++---
 .../mytargets/views/selector/BowSelector.kt   | 18 +++---
 .../views/selector/DistanceSelector.kt        | 11 +++-
 .../views/selector/EnvironmentSelector.kt     | 58 ++++++++++++-------
 .../mytargets/views/selector/SelectorBase.kt  | 24 ++++----
 .../views/selector/SimpleDistanceSelector.kt  | 14 +++--
 .../views/selector/StandardRoundSelector.kt   | 29 ++++++----
 .../views/selector/TargetSelector.kt          | 24 ++++----
 .../views/selector/WindDirectionSelector.kt   | 21 ++++---
 .../views/selector/WindSpeedSelector.kt       | 21 ++++---
 16 files changed, 158 insertions(+), 114 deletions(-)

diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
index a2076f768..4816777a6 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
@@ -19,6 +19,7 @@ import android.content.Context
 import android.support.test.InstrumentationRegistry
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
+import de.dreier.mytargets.base.db.AppDatabase
 import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.EBowType
 import de.dreier.mytargets.shared.models.EWeather
@@ -33,6 +34,7 @@ import org.junit.runner.Description
 import org.junit.runners.model.Statement
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalTime
+import java.io.IOException
 import java.util.*
 
 abstract class DbTestRuleBase : TestRule {
@@ -42,9 +44,13 @@ abstract class DbTestRuleBase : TestRule {
         return object : Statement() {
             @Throws(Throwable::class)
             override fun evaluate() {
+                context.deleteDatabase(AppDatabase.DATABASE_FILE_NAME)
                 ApplicationInstance.initRoomDb(context)
                 addDatabaseContent()
                 base.evaluate()
+                try {
+                    ApplicationInstance.db.close()
+                } catch (e: IOException) {}
             }
         }
     }
@@ -69,7 +75,7 @@ abstract class DbTestRuleBase : TestRule {
             end.shots[i].x = gaussianRand(gen)
             end.shots[i].y = gaussianRand(gen)
             end.shots[i].scoringRing = round.round.target.model
-                    .getZoneFromPoint(end.shots[i].x, end.shots[i].y, 0.05f)
+                .getZoneFromPoint(end.shots[i].x, end.shots[i].y, 0.05f)
         }
         end.end.score = round.round.target.getReachedScore(end.shots)
         end.end.saveTime = LocalTime.of(14, gen.nextInt(59), gen.nextInt(59), 0)
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
index 4697c2e1c..d23cae36b 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/MiniDbTestRule.kt
@@ -50,11 +50,9 @@ class MiniDbTestRule : DbTestRuleBase() {
 
         randomEnd(round1, 6, generator)
         randomEnd(round1, 6, generator)
-        ApplicationInstance.db.roundDAO().saveRound(round1.round, round1.ends.map { it.end })
 
         randomEnd(round2, 6, generator)
         randomEnd(round2, 6, generator)
-        ApplicationInstance.db.roundDAO().saveRound(round2.round, round2.ends.map { it.end })
     }
 
 }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
index c7721cfa3..78fba4bfd 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
@@ -80,7 +80,6 @@ class SimpleDbTestRule : DbTestRuleBase() {
         randomEnd(round1, 6, generator)
         randomEnd(round1, 6, generator)
         randomEnd(round1, 6, generator)
-        ApplicationInstance.db.roundDAO().saveRound(round1.round, round1.ends.map { it.end })
 
         randomEnd(round2, 6, generator)
         randomEnd(round2, 6, generator)
@@ -88,7 +87,6 @@ class SimpleDbTestRule : DbTestRuleBase() {
         randomEnd(round2, 6, generator)
         randomEnd(round2, 6, generator)
         randomEnd(round2, 6, generator)
-        ApplicationInstance.db.roundDAO().saveRound(round2.round, round2.ends.map { it.end })
     }
 
     private fun getRoundTemplate(index: Int, distance: Int): RoundTemplate {
@@ -119,7 +117,6 @@ class SimpleDbTestRule : DbTestRuleBase() {
         randomEnd(round1, 6, generator)
         randomEnd(round1, 6, generator)
         randomEnd(round1, 6, generator)
-        ApplicationInstance.db.roundDAO().saveRound(round1.round, round1.ends.map { it.end })
 
         randomEnd(round2, 6, generator)
         randomEnd(round2, 6, generator)
@@ -127,7 +124,6 @@ class SimpleDbTestRule : DbTestRuleBase() {
         randomEnd(round2, 6, generator)
         randomEnd(round2, 6, generator)
         randomEnd(round2, 6, generator)
-        ApplicationInstance.db.roundDAO().saveRound(round2.round, round2.ends.map { it.end })
     }
 
     private fun addFullTraining(bow: Bow) {
@@ -156,7 +152,6 @@ class SimpleDbTestRule : DbTestRuleBase() {
         buildEnd(round1, 0, 1, 1, 1, 2, 3)
         buildEnd(round1, 1, 2, 3, 3, 4, 5)
         buildEnd(round1, 1, 2, 2, 3, 3, 3)
-        ApplicationInstance.db.roundDAO().saveRound(round1.round, round1.ends.map { it.end })
 
         buildEnd(round2, 1, 2, 2, 3, 4, 5)
         buildEnd(round2, 0, 0, 1, 2, 2, 3)
@@ -164,6 +159,5 @@ class SimpleDbTestRule : DbTestRuleBase() {
         buildEnd(round2, 1, 1, 2, 3, 4, 4)
         buildEnd(round2, 1, 2, 2, 3, 3, 3)
         buildEnd(round2, 1, 2, 2, 3, 3, 4)
-        ApplicationInstance.db.roundDAO().saveRound(round2.round, round2.ends.map { it.end })
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/AppDatabase.kt b/app/src/main/java/de/dreier/mytargets/base/db/AppDatabase.kt
index 17c01f9f0..0144bd7fb 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/AppDatabase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/AppDatabase.kt
@@ -49,7 +49,7 @@ import de.dreier.mytargets.shared.models.db.*
 abstract class AppDatabase : RoomDatabase() {
     companion object {
         const val NAME = "database"
-        const val DATABASE_FILE_NAME = "${NAME}.db"
+        const val DATABASE_FILE_NAME = "$NAME.db"
         const val DATABASE_IMPORT_FILE_NAME = "database"
         const val VERSION = 26
     }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
index 8a33dd2e0..4fdd26882 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
@@ -23,13 +23,13 @@ import de.dreier.mytargets.shared.models.db.Shot
 @Dao
 abstract class EndDAO {
 
-    @Query("SELECT * FROM End WHERE roundId = :roundId ORDER BY `index`")
+    @Query("SELECT * FROM `End` WHERE `roundId` = :roundId ORDER BY `index`")
     abstract fun loadEnds(roundId: Long): MutableList<End>
 
-    @Query("SELECT * FROM EndImage WHERE endId = :id")
+    @Query("SELECT * FROM `EndImage` WHERE `endId` = :id")
     abstract fun loadEndImages(id: Long): List<EndImage>
 
-    @Query("SELECT * FROM Shot WHERE endId = :id ORDER BY `index`")
+    @Query("SELECT * FROM `Shot` WHERE `endId` = :id ORDER BY `index`")
     abstract fun loadShots(id: Long): List<Shot>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
@@ -53,7 +53,7 @@ abstract class EndDAO {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     abstract fun insertShot(images: Shot): Long
 
-    @Query("DELETE FROM EndImage WHERE endId = (:endId)")
+    @Query("DELETE FROM `EndImage` WHERE `endId` = (:endId)")
     abstract fun deleteEndImages(endId: Long)
 
     @Transaction
@@ -79,10 +79,10 @@ abstract class EndDAO {
     @Delete
     abstract fun deleteEndWithoutIndexUpdate(end: End)
 
-    @Query("UPDATE End SET `index` = `index` - 1 WHERE `index` > :allAboveIndex")
+    @Query("UPDATE `End` SET `index` = `index` - 1 WHERE `index` > :allAboveIndex")
     abstract fun decrementIndices(allAboveIndex: Int)
 
-    @Query("UPDATE End SET `index` = `index` + 1 WHERE `index` >= :allAboveIndex")
+    @Query("UPDATE `End` SET `index` = `index` + 1 WHERE `index` >= :allAboveIndex")
     abstract fun incrementIndices(allAboveIndex: Int)
 
     @Transaction
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
index 98605a329..e8f02315c 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
@@ -33,7 +33,7 @@ abstract class RoundDAO {
     @Query("SELECT * FROM Round WHERE id = :id")
     abstract fun loadRoundOrNull(id: Long): Round?
 
-    @Query("SELECT * FROM End WHERE roundId = :id ORDER BY `index`")
+    @Query("SELECT * FROM `End` WHERE `roundId` = :id ORDER BY `index`")
     abstract fun loadEnds(id: Long): MutableList<End>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
@@ -45,7 +45,7 @@ abstract class RoundDAO {
     @Update
     abstract fun updateRound(round: Round)
 
-    @Query("DELETE FROM End WHERE roundId = :id")
+    @Query("DELETE FROM `End` WHERE `roundId` = :id")
     abstract fun deleteEnds(id: Long)
 
     @Transaction
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
index f62f9f048..8157c73c4 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/ArrowSelector.kt
@@ -25,18 +25,20 @@ import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
 import de.dreier.mytargets.shared.models.db.Arrow
 
 class ArrowSelector @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null
-) : SelectorBase<Arrow>(context, attrs, R.layout.selector_item_image_details, ARROW_REQUEST_CODE) {
-
-    private lateinit var binding: SelectorItemImageDetailsBinding
+    context: Context,
+    attrs: AttributeSet? = null
+) : SelectorBase<Arrow, SelectorItemImageDetailsBinding>(
+    context,
+    attrs,
+    R.layout.selector_item_image_details,
+    ARROW_REQUEST_CODE
+) {
 
     private val arrowDAO = ApplicationInstance.db.arrowDAO()
 
     override fun bindView(item: Arrow) {
-        binding = SelectorItemImageDetailsBinding.bind(view)
-        binding.name.text = item.name
-        binding.image.setImageDrawable(item.thumbnail!!.roundDrawable)
+        view.name.text = item.name
+        view.image.setImageDrawable(item.thumbnail!!.roundDrawable)
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
index 1de0fd300..f5efc3d49 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/BowSelector.kt
@@ -25,19 +25,21 @@ import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
 import de.dreier.mytargets.shared.models.db.Bow
 
 class BowSelector @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null
-) : SelectorBase<Bow>(context, attrs, R.layout.selector_item_image_details, BOW_REQUEST_CODE) {
-
-    private lateinit var binding: SelectorItemImageDetailsBinding
+    context: Context,
+    attrs: AttributeSet? = null
+) : SelectorBase<Bow, SelectorItemImageDetailsBinding>(
+    context,
+    attrs,
+    R.layout.selector_item_image_details,
+    BOW_REQUEST_CODE
+) {
 
     private val database = ApplicationInstance.db
     private val bowDAO = database.bowDAO()
 
     override fun bindView(item: Bow) {
-        binding = SelectorItemImageDetailsBinding.bind(view)
-        binding.name.text = item.name
-        binding.image.setImageDrawable(item.thumbnail!!.roundDrawable)
+        view.name.text = item.name
+        view.image.setImageDrawable(item.thumbnail!!.roundDrawable)
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/DistanceSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/DistanceSelector.kt
index 90a3ce01a..7636f5555 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/DistanceSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/DistanceSelector.kt
@@ -21,11 +21,16 @@ import de.dreier.mytargets.R
 import de.dreier.mytargets.databinding.SelectorItemDistanceBinding
 import de.dreier.mytargets.shared.models.Dimension
 
-class DistanceSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : SelectorBase<Dimension>(context, attrs, R.layout.selector_item_distance, DISTANCE_REQUEST_CODE) {
+class DistanceSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
+    SelectorBase<Dimension, SelectorItemDistanceBinding>(
+        context,
+        attrs,
+        R.layout.selector_item_distance,
+        DISTANCE_REQUEST_CODE
+    ) {
 
     override fun bindView(item: Dimension) {
-        val binding = SelectorItemDistanceBinding.bind(view)
-        binding.distanceValue.text = item.toString()
+        view.distanceValue.text = item.toString()
     }
 
     companion object {
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
index c6cf98671..06a75fa63 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/EnvironmentSelector.kt
@@ -41,10 +41,14 @@ import retrofit2.Callback
 import retrofit2.Response
 import java.io.IOException
 
-class EnvironmentSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null
-) : SelectorBase<Environment>(context, attrs, R.layout.selector_item_image_details, ENVIRONMENT_REQUEST_CODE) {
-
-    private lateinit var binding: SelectorItemImageDetailsBinding
+class EnvironmentSelector @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : SelectorBase<Environment, SelectorItemImageDetailsBinding>(
+    context,
+    attrs,
+    R.layout.selector_item_image_details,
+    ENVIRONMENT_REQUEST_CODE
+) {
 
     override var selectedItem: Environment?
         get() = if (super.selectedItem == null) {
@@ -55,19 +59,17 @@ class EnvironmentSelector @JvmOverloads constructor(context: Context, attrs: Att
         }
 
     override fun bindView(item: Environment) {
-        binding = SelectorItemImageDetailsBinding.bind(view)
-
         if (item.indoor) {
-            binding.name.setText(de.dreier.mytargets.shared.R.string.indoor)
-            binding.image.setImageResource(R.drawable.ic_house_24dp)
+            view.name.setText(de.dreier.mytargets.shared.R.string.indoor)
+            view.image.setImageResource(R.drawable.ic_house_24dp)
         } else {
-            binding.name.text = item.weather.getName()
-            binding.image.setImageResource(item.weather.drawable)
+            view.name.text = item.weather.getName()
+            view.image.setImageResource(item.weather.drawable)
         }
-        binding.details.visibility = View.VISIBLE
-        binding.details.text = getDetails(context, item)
-        binding.title.visibility = View.VISIBLE
-        binding.title.setText(R.string.environment)
+        view.details.visibility = View.VISIBLE
+        view.details.text = getDetails(context, item)
+        view.title.visibility = View.VISIBLE
+        view.title.setText(R.string.environment)
     }
 
     private fun getDetails(context: Context, item: Environment): String {
@@ -78,7 +80,10 @@ class EnvironmentSelector @JvmOverloads constructor(context: Context, attrs: Att
                 description += "${context.getString(de.dreier.mytargets.shared.R.string.location)}: ${item.location}"
             }
         } else {
-            description = "${context.getString(de.dreier.mytargets.shared.R.string.wind)}: ${item.getWindSpeed(context)}"
+            description =
+                    "${context.getString(de.dreier.mytargets.shared.R.string.wind)}: ${item.getWindSpeed(
+                        context
+                    )}"
             if (!item.location.isEmpty()) {
                 description += "\n${context.getString(de.dreier.mytargets.shared.R.string.location)}: ${item.location}"
             }
@@ -91,7 +96,11 @@ class EnvironmentSelector @JvmOverloads constructor(context: Context, attrs: Att
             setDefaultWeather()
             return
         }
-        if (ContextCompat.checkSelfPermission(fragment.context!!, ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+        if (ContextCompat.checkSelfPermission(
+                fragment.context!!,
+                ACCESS_FINE_LOCATION
+            ) != PackageManager.PERMISSION_GRANTED
+        ) {
             setDefaultWeather()
             fragment.requestPermissions(arrayOf(ACCESS_FINE_LOCATION), requestCode)
         } else {
@@ -118,13 +127,20 @@ class EnvironmentSelector @JvmOverloads constructor(context: Context, attrs: Att
                 val locationStr = getAddressFromLocation(location.latitude, location.longitude)
                 val weatherService = WeatherService()
                 val weatherCall = weatherService
-                        .fetchCurrentWeather(location.longitude, location.latitude)
+                    .fetchCurrentWeather(location.longitude, location.latitude)
                 weatherCall.enqueue(object : Callback<CurrentWeather> {
-                    override fun onResponse(call: Call<CurrentWeather>, response: Response<CurrentWeather>) {
+                    override fun onResponse(
+                        call: Call<CurrentWeather>,
+                        response: Response<CurrentWeather>
+                    ) {
                         if (response.isSuccessful && response.body()!!.httpCode == 200) {
                             val toEnvironment = response.body()!!.toEnvironment()
-                            setItem(toEnvironment.copy(location = locationStr
-                                    ?: toEnvironment.location))
+                            setItem(
+                                toEnvironment.copy(
+                                    location = locationStr
+                                            ?: toEnvironment.location
+                                )
+                            )
                         } else {
                             setDefaultWeather()
                         }
@@ -151,7 +167,7 @@ class EnvironmentSelector @JvmOverloads constructor(context: Context, attrs: Att
             if (addresses.size > 0) {
                 val fetchedAddress = addresses[0]
                 var address = fetchedAddress.locality
-                if(fetchedAddress.subLocality != null) {
+                if (fetchedAddress.subLocality != null) {
                     address += ", ${fetchedAddress.subLocality}"
                 }
                 address
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/SelectorBase.kt b/app/src/main/java/de/dreier/mytargets/views/selector/SelectorBase.kt
index 6abed3af7..1bf0c27a3 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/SelectorBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/SelectorBase.kt
@@ -18,6 +18,8 @@ package de.dreier.mytargets.views.selector
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.databinding.DataBindingUtil
+import android.databinding.ViewDataBinding
 import android.os.Parcelable
 import android.support.annotation.LayoutRes
 import android.util.AttributeSet
@@ -27,19 +29,19 @@ import android.widget.Button
 import android.widget.LinearLayout
 import com.evernote.android.state.State
 import com.evernote.android.state.StateSaver
-import de.dreier.mytargets.R
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.INTENT
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
+import de.dreier.mytargets.databinding.SelectorItemProcessBinding
 
 typealias OnUpdateListener<T> = (T?) -> Unit
 
-abstract class SelectorBase<T : Parcelable>(
-        context: Context, attrs: AttributeSet?,
-        @LayoutRes private val layout: Int,
-        protected var requestCode: Int
+abstract class SelectorBase<T : Parcelable, V : ViewDataBinding>(
+    context: Context, attrs: AttributeSet?,
+    @LayoutRes private val layout: Int,
+    protected var requestCode: Int
 ) : LinearLayout(context, attrs) {
 
-    protected lateinit var view: View
+    protected lateinit var view: V
 
     @State
     open var selectedItem: T? = null
@@ -52,10 +54,8 @@ abstract class SelectorBase<T : Parcelable>(
         super.onFinishInflate()
         addButton = getChildAt(0) as Button?
         val inflater = LayoutInflater.from(context)
-        progress = inflater.inflate(R.layout.selector_item_process, this, false)
-        view = inflater.inflate(layout, this, false)
-        addView(progress)
-        addView(view)
+        progress = SelectorItemProcessBinding.inflate(inflater, this, true).root
+        view = DataBindingUtil.inflate(inflater, layout, this, true)
         updateView()
     }
 
@@ -63,7 +63,7 @@ abstract class SelectorBase<T : Parcelable>(
         val displayProgress = selectedItem == null && addButton == null
         addButton?.visibility = if (selectedItem == null) View.VISIBLE else View.GONE
         progress!!.visibility = if (displayProgress) View.VISIBLE else View.GONE
-        view.visibility = if (selectedItem != null) View.VISIBLE else View.GONE
+        view.root.visibility = if (selectedItem != null) View.VISIBLE else View.GONE
         selectedItem?.let { bindView(it) }
     }
 
@@ -84,7 +84,7 @@ abstract class SelectorBase<T : Parcelable>(
     }
 
     fun setOnClickListener(clickListener: (T?, Int) -> Unit) {
-        view.setOnClickListener { clickListener.invoke(selectedItem, itemIndex) }
+        view.root.setOnClickListener { clickListener.invoke(selectedItem, itemIndex) }
     }
 
     open fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/SimpleDistanceSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/SimpleDistanceSelector.kt
index f1469bb98..46aa76158 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/SimpleDistanceSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/SimpleDistanceSelector.kt
@@ -22,13 +22,17 @@ import de.dreier.mytargets.databinding.SelectorItemSimpleTextBinding
 import de.dreier.mytargets.shared.models.Dimension
 
 class SimpleDistanceSelector @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null
-) : SelectorBase<Dimension>(context, attrs, R.layout.selector_item_simple_text, SIMPLE_DISTANCE_REQUEST_CODE) {
+    context: Context,
+    attrs: AttributeSet? = null
+) : SelectorBase<Dimension, SelectorItemSimpleTextBinding>(
+    context,
+    attrs,
+    R.layout.selector_item_simple_text,
+    SIMPLE_DISTANCE_REQUEST_CODE
+) {
 
     override fun bindView(item: Dimension) {
-        val binding = SelectorItemSimpleTextBinding.bind(view)
-        binding.text.text = item.toString()
+        view.text.text = item.toString()
     }
 
     companion object {
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
index 47247973e..61cfe08c4 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/StandardRoundSelector.kt
@@ -23,19 +23,23 @@ import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
 import de.dreier.mytargets.shared.models.augmented.AugmentedStandardRound
 
-class StandardRoundSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null)
-    : SelectorBase<AugmentedStandardRound>(context, attrs, R.layout.selector_item_image_details, STANDARD_ROUND_REQUEST_CODE) {
-
-    private lateinit var binding: SelectorItemImageDetailsBinding
+class StandardRoundSelector @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null
+) : SelectorBase<AugmentedStandardRound, SelectorItemImageDetailsBinding>(
+    context,
+    attrs,
+    R.layout.selector_item_image_details,
+    STANDARD_ROUND_REQUEST_CODE
+) {
 
     private val standardRoundDAO = ApplicationInstance.db.standardRoundDAO()
 
     override fun bindView(item: AugmentedStandardRound) {
-        binding = SelectorItemImageDetailsBinding.bind(view)
-        binding.name.text = item.standardRound.name
-        binding.details.visibility = View.VISIBLE
-        binding.details.text = item.getDescription(context)
-        binding.image.setImageDrawable(item.targetDrawable)
+        view.name.text = item.standardRound.name
+        view.details.visibility = View.VISIBLE
+        view.details.text = item.getDescription(context)
+        view.image.setImageDrawable(item.targetDrawable)
     }
 
     fun setItemId(standardRoundId: Long?) {
@@ -44,7 +48,12 @@ class StandardRoundSelector @JvmOverloads constructor(context: Context, attrs: A
         if (standardRound == null || standardRoundDAO.loadRoundTemplates(standardRound.id).isEmpty()) {
             standardRound = standardRoundDAO.loadStandardRound(32L)
         }
-        setItem(AugmentedStandardRound(standardRound, standardRoundDAO.loadRoundTemplates(standardRound.id).toMutableList()))
+        setItem(
+            AugmentedStandardRound(
+                standardRound,
+                standardRoundDAO.loadRoundTemplates(standardRound.id).toMutableList()
+            )
+        )
     }
 
     companion object {
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/TargetSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/TargetSelector.kt
index 5b6c39cba..d3f255226 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/TargetSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/TargetSelector.kt
@@ -22,19 +22,21 @@ import de.dreier.mytargets.R
 import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
 import de.dreier.mytargets.shared.models.Target
 
-class TargetSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null)
-    : SelectorBase<Target>(context, attrs, R.layout.selector_item_image_details, TARGET_REQUEST_CODE) {
-
-    private lateinit var binding: SelectorItemImageDetailsBinding
+class TargetSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
+    SelectorBase<Target, SelectorItemImageDetailsBinding>(
+        context,
+        attrs,
+        R.layout.selector_item_image_details,
+        TARGET_REQUEST_CODE
+    ) {
 
     override fun bindView(item: Target) {
-        binding = SelectorItemImageDetailsBinding.bind(view)
-        binding.name.text = item.name
-        binding.details.visibility = View.VISIBLE
-        binding.details.text = item.getDetails()
-        binding.image.setImageDrawable(item.drawable)
-        binding.title.visibility = View.VISIBLE
-        binding.title.setText(R.string.target_face)
+        view.name.text = item.name
+        view.details.visibility = View.VISIBLE
+        view.details.text = item.getDetails()
+        view.image.setImageDrawable(item.drawable)
+        view.title.visibility = View.VISIBLE
+        view.title.setText(R.string.target_face)
     }
 
     companion object {
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/WindDirectionSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/WindDirectionSelector.kt
index 8d2e5e3d1..f2ba91841 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/WindDirectionSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/WindDirectionSelector.kt
@@ -22,17 +22,20 @@ import de.dreier.mytargets.R
 import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
 import de.dreier.mytargets.shared.models.WindDirection
 
-class WindDirectionSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null
-) : SelectorBase<WindDirection>(context, attrs, R.layout.selector_item_image_details, WIND_DIRECTION_REQUEST_CODE) {
-
-    private lateinit var binding: SelectorItemImageDetailsBinding
+class WindDirectionSelector @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : SelectorBase<WindDirection, SelectorItemImageDetailsBinding>(
+    context,
+    attrs,
+    R.layout.selector_item_image_details,
+    WIND_DIRECTION_REQUEST_CODE
+) {
 
     override fun bindView(item: WindDirection) {
-        binding = SelectorItemImageDetailsBinding.bind(view)
-        binding.name.text = item.name
-        binding.image.setImageResource(item.drawable)
-        binding.title.visibility = View.VISIBLE
-        binding.title.setText(R.string.wind_direction)
+        view.name.text = item.name
+        view.image.setImageResource(item.drawable)
+        view.title.visibility = View.VISIBLE
+        view.title.setText(R.string.wind_direction)
     }
 
     fun setItemId(direction: Long) {
diff --git a/app/src/main/java/de/dreier/mytargets/views/selector/WindSpeedSelector.kt b/app/src/main/java/de/dreier/mytargets/views/selector/WindSpeedSelector.kt
index b8fac4a15..341bc95cd 100644
--- a/app/src/main/java/de/dreier/mytargets/views/selector/WindSpeedSelector.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/selector/WindSpeedSelector.kt
@@ -22,17 +22,20 @@ import de.dreier.mytargets.R
 import de.dreier.mytargets.databinding.SelectorItemImageDetailsBinding
 import de.dreier.mytargets.shared.models.WindSpeed
 
-class WindSpeedSelector @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null
-) : SelectorBase<WindSpeed>(context, attrs, R.layout.selector_item_image_details, WIND_SPEED_REQUEST_CODE) {
-
-    private lateinit var binding: SelectorItemImageDetailsBinding
+class WindSpeedSelector @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : SelectorBase<WindSpeed, SelectorItemImageDetailsBinding>(
+    context,
+    attrs,
+    R.layout.selector_item_image_details,
+    WIND_SPEED_REQUEST_CODE
+) {
 
     override fun bindView(item: WindSpeed) {
-        binding = SelectorItemImageDetailsBinding.bind(view)
-        binding.name.text = item.name
-        binding.image.setImageResource(item.drawable)
-        binding.title.visibility = View.VISIBLE
-        binding.title.setText(R.string.wind_speed)
+        view.name.text = item.name
+        view.image.setImageResource(item.drawable)
+        view.title.visibility = View.VISIBLE
+        view.title.setText(R.string.wind_speed)
     }
 
     fun setItemId(speed: Long) {

From f1f6c368e9aaf846537948b8f5dc2f14937c0e7f Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Mon, 26 Mar 2018 18:36:38 +0200
Subject: [PATCH 076/102] Fixed UI tests

---
 .../de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt  | 2 +-
 .../dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt   | 4 ++--
 .../java/de/dreier/mytargets/base/db/TrainingRepository.kt  | 6 +++---
 .../main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt   | 2 +-
 .../java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt     | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
index 4816777a6..89d38a909 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/DbTestRuleBase.kt
@@ -126,7 +126,7 @@ abstract class DbTestRuleBase : TestRule {
         training.bowId = null
         training.arrowId = null
         training.arrowNumbering = false
-        ApplicationInstance.db.trainingDAO().saveTraining(training)
+        training.id = ApplicationInstance.db.trainingDAO().insertTraining(training)
         return training
     }
 }
diff --git a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
index 78fba4bfd..715b33a81 100644
--- a/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
+++ b/app/src/androidTest/java/de/dreier/mytargets/test/utils/rules/SimpleDbTestRule.kt
@@ -66,12 +66,12 @@ class SimpleDbTestRule : DbTestRuleBase() {
 
         val round1r = Round(rounds[0])
         round1r.trainingId = id
-        ApplicationInstance.db.roundDAO().insertRound(round1r)
+        round1r.id = ApplicationInstance.db.roundDAO().insertRound(round1r)
         val round1 = AugmentedRound(round1r, mutableListOf())
 
         val round2r = Round(rounds[1])
         round2r.trainingId = id
-        ApplicationInstance.db.roundDAO().insertRound(round2r)
+        round2r.id = ApplicationInstance.db.roundDAO().insertRound(round2r)
         val round2 = AugmentedRound(round2r, mutableListOf())
 
         randomEnd(round1, 6, generator)
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt b/app/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt
index d97ea998a..36b86f93f 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt
@@ -37,7 +37,7 @@ class TrainingRepository(
 
     fun insertTraining(training: AugmentedTraining) {
         database.runInTransaction {
-            trainingDAO.saveTraining(training.training)
+            training.training.id = trainingDAO.insertTraining(training.training)
             training.rounds.forEach { round ->
                 round.round.trainingId = training.training.id
                 roundRepository.saveRound(round)
@@ -55,7 +55,7 @@ class TrainingRepository(
         val signature = Signature()
         signature.id = signatureDAO.insertSignature(signature)
         training.archerSignatureId = signature.id
-        trainingDAO.saveTraining(training)
+        trainingDAO.updateTraining(training)
         return signature
     }
 
@@ -69,7 +69,7 @@ class TrainingRepository(
         val signature = Signature()
         signature.id = signatureDAO.insertSignature(signature)
         training.witnessSignatureId = signature.id
-        trainingDAO.saveTraining(training)
+        trainingDAO.updateTraining(training)
         return signature
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
index e8f02315c..de4633704 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
@@ -30,7 +30,7 @@ abstract class RoundDAO {
     @Query("SELECT * FROM Round WHERE id = :id")
     abstract fun loadRound(id: Long): Round
 
-    @Query("SELECT * FROM Round WHERE id = :id")
+    @Query("SELECT * FROM `Round` WHERE `id` = :id")
     abstract fun loadRoundOrNull(id: Long): Round?
 
     @Query("SELECT * FROM `End` WHERE `roundId` = :id ORDER BY `index`")
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
index 684a6518b..a21ffc8f4 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
@@ -28,14 +28,14 @@ abstract class TrainingDAO {
     abstract fun loadTraining(id: Long): Training
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    abstract fun saveTraining(training: Training): Long
+    abstract fun insertTraining(training: Training): Long
 
     @Update
     abstract fun updateTraining(training: Training)
 
     @Transaction
     open fun saveTraining(training: Training, rounds: List<Round>) {
-        training.id = saveTraining(training)
+        training.id = insertTraining(training)
         for (round in rounds) {
             round.trainingId = training.id
             round.id = insertRound(round)

From 32958ad1079f83c0e045ab60ef6ae372da78e7a7 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Mon, 26 Mar 2018 20:08:53 +0200
Subject: [PATCH 077/102] Added backticks to queries and added DAO tests

---
 .../de/dreier/mytargets/dao/ArrowDAOTest.kt   |  63 +++++++++
 .../de/dreier/mytargets/dao/DAOTestBase.kt    |  39 ++++++
 .../de/dreier/mytargets/dao/EndDAOTest.kt     | 127 ++++++++++++++++++
 .../dreier/mytargets/base/db/dao/ArrowDAO.kt  |  11 +-
 .../de/dreier/mytargets/base/db/dao/BowDAO.kt |  14 +-
 .../mytargets/base/db/dao/DimensionDAO.kt     |   6 +-
 .../dreier/mytargets/base/db/dao/ImageDAO.kt  |   6 +-
 .../dreier/mytargets/base/db/dao/RoundDAO.kt  |   6 +-
 .../mytargets/base/db/dao/SignatureDAO.kt     |   4 +-
 .../mytargets/base/db/dao/StandardRoundDAO.kt |  12 +-
 .../mytargets/base/db/dao/TrainingDAO.kt      |   4 +-
 11 files changed, 260 insertions(+), 32 deletions(-)
 create mode 100644 app/src/androidTest/java/de/dreier/mytargets/dao/ArrowDAOTest.kt
 create mode 100644 app/src/androidTest/java/de/dreier/mytargets/dao/DAOTestBase.kt
 create mode 100644 app/src/androidTest/java/de/dreier/mytargets/dao/EndDAOTest.kt

diff --git a/app/src/androidTest/java/de/dreier/mytargets/dao/ArrowDAOTest.kt b/app/src/androidTest/java/de/dreier/mytargets/dao/ArrowDAOTest.kt
new file mode 100644
index 000000000..0f99ead8f
--- /dev/null
+++ b/app/src/androidTest/java/de/dreier/mytargets/dao/ArrowDAOTest.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.dao
+
+import android.support.test.runner.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import de.dreier.mytargets.shared.models.db.Arrow
+import de.dreier.mytargets.shared.models.db.ArrowImage
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+open class ArrowDAOTest : DAOTestBase() {
+
+    @Test
+    fun saveArrowSavesData() {
+        val arrow = Arrow(name = "arrow")
+        val arrowImages = mutableListOf<ArrowImage>()
+        arrowImages.add(ArrowImage(fileName = "image"))
+        appDatabase.arrowDAO().saveArrow(arrow, arrowImages)
+        assertThat(arrow.id).isGreaterThan(0)
+
+        val loadedArrow = appDatabase.arrowDAO().loadArrow(arrow.id)
+        assertThat(loadedArrow.name ).isEqualTo( "arrow")
+
+        val images = appDatabase.arrowDAO().loadArrowImages(arrow.id)
+        assertThat(images.size ).isEqualTo( 1)
+        assertThat(images[0].fileName ).isEqualTo( "image")
+    }
+
+    @Test
+    fun saveArrowReplacesImages() {
+        val arrow = Arrow(name = "arrow")
+        val arrowImages = mutableListOf<ArrowImage>()
+        arrowImages.add(ArrowImage(fileName = "image1"))
+        arrowImages.add(ArrowImage(fileName = "image2"))
+        appDatabase.arrowDAO().saveArrow(arrow, arrowImages)
+
+        val imagesBefore = appDatabase.arrowDAO().loadArrowImages(arrow.id)
+        assertThat(imagesBefore.size ).isEqualTo( 2)
+
+        arrowImages.removeAt(0)
+        appDatabase.arrowDAO().saveArrow(arrow, arrowImages)
+
+        val imagesAfter = appDatabase.arrowDAO().loadArrowImages(arrow.id)
+        assertThat(imagesAfter.size).isEqualTo(1)
+        assertThat(imagesAfter[0].fileName).isEqualTo("image2")
+    }
+
+}
diff --git a/app/src/androidTest/java/de/dreier/mytargets/dao/DAOTestBase.kt b/app/src/androidTest/java/de/dreier/mytargets/dao/DAOTestBase.kt
new file mode 100644
index 000000000..a1967674a
--- /dev/null
+++ b/app/src/androidTest/java/de/dreier/mytargets/dao/DAOTestBase.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.dao
+
+import android.arch.persistence.room.Room
+import android.support.test.InstrumentationRegistry
+import de.dreier.mytargets.base.db.AppDatabase
+import org.junit.After
+import org.junit.Before
+
+abstract class DAOTestBase {
+    protected lateinit var appDatabase: AppDatabase
+
+    @Before
+    fun initDb() {
+        appDatabase = Room.inMemoryDatabaseBuilder(
+            InstrumentationRegistry.getContext(),
+            AppDatabase::class.java
+        ).build()
+    }
+
+    @After
+    fun closeDb() {
+        appDatabase.close()
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/de/dreier/mytargets/dao/EndDAOTest.kt b/app/src/androidTest/java/de/dreier/mytargets/dao/EndDAOTest.kt
new file mode 100644
index 000000000..29ddaa586
--- /dev/null
+++ b/app/src/androidTest/java/de/dreier/mytargets/dao/EndDAOTest.kt
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.dao
+
+import android.support.test.runner.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
+import de.dreier.mytargets.shared.models.db.End
+import de.dreier.mytargets.shared.models.db.EndImage
+import de.dreier.mytargets.shared.models.db.Round
+import de.dreier.mytargets.shared.models.db.Shot
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalTime
+
+@RunWith(AndroidJUnit4::class)
+open class EndDAOTest : DAOTestBase() {
+
+    @Before
+    fun initRound() {
+        appDatabase.roundDAO().insertRound(Round(id = 1))
+    }
+
+    @Test
+    fun saveCompleteEndSavesData() {
+        val endToInsert = EndFactory.makeSimpleEnd(1)
+        appDatabase.endDAO().saveCompleteEnd(endToInsert.end, endToInsert.images, endToInsert.shots)
+        assertThat(endToInsert.id).isGreaterThan(0)
+
+        val ends = appDatabase.endDAO().loadEnds(1)
+        assertThat(ends.size).isEqualTo(1)
+        assertThat(ends[0].id).isEqualTo(endToInsert.id)
+        assertThat(ends[0].exact)
+        assertThat(ends[0].saveTime).isEqualTo(LocalTime.of(12, 42))
+        assertThat(ends[0].index).isEqualTo(0)
+
+        val images = appDatabase.endDAO().loadEndImages(ends[0].id)
+        assertThat(images).isEmpty()
+
+        val shots = appDatabase.endDAO().loadShots(ends[0].id)
+        assertThat(shots.size).isEqualTo(2)
+        assertThat(shots[0].index).isEqualTo(0)
+        assertThat(shots[1].index).isEqualTo(1)
+        assertThat(shots[0].x).isEqualTo(0.5f)
+        assertThat(shots[0].scoringRing).isEqualTo(4)
+        assertThat(shots[1].y).isEqualTo(0.4f)
+        assertThat(shots[1].scoringRing).isEqualTo(5)
+    }
+
+    @Test
+    fun insertEndUpdatesIndicesWhenInsertedAtFront() {
+        val firstEnd = EndFactory.makeSimpleEnd(1)
+        appDatabase.endDAO().saveCompleteEnd(firstEnd.end, firstEnd.images, firstEnd.shots)
+
+        val insertedEnd = EndFactory.makeSimpleEnd(1)
+        appDatabase.endDAO().insertEnd(insertedEnd.end, insertedEnd.images, insertedEnd.shots)
+
+        val ends = appDatabase.endDAO().loadEnds(1)
+        assertThat(ends.size).isEqualTo(2)
+        assertThat(ends[0].index).isEqualTo(0)
+        assertThat(ends[1].index).isEqualTo(1)
+    }
+
+    @Test
+    fun insertEndUpdatesIndicesWhenInsertedAtBack() {
+        val firstEnd = EndFactory.makeSimpleEnd(1)
+        appDatabase.endDAO().saveCompleteEnd(firstEnd.end, firstEnd.images, firstEnd.shots)
+
+        val insertedEnd = EndFactory.makeSimpleEnd(1)
+        insertedEnd.end.comment = "second"
+        insertedEnd.end.index = 1
+        appDatabase.endDAO().insertEnd(insertedEnd.end, insertedEnd.images, insertedEnd.shots)
+
+        val ends = appDatabase.endDAO().loadEnds(1)
+        assertThat(ends.size).isEqualTo(2)
+        assertThat(ends[0].index).isEqualTo(0)
+        assertThat(ends[1].index).isEqualTo(1)
+        assertThat(ends[0].comment).isEqualTo("")
+        assertThat(ends[1].comment).isEqualTo("second")
+    }
+
+    @Test
+    fun deleteEndUpdatesIndices() {
+        val firstEnd = EndFactory.makeSimpleEnd(1)
+        appDatabase.endDAO().saveCompleteEnd(firstEnd.end, firstEnd.images, firstEnd.shots)
+
+        val insertedEnd = EndFactory.makeSimpleEnd(1)
+        insertedEnd.end.comment = "second"
+        insertedEnd.end.index = 1
+        appDatabase.endDAO().saveCompleteEnd(insertedEnd.end, insertedEnd.images, insertedEnd.shots)
+
+        appDatabase.endDAO().deleteEnd(firstEnd.end)
+
+        val ends = appDatabase.endDAO().loadEnds(1)
+        assertThat(ends.size).isEqualTo(1)
+        assertThat(ends[0].index).isEqualTo(0)
+        assertThat(ends[0].comment).isEqualTo("second")
+    }
+}
+
+class EndFactory {
+    companion object {
+        fun makeSimpleEnd(roundId: Long): AugmentedEnd {
+            val end =
+                End(roundId = roundId, exact = true, index = 0, saveTime = LocalTime.of(12, 42))
+            val images = mutableListOf<EndImage>()
+            val shots = mutableListOf<Shot>()
+            shots.add(Shot(index = 0, x = 0.5f, y = 0.4f, scoringRing = 4))
+            shots.add(Shot(index = 1, x = 0.5f, y = 0.4f, scoringRing = 5))
+            return AugmentedEnd(end = end, images = images, shots = shots)
+        }
+    }
+}
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
index 8af12dda6..f0c964879 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
@@ -21,16 +21,16 @@ import de.dreier.mytargets.shared.models.db.ArrowImage
 
 @Dao
 abstract class ArrowDAO {
-    @Query("SELECT * FROM Arrow")
+    @Query("SELECT * FROM `Arrow`")
     abstract fun loadArrows(): List<Arrow>
 
-    @Query("SELECT * FROM Arrow WHERE id = (:id)")
+    @Query("SELECT * FROM `Arrow` WHERE `id` = (:id)")
     abstract fun loadArrow(id: Long): Arrow
 
-    @Query("SELECT * FROM Arrow WHERE id = (:id)")
+    @Query("SELECT * FROM `Arrow` WHERE `id` = (:id)")
     abstract fun loadArrowOrNull(id: Long): Arrow?
 
-    @Query("SELECT * FROM ArrowImage WHERE arrowId = (:id)")
+    @Query("SELECT * FROM `ArrowImage` WHERE `arrowId` = (:id)")
     abstract fun loadArrowImages(id: Long): List<ArrowImage>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
@@ -39,13 +39,12 @@ abstract class ArrowDAO {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     abstract fun insertArrowImages(images: List<ArrowImage>)
 
-    @Query("DELETE FROM ArrowImage WHERE arrowId = (:arrowId)")
+    @Query("DELETE FROM `ArrowImage` WHERE `arrowId` = (:arrowId)")
     abstract fun deleteArrowImages(arrowId: Long)
 
     @Transaction
     open fun saveArrow(arrow: Arrow, images: List<ArrowImage>) {
         arrow.id = insertArrow(arrow)
-       // deleteArrowImages(arrow.id) TODO test if insert replace deletes old images
         for (image in images) {
             image.arrowId = arrow.id
         }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
index 41dc6995b..f2ccd939b 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
@@ -22,19 +22,19 @@ import de.dreier.mytargets.shared.models.db.SightMark
 
 @Dao
 abstract class BowDAO {
-    @Query("SELECT * FROM Bow")
+    @Query("SELECT * FROM `Bow`")
     abstract fun loadBows(): List<Bow>
 
-    @Query("SELECT * FROM Bow WHERE id = (:id)")
+    @Query("SELECT * FROM `Bow` WHERE `id` = (:id)")
     abstract fun loadBow(id: Long): Bow
 
-    @Query("SELECT * FROM Bow WHERE id = (:id)")
+    @Query("SELECT * FROM `Bow` WHERE `id` = (:id)")
     abstract fun loadBowOrNull(id: Long): Bow?
 
-    @Query("SELECT * FROM BowImage WHERE bowId = (:id)")
+    @Query("SELECT * FROM `BowImage` WHERE `bowId` = (:id)")
     abstract fun loadBowImages(id: Long): List<BowImage>
 
-    @Query("SELECT * FROM SightMark WHERE bowId = (:id)")
+    @Query("SELECT * FROM `SightMark` WHERE `bowId` = (:id)")
     abstract fun loadSightMarks(id: Long): List<SightMark>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
@@ -43,13 +43,13 @@ abstract class BowDAO {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     abstract fun insertBowImages(images: List<BowImage>)
 
-    @Query("DELETE FROM BowImage WHERE bowId = (:bowId)")
+    @Query("DELETE FROM `BowImage` WHERE `bowId` = (:bowId)")
     abstract fun deleteBowImages(bowId: Long)
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     abstract fun insertSightMarks(sightMarks: List<SightMark>)
 
-    @Query("DELETE FROM SightMark WHERE bowId = (:bowId)")
+    @Query("DELETE FROM `SightMark` WHERE `bowId` = (:bowId)")
     abstract fun deleteSightMarks(bowId: Long)
 
     @Transaction
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
index babfd5baf..ab7bf80e5 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
@@ -27,8 +27,8 @@ interface DimensionDAO {
      * @param unit     Distances are only returned which match the specified unit
      * @return List of distances
      */
-    @Query("SELECT distance FROM SightMark WHERE distance LIKE ('% ' || :unit)" +
-            "UNION SELECT distance FROM RoundTemplate WHERE distance LIKE ('% ' || :unit)" +
-            "UNION SELECT distance FROM Round WHERE distance LIKE ('% ' || :unit)")
+    @Query("SELECT distance FROM `SightMark` WHERE `distance` LIKE ('% ' || :unit)" +
+            "UNION SELECT distance FROM `RoundTemplate` WHERE `distance` LIKE ('% ' || :unit)" +
+            "UNION SELECT distance FROM `Round` WHERE `distance` LIKE ('% ' || :unit)")
     fun getAll(unit: Dimension.Unit): List<Dimension>
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
index 14ae3f354..5a62b92d6 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
@@ -23,8 +23,8 @@ interface ImageDAO {
     /**
      * Returns a list of file names, which are implicitly placed in the ../files/ folder of the app.
      */
-    @Query("SELECT fileName FROM BowImage " +
-            "UNION SELECT fileName FROM EndImage " +
-            "UNION SELECT fileName FROM ArrowImage")
+    @Query("SELECT fileName FROM `BowImage` " +
+            "UNION SELECT fileName FROM `EndImage` " +
+            "UNION SELECT fileName FROM `ArrowImage`")
     fun loadAllFileNames(): List<String>
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
index de4633704..d79f79cab 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
@@ -21,13 +21,13 @@ import de.dreier.mytargets.shared.models.db.Round
 
 @Dao
 abstract class RoundDAO {
-    @Query("SELECT * FROM Round WHERE id in (:roundIds)")
+    @Query("SELECT * FROM `Round` WHERE `id` in (:roundIds)")
     abstract fun loadRounds(roundIds: LongArray): List<Round>
 
-    @Query("SELECT * FROM Round WHERE trainingId = :id ORDER BY `index`")
+    @Query("SELECT * FROM `Round` WHERE `trainingId` = :id ORDER BY `index`")
     abstract fun loadRounds(id: Long): List<Round>
 
-    @Query("SELECT * FROM Round WHERE id = :id")
+    @Query("SELECT * FROM `Round` WHERE `id` = :id")
     abstract fun loadRound(id: Long): Round
 
     @Query("SELECT * FROM `Round` WHERE `id` = :id")
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
index 30b06090e..9a80d55c9 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/SignatureDAO.kt
@@ -21,10 +21,10 @@ import de.dreier.mytargets.shared.models.db.Signature
 @Dao
 interface SignatureDAO {
 
-    @Query("SELECT * FROM Signature WHERE id = :id")
+    @Query("SELECT * FROM `Signature` WHERE `id` = :id")
     fun loadSignature(id: Long): Signature
 
-    @Query("SELECT * FROM Signature WHERE id = :id")
+    @Query("SELECT * FROM `Signature` WHERE `id` = :id")
     fun loadSignatureOrNull(id: Long): Signature?
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
index 3946df372..64b9f5b23 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
@@ -22,22 +22,22 @@ import de.dreier.mytargets.shared.models.db.StandardRound
 
 @Dao
 abstract class StandardRoundDAO {
-    @Query("SELECT * FROM StandardRound")
+    @Query("SELECT * FROM `StandardRound`")
     abstract fun loadStandardRounds(): List<StandardRound>
 
-    @Query("SELECT * FROM StandardRound WHERE id = :id")
+    @Query("SELECT * FROM `StandardRound` WHERE `id` = :id")
     abstract fun loadStandardRound(id: Long): StandardRound
 
     @Transaction
     open fun loadAugmentedStandardRound(id: Long): AugmentedStandardRound = AugmentedStandardRound(loadStandardRound(id), loadRoundTemplates(id).toMutableList())
 
-    @Query("SELECT * FROM StandardRound WHERE id = :id")
+    @Query("SELECT * FROM `StandardRound` WHERE `id` = :id")
     abstract fun loadStandardRoundOrNull(id: Long): StandardRound?
 
-    @Query("SELECT * FROM StandardRound WHERE name LIKE :query AND club != 512")
+    @Query("SELECT * FROM `StandardRound` WHERE `name` LIKE :query AND `club` != 512")
     abstract fun getAllSearch(query: String): List<StandardRound>
 
-    @Query("SELECT * FROM RoundTemplate WHERE standardRoundId = :id ORDER BY `index`")
+    @Query("SELECT * FROM `RoundTemplate` WHERE `standardRoundId` = :id ORDER BY `index`")
     abstract fun loadRoundTemplates(id: Long): List<RoundTemplate>
 
     @Insert
@@ -46,7 +46,7 @@ abstract class StandardRoundDAO {
     @Insert
     abstract fun insertRoundTemplate(round: RoundTemplate): Long
 
-    @Query("DELETE FROM RoundTemplate WHERE standardRoundId = (:id)")
+    @Query("DELETE FROM `RoundTemplate` WHERE `standardRoundId` = (:id)")
     abstract fun deleteRoundTemplates(id: Long)
 
     @Transaction
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
index a21ffc8f4..922d9b660 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
@@ -21,10 +21,10 @@ import de.dreier.mytargets.shared.models.db.Training
 
 @Dao
 abstract class TrainingDAO {
-    @Query("SELECT * FROM Training")
+    @Query("SELECT * FROM `Training`")
     abstract fun loadTrainings(): List<Training>
 
-    @Query("SELECT * FROM Training WHERE id = :id")
+    @Query("SELECT * FROM `Training` WHERE `id` = :id")
     abstract fun loadTraining(id: Long): Training
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)

From e52e88ba2840991d410bcde22c771310fbe1a624 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Sun, 29 Apr 2018 17:41:26 +0200
Subject: [PATCH 078/102] Updated dependencies

---
 build.gradle        |  8 ++++----
 dependencies.gradle | 26 +++++++++++++-------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index 98c46ff64..518b6ea03 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,8 +14,8 @@
  */
 
 buildscript {
-    ext.androidPluginVersion = '3.1.0-rc03'
-    ext.kotlinVersion = '1.2.31'
+    ext.androidPluginVersion = '3.1.2'
+    ext.kotlinVersion = '1.2.41'
     repositories {
         jcenter()
         google()
@@ -27,10 +27,10 @@ buildscript {
         classpath "com.android.tools.build:gradle:$androidPluginVersion"
         classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
-        classpath 'com.google.gms:google-services:3.2.0'
+        classpath 'com.google.gms:google-services:3.2.1'
         classpath 'com.google.firebase:firebase-plugins:1.1.5'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath 'io.fabric.tools:gradle:1.25.1'
+        classpath 'io.fabric.tools:gradle:1.25.3'
     }
 }
 
diff --git a/dependencies.gradle b/dependencies.gradle
index 54e60bf77..d98bbeebd 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -17,17 +17,17 @@ ext {
     compileSdkVersionCode = 27
 
     libraryVersion = [
-            aboutPage                 : '1.2.3',
+            aboutPage                 : '1.2.4',
             androidLanguages          : 'v1.0.1',
-            androidState              : '1.2.0',
-            architectureComponents    : '1.1.0',
+            androidState              : '1.2.1',
+            architectureComponents    : '1.1.1',
             architectureComponentsRoom: '1.0.0',
-            crashlytics               : '2.9.1',
+            crashlytics               : '2.9.2',
             dbFlow                    : '4.2.4',
             dexmaker                  : '2.2.0',
             discreteSeekbar           : '1.0.1',
             easyImage                 : '2.0.4',
-            espresso                  : '3.0.1',
+            espresso                  : '3.0.2',
             findbugs                  : '3.0.2',
             gson                      : '2.8.2',
             homage                    : '0.2.0',
@@ -36,23 +36,23 @@ ext {
             materialDialogs           : '0.9.6.0',
             materialIntroScreen       : '0.0.5',
             mpAndroidChart            : 'v3.0.3',
-            mockito                   : '2.16.0',
+            mockito                   : '2.18.3',
             multidex                  : '1.0.3',
             okhttp                    : '3.10.0',
-            permissionsdispatcher     : '3.1.0',
+            permissionsdispatcher     : '3.2.0',
             photoView                 : '2.1.3',
             picasso                   : '2.5.2',
-            playService               : '11.8.0',
-            screengrab                : '1.1.0',
+            playService               : '15.0.0',
+            screengrab                : '1.2.0',
             retrofit                  : '2.4.0',
             roundedImageView          : '2.3.0',
             signaturePad              : '1.2.1',
             support                   : '27.1.0',
             supportWearable           : '2.2.0',
-            testSupport               : '1.0.1',
-            threeTenABP               : '1.0.5',
-            timber                    : '4.6.1',
-            truth                     : '0.39',
+            testSupport               : '1.0.2',
+            threeTenABP               : '1.1.0',
+            timber                    : '4.7.0',
+            truth                     : '0.40',
             uiAutomator               : '2.1.3',
             versionInfoDialog         : '0.1.0'
     ]

From e6445ead01f81dfc8a62e554119333cd5dee7bfc Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Sun, 29 Apr 2018 17:41:40 +0200
Subject: [PATCH 079/102] Removed deprecated annotation

---
 .../mytargets/views/speeddial/FabSpeedDial.kt |  7 ++--
 .../views/speeddial/FabSpeedDialBehaviour.kt  | 36 ++++++++++---------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDial.kt b/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDial.kt
index 47f10e6e7..907729c53 100755
--- a/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDial.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDial.kt
@@ -56,8 +56,7 @@ typealias MenuListener = (menuItem: MenuItem) -> Boolean
  * Adopted from https://github.com/yavski/fab-speed-dial
  */
 @SuppressLint("RestrictedApi")
-@CoordinatorLayout.DefaultBehavior(FabSpeedDialBehaviour::class)
-class FabSpeedDial : LinearLayout, View.OnClickListener {
+class FabSpeedDial : LinearLayout, View.OnClickListener, CoordinatorLayout.AttachedBehavior {
 
     private var menuListener: MenuListener? = null
     private var closeListener: CloseListener? = null
@@ -120,6 +119,10 @@ class FabSpeedDial : LinearLayout, View.OnClickListener {
         cardViewMenuItemMap = HashMap(menuItemCount)
     }
 
+    override fun getBehavior(): CoordinatorLayout.Behavior<*> {
+        return FabSpeedDialBehaviour
+    }
+
     private fun resolveCompulsoryAttributes(typedArray: TypedArray) {
         if (typedArray.hasValue(R.styleable.FabSpeedDial_fabMenu)) {
             menuId = typedArray.getResourceId(R.styleable.FabSpeedDial_fabMenu, 0)
diff --git a/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt b/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt
index 3a48c658a..47e6fb82a 100755
--- a/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt
@@ -15,40 +15,46 @@
 
 package de.dreier.mytargets.views.speeddial
 
-import android.content.Context
+import android.support.design.animation.AnimationUtils.FAST_OUT_SLOW_IN_INTERPOLATOR
 import android.support.design.widget.CoordinatorLayout
 import android.support.design.widget.Snackbar
-import android.support.v4.view.animation.FastOutSlowInInterpolator
-import android.util.AttributeSet
 import android.view.View
 import android.view.ViewPropertyAnimator
 
-class FabSpeedDialBehaviour : CoordinatorLayout.Behavior<FabSpeedDial> {
+object FabSpeedDialBehaviour : CoordinatorLayout.Behavior<FabSpeedDial>() {
 
     private var fabTranslationYAnimator: ViewPropertyAnimator? = null
     private var fabTranslationY: Float = 0.toFloat()
 
-    constructor()
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
-
-    override fun layoutDependsOn(parent: CoordinatorLayout?, child: FabSpeedDial?, dependency: View?): Boolean {
+    override fun layoutDependsOn(
+        parent: CoordinatorLayout,
+        child: FabSpeedDial,
+        dependency: View
+    ): Boolean {
         return dependency is Snackbar.SnackbarLayout
     }
 
-    override fun onDependentViewRemoved(parent: CoordinatorLayout?, fab: FabSpeedDial, dependency: View?) {
-        super.onDependentViewRemoved(parent, fab, dependency)
+    override fun onDependentViewRemoved(
+        parent: CoordinatorLayout,
+        child: FabSpeedDial,
+        dependency: View
+    ) {
+        super.onDependentViewRemoved(parent, child, dependency)
 
         // Make sure that any current animation is cancelled
         if (fabTranslationYAnimator != null) {
             fabTranslationYAnimator!!.cancel()
         }
 
-        fab.translationY = 0f
+        child.translationY = 0f
         fabTranslationY = 0f
     }
 
-    override fun onDependentViewChanged(parent: CoordinatorLayout, child: FabSpeedDial, dependency: View?): Boolean {
+    override fun onDependentViewChanged(
+        parent: CoordinatorLayout,
+        child: FabSpeedDial,
+        dependency: View
+    ): Boolean {
         if (dependency is Snackbar.SnackbarLayout) {
             updateFabTranslationForSnackbar(parent, child)
         }
@@ -95,8 +101,4 @@ class FabSpeedDialBehaviour : CoordinatorLayout.Behavior<FabSpeedDial> {
         }
         return minOffset
     }
-
-    companion object {
-        private val FAST_OUT_SLOW_IN_INTERPOLATOR = FastOutSlowInInterpolator()
-    }
 }

From 93090070fdee2c0938ed7d85e4792fdb6c054b46 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Mon, 30 Apr 2018 10:00:07 +0200
Subject: [PATCH 080/102] Fixed transition constant

---
 .../dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt b/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt
index 47e6fb82a..2121f1075 100755
--- a/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt
@@ -15,14 +15,16 @@
 
 package de.dreier.mytargets.views.speeddial
 
-import android.support.design.animation.AnimationUtils.FAST_OUT_SLOW_IN_INTERPOLATOR
 import android.support.design.widget.CoordinatorLayout
 import android.support.design.widget.Snackbar
+import android.support.v4.view.animation.FastOutSlowInInterpolator
 import android.view.View
 import android.view.ViewPropertyAnimator
 
 object FabSpeedDialBehaviour : CoordinatorLayout.Behavior<FabSpeedDial>() {
 
+    private val FAST_OUT_SLOW_IN_INTERPOLATOR = FastOutSlowInInterpolator()
+
     private var fabTranslationYAnimator: ViewPropertyAnimator? = null
     private var fabTranslationY: Float = 0.toFloat()
 

From 155d10223f98b6fcfc9eac65797e79e8ea6d01f7 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Mon, 21 May 2018 18:03:40 +0200
Subject: [PATCH 081/102] Added core ktx

---
 app/build.gradle                              |  1 +
 .../features/scoreboard/ScoreboardFragment.kt |  4 +-
 .../settings/SharedPreferencesUtils.kt        | 23 ++---
 .../features/settings/about/AboutFragment.kt  |  3 +-
 .../backup/synchronization/SyncUtils.kt       |  4 +-
 .../statistics/DispersionPatternActivity.kt   |  3 +-
 .../training/environment/Connectivity.kt      |  4 +-
 .../features/training/environment/Locator.kt  |  3 +-
 .../features/training/input/TargetView.kt     | 84 ++++++++++++-------
 .../java/de/dreier/mytargets/utils/Utils.kt   |  6 +-
 dependencies.gradle                           |  2 +
 shared/build.gradle                           |  1 +
 .../shared/base/fragment/TimerFragmentBase.kt |  3 +-
 .../mytargets/shared/utils/EndRenderer.kt     |  7 +-
 wearable/build.gradle                         |  2 +
 .../dreier/mytargets/ApplicationInstance.kt   |  4 +-
 .../java/de/dreier/mytargets/InputActivity.kt |  6 +-
 .../dreier/mytargets/WearWearableListener.kt  |  3 +-
 18 files changed, 95 insertions(+), 68 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7d90360cc..d52caf6d5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -126,6 +126,7 @@ dependencies {
     implementation dependencies.supportExifInterface
     implementation dependencies.recyclerView
     implementation dependencies.cardView
+    implementation dependencies.androidxCoreKtx
 
     implementation dependencies.playServicesDrive
     implementation dependencies.firebaseCore
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
index ae5e4dbb1..0f4e64659 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
@@ -36,6 +36,7 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.LinearLayout
+import androidx.content.systemService
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.db.EndRepository
@@ -249,8 +250,7 @@ class ScoreboardFragment : FragmentBase() {
         val pda = CustomPrintDocumentAdapter(ViewToPdfWriter(content), fileName)
 
         // Create a print job with name and adapter instance
-        val printManager = context!!
-                .getSystemService(Context.PRINT_SERVICE) as PrintManager
+        val printManager = context!!.systemService<PrintManager>()
         printManager.print(jobName, pda, PrintAttributes.Builder().build())
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/SharedPreferencesUtils.kt b/app/src/main/java/de/dreier/mytargets/features/settings/SharedPreferencesUtils.kt
index 82d5751f9..7cf06c20b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/SharedPreferencesUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/SharedPreferencesUtils.kt
@@ -15,26 +15,21 @@
 package de.dreier.mytargets.features.settings
 
 import android.content.SharedPreferences
-
-inline fun SharedPreferences.edit(operation: (SharedPreferences.Editor) -> Unit) {
-    val editor = this.edit()
-    operation(editor)
-    editor.apply()
-}
+import androidx.content.edit
 
 operator fun SharedPreferences.set(key: String, value: Any?) {
     when (value) {
-        null -> edit { it.remove(key) }
-        is String? -> edit { it.putString(key, value) }
-        is Int -> edit { it.putInt(key, value) }
-        is Boolean -> edit { it.putBoolean(key, value) }
-        is Float -> edit { it.putFloat(key, value) }
-        is Long -> edit { it.putLong(key, value) }
+        null -> edit { remove(key) }
+        is String? -> edit { putString(key, value) }
+        is Int -> edit { putInt(key, value) }
+        is Boolean -> edit { putBoolean(key, value) }
+        is Float -> edit { putFloat(key, value) }
+        is Long -> edit { putLong(key, value) }
         else -> throw UnsupportedOperationException("Not yet implemented")
     }
 }
 
-operator inline fun <reified T : Any> SharedPreferences.get(key: String): T? {
+inline operator fun <reified T : Any> SharedPreferences.get(key: String): T? {
     if (!contains(key)) {
         return null
     }
@@ -57,7 +52,7 @@ operator inline fun <reified T : Any> SharedPreferences.get(key: String): T? {
     }
 }
 
-operator inline fun <reified T : Any> SharedPreferences.get(key: String, defaultValue: T): T {
+inline operator fun <reified T : Any> SharedPreferences.get(key: String, defaultValue: T): T {
     if (!contains(key)) {
         return defaultValue
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt
index aacb41db2..1cbe5261e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt
@@ -23,6 +23,7 @@ import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.net.toUri
 import de.dreier.mytargets.BuildConfig
 import de.dreier.mytargets.R
 import mehdi.sakout.aboutpage.AboutPage
@@ -99,7 +100,7 @@ class AboutFragment : Fragment() {
             val intent = Intent()
             intent.action = Intent.ACTION_VIEW
             intent.addCategory(Intent.CATEGORY_BROWSABLE)
-            intent.data = Uri.parse(url)
+            intent.data = url.toUri()
             setIntent(intent)
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt
index a89f9e546..d15512c45 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt
@@ -19,6 +19,7 @@ import android.accounts.AccountManager
 import android.content.ContentResolver
 import android.content.Context
 import android.os.Bundle
+import androidx.content.systemService
 import de.dreier.mytargets.BuildConfig
 import de.dreier.mytargets.features.settings.SettingsManager
 
@@ -54,8 +55,7 @@ object SyncUtils {
     fun createSyncAccount(context: Context) {
         // Create account, if it's missing. (Either first run, or user has deleted account.)
         val account = GenericAccountService.account
-        val accountManager = context
-                .getSystemService(Context.ACCOUNT_SERVICE) as AccountManager
+        val accountManager = context.systemService<AccountManager>()
         if (accountManager.addAccountExplicitly(account, null, null)) {
             // Inform the system that this account supports sync
             ContentResolver.setIsSyncable(account, CONTENT_AUTHORITY, 1)
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
index 16992233f..fe11ae143 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
@@ -26,6 +26,7 @@ import android.support.annotation.RequiresApi
 import android.support.design.widget.Snackbar
 import android.view.Menu
 import android.view.MenuItem
+import androidx.content.systemService
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.activities.ChildActivityBase
 import de.dreier.mytargets.databinding.ActivityArrowRankingDetailsBinding
@@ -115,7 +116,7 @@ class DispersionPatternActivity : ChildActivityBase() {
         val pda = CustomPrintDocumentAdapter(DrawableToPdfWriter(target), fileName)
 
         // Create a print job with name and adapter instance
-        val printManager = getSystemService(Context.PRINT_SERVICE) as PrintManager
+        val printManager = systemService<PrintManager>()
         val jobName = "Dispersion Pattern"
         printManager.print(jobName, pda, PrintAttributes.Builder().build())
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt
index 50637b752..0579dd4ac 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt
@@ -18,6 +18,7 @@ package de.dreier.mytargets.features.training.environment
 import android.content.Context
 import android.net.ConnectivityManager
 import android.net.NetworkInfo
+import androidx.content.systemService
 
 internal object Connectivity {
 
@@ -25,8 +26,7 @@ internal object Connectivity {
      * Get the network info
      */
     private fun getNetworkInfo(context: Context): NetworkInfo? {
-        val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-        return cm.activeNetworkInfo
+        return context.systemService<ConnectivityManager>().activeNetworkInfo
     }
 
     /**
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt
index 01c892dd3..cd8ec5d87 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt
@@ -24,6 +24,7 @@ import android.location.LocationListener
 import android.location.LocationManager
 import android.os.Bundle
 import android.support.annotation.RequiresPermission
+import androidx.content.systemService
 import timber.log.Timber
 
 /**
@@ -32,7 +33,7 @@ import timber.log.Timber
  * @author emil http://stackoverflow.com/users/220710/emil
  */
 class Locator(private val context: Context) : LocationListener {
-    private val locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
+    private val locationManager = context.systemService<LocationManager>()
     private var method: Locator.Method? = null
     private var callback: Locator.Listener? = null
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.kt
index d3e586927..366f4a51d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.kt
@@ -29,6 +29,7 @@ import android.view.View
 import android.view.animation.AccelerateDecelerateInterpolator
 import android.widget.ArrayAdapter
 import android.widget.GridView
+import androidx.core.graphics.toRect
 import de.dreier.mytargets.R
 import de.dreier.mytargets.features.settings.SettingsManager
 import de.dreier.mytargets.features.training.input.TargetView.EKeyboardType.LEFT
@@ -103,10 +104,12 @@ class TargetView : TargetViewBase {
             if (mode !== inputMethod) {
                 super.inputMethod = mode
                 targetDrawable!!.drawArrowsEnabled(inputMethod === PLOTTING)
-                targetDrawable!!.setAggregationStrategy(if (inputMethod === PLOTTING)
-                    aggregationStrategy
-                else
-                    EAggregationStrategy.NONE)
+                targetDrawable!!.setAggregationStrategy(
+                    if (inputMethod === PLOTTING)
+                        aggregationStrategy
+                    else
+                        EAggregationStrategy.NONE
+                )
             }
         }
 
@@ -133,7 +136,11 @@ class TargetView : TargetViewBase {
         init()
     }
 
-    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) {
+    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(
+        context,
+        attrs,
+        defStyle
+    ) {
         init()
     }
 
@@ -213,14 +220,16 @@ class TargetView : TargetViewBase {
             if (currentShotIndex == EndRenderer.NO_SELECTION || inputMethod === KEYBOARD) {
                 targetDrawable!!.spotMatrix = Matrix()
             } else {
-                targetDrawable!!.spotMatrix = spotMatrices!![currentShotIndex % target.model.faceCount]
+                targetDrawable!!.spotMatrix =
+                        spotMatrices!![currentShotIndex % target.model.faceCount]
             }
         }
         targetDrawable!!.draw(canvas)
     }
 
     override fun notifyTargetShotsChanged() {
-        val displayedShots = shots.filter { it.scoringRing != Shot.NOTHING_SELECTED && it.index != currentShotIndex }
+        val displayedShots =
+            shots.filter { it.scoringRing != Shot.NOTHING_SELECTED && it.index != currentShotIndex }
         targetDrawable!!.replaceShotsWith(displayedShots)
         super.notifyTargetShotsChanged()
         updateListener?.onEndUpdated(shots)
@@ -277,7 +286,7 @@ class TargetView : TargetViewBase {
         targetRectExt.inset(30 * density, 30 * density)
         fullExtendedMatrix = Matrix()
         fullExtendedMatrix!!
-                .setRectToRect(TargetDrawable.SRC_RECT, targetRectExt, Matrix.ScaleToFit.CENTER)
+            .setRectToRect(TargetDrawable.SRC_RECT, targetRectExt, Matrix.ScaleToFit.CENTER)
         fullExtendedMatrixInverse = Matrix()
         fullExtendedMatrix!!.invert(fullExtendedMatrixInverse)
 
@@ -320,7 +329,8 @@ class TargetView : TargetViewBase {
     override fun updateShotToPosition(shot: Shot, x: Float, y: Float): Boolean {
         if (inputMethod === KEYBOARD) {
             if (keyboardRect!!.contains(x, y)) {
-                var index = ((y - keyboardRect!!.top) * selectableZones.size / keyboardRect!!.height()).toInt()
+                var index =
+                    ((y - keyboardRect!!.top) * selectableZones.size / keyboardRect!!.height()).toInt()
                 index = Math.min(Math.max(0, index), selectableZones.size - 1)
                 shot.scoringRing = selectableZones[index].index
             } else {
@@ -366,10 +376,18 @@ class TargetView : TargetViewBase {
         }
         animations.add(inputAnimator)
 
-        animations.add(ObjectAnimator.ofObject(this, ANIMATED_FULL_TRANSFORM_PROPERTY,
-                MatrixEvaluator(), initFullMatrix, fullMatrix))
-        animations.add(ObjectAnimator.ofObject(this, ANIMATED_SPOT_TRANSFORM_PROPERTY,
-                MatrixEvaluator(), endMatrix))
+        animations.add(
+            ObjectAnimator.ofObject(
+                this, ANIMATED_FULL_TRANSFORM_PROPERTY,
+                MatrixEvaluator(), initFullMatrix, fullMatrix
+            )
+        )
+        animations.add(
+            ObjectAnimator.ofObject(
+                this, ANIMATED_SPOT_TRANSFORM_PROPERTY,
+                MatrixEvaluator(), endMatrix
+            )
+        )
         super.collectAnimations(animations)
     }
 
@@ -393,10 +411,10 @@ class TargetView : TargetViewBase {
 
             // Set grid view to alertDialog
             val dialog = AlertDialog.Builder(context)
-                    .setView(gridView)
-                    .setCancelable(false)
-                    .setTitle(R.string.arrow_numbers)
-                    .create()
+                .setView(gridView)
+                .setCancelable(false)
+                .setTitle(R.string.arrow_numbers)
+                .create()
 
             val numbers = (1..maxArrowNumber).map { it.toString() }
             gridView.adapter = ArrayAdapter(context, android.R.layout.simple_list_item_1, numbers)
@@ -434,26 +452,28 @@ class TargetView : TargetViewBase {
 
             // For yellow and white background use black font color
             textPaint.color = zone.zone.textColor
-            canvas.drawText(zone.text, rect.centerX().toFloat(), rect.centerY() + 10 * density,
-                    textPaint)
+            canvas.drawText(
+                zone.text, rect.centerX().toFloat(), rect.centerY() + 10 * density,
+                textPaint
+            )
         }
     }
 
     override fun getSelectableZonePosition(i: Int): Rect {
-        val rect = Rect()
+        val rect = RectF()
         val singleZoneHeight = keyboardRect!!.height() / selectableZones.size
-        rect.top = (singleZoneHeight * i + density + keyboardRect!!.top).toInt()
-        rect.bottom = (singleZoneHeight * (i + 1) - density + keyboardRect!!.top).toInt()
-        rect.left = keyboardRect!!.left.toInt()
-        rect.right = keyboardRect!!.right.toInt()
+        rect.top = (singleZoneHeight * i + density + keyboardRect!!.top)
+        rect.bottom = (singleZoneHeight * (i + 1) - density + keyboardRect!!.top)
+        rect.left = keyboardRect!!.left
+        rect.right = keyboardRect!!.right
         val visibilityXOffset = (KEYBOARD_TOTAL_WIDTH_DP.toFloat() * (1 - keyboardVisibility) *
-                density).toInt()
+                density)
         if (keyboardType == LEFT) {
-            rect.offset(-visibilityXOffset, 0)
+            rect.offset(-visibilityXOffset, 0f)
         } else {
-            rect.offset(visibilityXOffset, 0)
+            rect.offset(visibilityXOffset, 0f)
         }
-        return rect
+        return rect.toRect()
     }
 
     override fun onTouch(view: View, motionEvent: MotionEvent): Boolean {
@@ -474,7 +494,7 @@ class TargetView : TargetViewBase {
         this.targetZoomFactor = SettingsManager.inputTargetZoom
         this.keyboardType = SettingsManager.inputKeyboardType
         targetDrawable!!
-                .setArrowDiameter(arrowDiameter!!, SettingsManager.inputArrowDiameterScale)
+            .setArrowDiameter(arrowDiameter!!, SettingsManager.inputArrowDiameterScale)
     }
 
     fun setTransparentShots(shotStream: List<Shot>) {
@@ -495,7 +515,8 @@ class TargetView : TargetViewBase {
          * This property is passed to ObjectAnimator when animating the spot matrix of TargetView
          */
         private val ANIMATED_SPOT_TRANSFORM_PROPERTY = object : Property<TargetView, Matrix>(
-                Matrix::class.java, "animatedSpotTransform") {
+            Matrix::class.java, "animatedSpotTransform"
+        ) {
 
             override fun set(targetView: TargetView, matrix: Matrix) {
                 targetView.targetDrawable!!.spotMatrix = matrix
@@ -511,7 +532,8 @@ class TargetView : TargetViewBase {
          * This property is passed to ObjectAnimator when animating the full matrix of TargetView
          */
         private val ANIMATED_FULL_TRANSFORM_PROPERTY = object : Property<TargetView, Matrix>(
-                Matrix::class.java, "animatedFullTransform") {
+            Matrix::class.java, "animatedFullTransform"
+        ) {
 
             override fun set(targetView: TargetView, matrix: Matrix) {
                 targetView.targetDrawable!!.setMatrix(matrix)
diff --git a/app/src/main/java/de/dreier/mytargets/utils/Utils.kt b/app/src/main/java/de/dreier/mytargets/utils/Utils.kt
index 90abc3e7a..9199f2ec6 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/Utils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/Utils.kt
@@ -31,6 +31,8 @@ import android.text.Html
 import android.text.Spanned
 import android.view.View
 import android.view.WindowManager
+import androidx.content.systemService
+import androidx.core.content.systemService
 import de.dreier.mytargets.features.main.MainActivity
 import de.dreier.mytargets.features.training.overview.Header
 import de.dreier.mytargets.utils.transitions.FabTransform
@@ -69,8 +71,8 @@ object Utils {
         val mPendingIntentId = 223344
         val mPendingIntent = PendingIntent
                 .getActivity(context, mPendingIntentId, intent, PendingIntent.FLAG_CANCEL_CURRENT)
-        val mgr = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-        mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, mPendingIntent)
+        context.systemService<AlarmManager>()
+            .set(AlarmManager.RTC, System.currentTimeMillis() + 100, mPendingIntent)
 
         // Kill the application
         Process.killProcess(Process.myPid())
diff --git a/dependencies.gradle b/dependencies.gradle
index d98bbeebd..9c89732eb 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -76,6 +76,8 @@ ext {
             supportWearable               : "com.google.android.support:wearable:$libraryVersion.supportWearable",
             wearable                      : "com.google.android.wearable:wearable:$libraryVersion.supportWearable",
 
+            androidxCoreKtx               : 'androidx.core:core-ktx:0.3',
+
             archLifecycleExtensions       : "android.arch.lifecycle:extensions:$libraryVersion.architectureComponents",
             archLifecycleCompiler         : "android.arch.lifecycle:compiler:$libraryVersion.architectureComponents",
             archRoomRuntime               : "android.arch.persistence.room:runtime:$libraryVersion.architectureComponentsRoom",
diff --git a/shared/build.gradle b/shared/build.gradle
index 087289113..526bed1f4 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -55,6 +55,7 @@ dependencies {
     api dependencies.threeTenABP
 
     implementation dependencies.archRoomRuntime
+    implementation dependencies.androidxCoreKtx
 
     implementation dependencies.androidState
     kapt dependencies.androidStateProcessor
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/TimerFragmentBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/TimerFragmentBase.kt
index b3a0343fb..fdfb20b6a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/TimerFragmentBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/base/fragment/TimerFragmentBase.kt
@@ -24,6 +24,7 @@ import android.os.CountDownTimer
 import android.os.Vibrator
 import android.view.View
 import android.view.WindowManager
+import androidx.core.content.systemService
 import de.dreier.mytargets.shared.R
 import de.dreier.mytargets.shared.base.fragment.ETimerState.*
 import de.dreier.mytargets.shared.models.TimerSettings
@@ -144,7 +145,7 @@ abstract class TimerFragmentBase : Fragment(), View.OnClickListener {
             }
             if (settings.vibrate) {
                 val pattern = LongArray(1 + n * 2)
-                val v = activity.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
+                val v = activity.systemService<Vibrator>()
                 pattern[0] = 150
                 for (i in 0 until n) {
                     pattern[i * 2 + 1] = 400
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/EndRenderer.kt b/shared/src/main/java/de/dreier/mytargets/shared/utils/EndRenderer.kt
index 95f895925..24e3e4024 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/EndRenderer.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/EndRenderer.kt
@@ -22,6 +22,7 @@ import android.graphics.*
 import android.os.Parcelable
 import android.view.View
 import android.view.animation.AccelerateDecelerateInterpolator
+import androidx.core.animation.addListener
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.db.Shot
 import kotlinx.android.parcel.IgnoredOnParcel
@@ -74,10 +75,8 @@ class EndRenderer(
                 currentAnimationProgress = valueAnimator.animatedValue as Float
                 parent!!.invalidate()
             }
-            selectionAnimator.addListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator) {
-                    currentAnimationProgress = -1f
-                }
+            selectionAnimator.addListener(onEnd = {
+                currentAnimationProgress = -1f
             })
             return selectionAnimator
         }
diff --git a/wearable/build.gradle b/wearable/build.gradle
index b932cbe44..39f9e3f10 100644
--- a/wearable/build.gradle
+++ b/wearable/build.gradle
@@ -76,10 +76,12 @@ dependencies {
     compileOnly dependencies.wearable
     implementation dependencies.supportCompat
     implementation dependencies.supportWear
+    implementation dependencies.androidxCoreKtx
 
     implementation dependencies.androidState
     kapt dependencies.androidStateProcessor
 
+
     implementation project(':shared')
     implementation dependencies.kotlinStdlibJre7
 }
\ No newline at end of file
diff --git a/wearable/src/main/java/de/dreier/mytargets/ApplicationInstance.kt b/wearable/src/main/java/de/dreier/mytargets/ApplicationInstance.kt
index 745a5d615..8709eef4b 100644
--- a/wearable/src/main/java/de/dreier/mytargets/ApplicationInstance.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/ApplicationInstance.kt
@@ -19,6 +19,7 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import android.os.Build
+import androidx.core.content.systemService
 import de.dreier.mytargets.shared.SharedApplicationInstance
 import de.dreier.mytargets.utils.WearWearableClient
 
@@ -41,9 +42,8 @@ class ApplicationInstance : SharedApplicationInstance() {
         if (Build.VERSION.SDK_INT < 26) {
             return
         }
-        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
         val channel = NotificationChannel(DEFAULT_CHANNEL_ID, getString(R.string.notification_channel_default), NotificationManager.IMPORTANCE_DEFAULT)
-        notificationManager.createNotificationChannel(channel)
+        context.systemService<NotificationManager>().createNotificationChannel(channel)
     }
 
     override fun onTerminate() {
diff --git a/wearable/src/main/java/de/dreier/mytargets/InputActivity.kt b/wearable/src/main/java/de/dreier/mytargets/InputActivity.kt
index e4e6228d2..78c5d9d3b 100644
--- a/wearable/src/main/java/de/dreier/mytargets/InputActivity.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/InputActivity.kt
@@ -15,14 +15,13 @@
 
 package de.dreier.mytargets
 
-import android.content.Context
 import android.content.Intent
 import android.databinding.DataBindingUtil
 import android.os.Bundle
-import android.os.Vibrator
 import android.support.wearable.activity.ConfirmationActivity
 import android.support.wearable.activity.WearableActivity
 import android.view.View
+import androidx.core.content.systemService
 import de.dreier.mytargets.databinding.ActivityInputBinding
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
@@ -97,8 +96,7 @@ class InputActivity : WearableActivity(), TargetViewBase.OnEndFinishedListener {
             intent.putExtra(ConfirmationActivity.EXTRA_MESSAGE, this@InputActivity
                     .getString(R.string.saved))
             this@InputActivity.startActivity(intent)
-            val v = this@InputActivity.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
-            VibratorCompat.vibrate(v, 200)
+            VibratorCompat.vibrate(systemService(), 200)
             this@InputActivity.finish()
             val end = End(index = 0, roundId = round.round.id)
             val ae = AugmentedEnd(end, shotList.toMutableList(), mutableListOf())
diff --git a/wearable/src/main/java/de/dreier/mytargets/WearWearableListener.kt b/wearable/src/main/java/de/dreier/mytargets/WearWearableListener.kt
index 380bda0eb..5ddf18bcd 100644
--- a/wearable/src/main/java/de/dreier/mytargets/WearWearableListener.kt
+++ b/wearable/src/main/java/de/dreier/mytargets/WearWearableListener.kt
@@ -21,6 +21,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.BitmapFactory
 import android.support.v4.app.NotificationCompat
+import androidx.core.content.systemService
 import com.google.android.gms.wearable.MessageEvent
 import com.google.android.gms.wearable.WearableListenerService
 import de.dreier.mytargets.shared.models.TimerSettings
@@ -74,7 +75,7 @@ class WearWearableListener : WearableListenerService() {
                 .extend(NotificationCompat.WearableExtender().setBackground(image))
 
         // Build the notification and show it
-        val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        val notificationManager = systemService<NotificationManager>()
         notificationManager.cancel(NOTIFICATION_ID)
         notificationManager.notify(NOTIFICATION_ID, notificationBuilder.build())
     }

From e29b30898261e681ba53f3b3d4ed00ef90236204 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Sun, 13 May 2018 19:15:55 +0200
Subject: [PATCH 082/102] Refactored TrainingFragment to MVVM

---
 .../base/adapters/ListAdapterBase.kt          |   2 +-
 .../base/adapters/SimpleListAdapterBase.kt    |   5 +-
 .../adapters/header/ExpandableListAdapter.kt  |   2 +-
 .../adapters/header/HeaderListAdapterBase.kt  |   2 +-
 .../mytargets/base/db/RoundRepository.kt      |  18 +-
 .../dreier/mytargets/base/db/dao/RoundDAO.kt  |   4 +
 .../mytargets/base/db/dao/TrainingDAO.kt      |   7 +
 .../base/navigation/NavigationController.kt   |  17 +-
 .../base/viewmodel/ViewModelFactory.kt        |   2 +
 .../mytargets/features/bows/BowAdapter.kt     |   4 +-
 .../features/scoreboard/ScoreboardFragment.kt |   4 +-
 .../layout/DefaultScoreboardLayout.kt         |   3 +-
 .../backup/provider/GoogleDriveBackup.kt      |   4 +-
 .../features/statistics/StatisticsActivity.kt | 118 +++++++------
 ...mlInfoBuilder.kt => SpannedInfoBuilder.kt} |  37 ++--
 .../training/details/TrainingFragment.kt      | 164 ++++++++----------
 .../{HtmlUtils.kt => TrainingInfoUtils.kt}    |  16 +-
 .../training/details/TrainingViewModel.kt     |  79 +++++++++
 .../features/training/input/InputActivity.kt  |   5 +-
 .../training/overview/TrainingsFragment.kt    |   4 +-
 .../dreier/mytargets/utils/LiveDataUtil2.kt   |  91 ++++++++++
 .../mytargets/utils/MobileWearableListener.kt |   3 +-
 22 files changed, 390 insertions(+), 201 deletions(-)
 rename app/src/main/java/de/dreier/mytargets/features/training/details/{HtmlInfoBuilder.kt => SpannedInfoBuilder.kt} (51%)
 rename app/src/main/java/de/dreier/mytargets/features/training/details/{HtmlUtils.kt => TrainingInfoUtils.kt} (89%)
 create mode 100644 app/src/main/java/de/dreier/mytargets/features/training/details/TrainingViewModel.kt
 create mode 100644 app/src/main/java/de/dreier/mytargets/utils/LiveDataUtil2.kt

diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/ListAdapterBase.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/ListAdapterBase.kt
index 6f242d8b7..1f868805f 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/ListAdapterBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/ListAdapterBase.kt
@@ -28,5 +28,5 @@ abstract class ListAdapterBase<S : RecyclerView.ViewHolder, T> : RecyclerView.Ad
 
     abstract fun getItemPosition(item: T): Int
 
-    abstract fun setList(list: MutableList<T>)
+    abstract fun setList(list: List<T>)
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/SimpleListAdapterBase.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/SimpleListAdapterBase.kt
index 999237ff0..a6e0f2db5 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/SimpleListAdapterBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/SimpleListAdapterBase.kt
@@ -55,9 +55,8 @@ abstract class SimpleListAdapterBase<T>(
         viewHolder.internalBindItem(list[position])
     }
 
-    override fun setList(list: MutableList<T>) {
-        list.sortWith(comparator)
-        this.list = list
+    override fun setList(list: List<T>) {
+        this.list = list.sortedWith(comparator).toMutableList()
         notifyDataSetChanged()
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt
index 2bbe2d968..7b2562c39 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt
@@ -87,7 +87,7 @@ abstract class ExpandableListAdapter<P : IIdProvider, C : IIdProvider>(
         header.expanded = !header.expanded
     }
 
-    override fun setList(list: MutableList<C>) {
+    override fun setList(list: List<C>) {
         val oldExpanded = expandedIds
         fillChildMap(list)
         expandedIds = oldExpanded
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt
index 337568955..bdd0bc1f4 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt
@@ -125,7 +125,7 @@ abstract class HeaderListAdapterBase<P : IIdProvider, C : IIdProvider, H : Heade
         }
     }
 
-    override fun setList(list: MutableList<C>) {
+    override fun setList(list: List<C>) {
         fillChildMap(list)
         notifyDataSetChanged()
     }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/RoundRepository.kt b/app/src/main/java/de/dreier/mytargets/base/db/RoundRepository.kt
index 399ab5907..4e23af3ba 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/RoundRepository.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/RoundRepository.kt
@@ -15,22 +15,22 @@
 
 package de.dreier.mytargets.base.db
 
-import android.arch.persistence.room.RoomDatabase
 import de.dreier.mytargets.base.db.dao.EndDAO
 import de.dreier.mytargets.base.db.dao.RoundDAO
 import de.dreier.mytargets.shared.models.augmented.AugmentedRound
 import de.dreier.mytargets.shared.models.db.Round
 
-class RoundRepository(
-        private val database: RoomDatabase,
-        private val roundDAO: RoundDAO,
-        private val endDAO: EndDAO,
-        private val endRepository: EndRepository
-) {
+class RoundRepository(database: AppDatabase) {
 
-    fun loadAugmentedRound(id: Long) = AugmentedRound(roundDAO.loadRound(id), endRepository.loadAugmentedEnds(id).toMutableList())
+    private val roundDAO: RoundDAO = database.roundDAO()
+    private val endDAO: EndDAO = database.endDAO()
+    private val endRepository = EndRepository(endDAO)
 
-    fun loadAugmentedRound(round: Round) = AugmentedRound(round, endRepository.loadAugmentedEnds(round.id).toMutableList())
+    fun loadAugmentedRound(id: Long) =
+        AugmentedRound(roundDAO.loadRound(id), endRepository.loadAugmentedEnds(id).toMutableList())
+
+    fun loadAugmentedRound(round: Round) =
+        AugmentedRound(round, endRepository.loadAugmentedEnds(round.id).toMutableList())
 
     fun insertRound(round: AugmentedRound) {
         roundDAO.insertRound(round.round, round.ends.map { it.end })
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
index d79f79cab..8d61814a5 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
@@ -15,6 +15,7 @@
 
 package de.dreier.mytargets.base.db.dao
 
+import android.arch.lifecycle.LiveData
 import android.arch.persistence.room.*
 import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
@@ -27,6 +28,9 @@ abstract class RoundDAO {
     @Query("SELECT * FROM `Round` WHERE `trainingId` = :id ORDER BY `index`")
     abstract fun loadRounds(id: Long): List<Round>
 
+    @Query("SELECT * FROM `Round` WHERE `trainingId` = :id ORDER BY `index`")
+    abstract fun loadRoundsLive(id: Long): LiveData<List<Round>>
+
     @Query("SELECT * FROM `Round` WHERE `id` = :id")
     abstract fun loadRound(id: Long): Round
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
index 922d9b660..ef589ae48 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
@@ -15,6 +15,7 @@
 
 package de.dreier.mytargets.base.db.dao
 
+import android.arch.lifecycle.LiveData
 import android.arch.persistence.room.*
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
@@ -27,12 +28,18 @@ abstract class TrainingDAO {
     @Query("SELECT * FROM `Training` WHERE `id` = :id")
     abstract fun loadTraining(id: Long): Training
 
+    @Query("SELECT * FROM `Training` WHERE `id` = :id")
+    abstract fun loadTrainingLive(id: Long): LiveData<Training>
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     abstract fun insertTraining(training: Training): Long
 
     @Update
     abstract fun updateTraining(training: Training)
 
+    @Query("UPDATE `Training` SET `comment`=:comment WHERE `id` = :trainingId")
+    abstract fun updateComment(trainingId: Long, comment: String)
+
     @Transaction
     open fun saveTraining(training: Training, rounds: List<Round>) {
         training.id = insertTraining(training)
diff --git a/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt b/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
index c1a92931f..60334e61e 100644
--- a/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
@@ -133,18 +133,21 @@ class NavigationController(
                 .start()
     }
 
-    fun navigateToCreateRound(training: Training, fab: FloatingActionButton? = null) {
+    fun navigateToCreateRound(
+        trainingId: Long,
+        fab: FloatingActionButton? = null
+    ) {
         val intentWrapper = IntentWrapper(activity, fragment, EditRoundActivity::class.java)
-                .with(EditableListFragmentBase.ITEM_ID, training.id)
+                .with(EditableListFragmentBase.ITEM_ID, trainingId)
         if (fab != null) {
             intentWrapper.fromFab(fab)
         }
         intentWrapper.start()
     }
 
-    fun navigateToEditRound(training: Training, roundId: Long) {
+    fun navigateToEditRound(trainingId: Long, roundId: Long) {
         IntentWrapper(activity, fragment, EditRoundActivity::class.java)
-                .with(EditableListFragmentBase.ITEM_ID, training.id)
+                .with(EditableListFragmentBase.ITEM_ID, trainingId)
                 .with(EditRoundFragment.ROUND_ID, roundId)
                 .start()
     }
@@ -168,6 +171,12 @@ class NavigationController(
                 .start()
     }
 
+    fun navigateToStatistics(trainingId: Long) {
+        IntentWrapper(activity, fragment, StatisticsActivity::class.java)
+            .with(StatisticsActivity.TRAINING_ID, trainingId)
+            .start()
+    }
+
     fun navigateToTimer(exitAfterStop: Boolean) {
         IntentWrapper(activity, fragment, TimerActivity::class.java)
                 .with(TimerFragmentBase.ARG_EXIT_AFTER_STOP, exitAfterStop)
diff --git a/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt b/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt
index 7459b20ff..4f5a5ec8b 100644
--- a/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt
@@ -19,12 +19,14 @@ import android.arch.lifecycle.ViewModel
 import android.arch.lifecycle.ViewModelProvider
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.features.arrows.EditArrowViewModel
+import de.dreier.mytargets.features.training.details.TrainingViewModel
 
 internal class ViewModelFactory : ViewModelProvider.Factory {
     @Suppress("UNCHECKED_CAST")
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
         return when(modelClass) {
             EditArrowViewModel::class.java -> EditArrowViewModel(ApplicationInstance.instance) as T
+            TrainingViewModel::class.java -> TrainingViewModel(ApplicationInstance.instance) as T
             else -> throw Exception("No implementation for $modelClass provided")
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
index 75faaae1b..66dd4c18e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
@@ -22,7 +22,7 @@ import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
 import de.dreier.mytargets.databinding.ItemImageDetailsBinding
-import de.dreier.mytargets.features.training.details.HtmlInfoBuilder
+import de.dreier.mytargets.features.training.details.SpannedInfoBuilder
 import de.dreier.mytargets.shared.models.db.Bow
 import de.dreier.mytargets.utils.Utils
 import de.dreier.mytargets.utils.multiselector.MultiSelector
@@ -53,7 +53,7 @@ internal class BowAdapter(
             binding.image.setImageDrawable(item.thumbnail!!.roundDrawable)
             binding.details.visibility = View.VISIBLE
 
-            val info = HtmlInfoBuilder()
+            val info = SpannedInfoBuilder()
             info.addLine(R.string.bow_type, item.type!!)
             if (!item.brand!!.trim { it <= ' ' }.isEmpty()) {
                 info.addLine(R.string.brand, item.brand!!)
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
index 0f4e64659..623d17a3e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
@@ -74,9 +74,7 @@ class ScoreboardFragment : FragmentBase() {
     private val database = ApplicationInstance.db
     private val trainingDAO = database.trainingDAO()
     private val roundDAO = database.roundDAO()
-    private val endDAO = database.endDAO()
-    private val endRepository = EndRepository(endDAO)
-    private val roundRepository = RoundRepository(database, roundDAO, endDAO, endRepository)
+    private val roundRepository = RoundRepository(database)
     private val trainingRepository = TrainingRepository(database, trainingDAO, roundDAO,roundRepository, database.signatureDAO())
 
     private val updateReceiver = object : MobileWearableClient.EndUpdateReceiver() {
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
index 8e7a06cb4..b5a9cb609 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
@@ -45,8 +45,7 @@ class DefaultScoreboardLayout(private val context: Context, database: AppDatabas
     private val bowDAO = database.bowDAO()
     private val arrowDAO = database.arrowDAO()
     private val standardRoundDAO = database.standardRoundDAO()
-    private val endRepository = EndRepository(endDAO)
-    private val roundRepository = RoundRepository(database, roundDAO, endDAO, endRepository)
+    private val roundRepository = RoundRepository(database)
     private val trainingRepository = TrainingRepository(database, trainingDAO, roundDAO, roundRepository, database.signatureDAO())
 
     fun generateWithBuilder(builder: ScoreboardBuilder, training: Training, rounds: List<Round>) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt
index 07f2fd94b..22d193be6 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt
@@ -83,7 +83,7 @@ object GoogleDriveBackup {
                     .setSortOrder(SortOrder.Builder()
                             .addSortDescending(SortableField.MODIFIED_DATE).build())
                     .build()
-            Drive.DriveApi.getAppFolder(googleApiClient).queryChildren(googleApiClient, query)
+            Drive.DriveApi.getAppFolder(googleApiClient)!!.queryChildren(googleApiClient, query)
                     .setResultCallback(object : ResultCallback<DriveApi.MetadataBufferResult> {
 
                         private val backupsArray = ArrayList<BackupEntry>()
@@ -191,7 +191,7 @@ object GoogleDriveBackup {
                     .build()
 
             // create a file in selected folder
-            val result1 = Drive.DriveApi.getAppFolder(googleApiClient)
+            val result1 = Drive.DriveApi.getAppFolder(googleApiClient)!!
                     .createFile(googleApiClient, changeSet, driveContents).await()
             if (!result1.status.isSuccess) {
                 throw BackupException(result1.status.statusMessage)
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
index 3e99f184f..417a4eac6 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
@@ -49,7 +49,8 @@ import java.io.IOException
 import java.text.SimpleDateFormat
 import java.util.*
 
-class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<List<Pair<Training, Round>>> {
+class StatisticsActivity : ChildActivityBase(),
+    LoaderManager.LoaderCallbacks<List<Pair<Training, Round>>> {
 
     private lateinit var binding: ActivityStatisticsBinding
     private var rounds: List<Pair<Training, Round>>? = null
@@ -88,20 +89,28 @@ class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<Li
 
     @SuppressLint("StaticFieldLeak")
     override fun onCreateLoader(i: Int, bundle: Bundle): Loader<List<Pair<Training, Round>>> {
-        val roundIds = intent.getLongArrayExtra(ROUND_IDS)
+        val roundIds = if (intent.hasExtra(TRAINING_ID)) {
+            roundDAO.loadRounds(intent.getLongExtra(TRAINING_ID, 0)).map { it.id }
+                .toLongArray()
+        } else {
+            intent.getLongArrayExtra(ROUND_IDS)
+        }
         return object : AsyncTaskLoader<List<Pair<Training, Round>>>(this) {
             override fun loadInBackground(): List<Pair<Training, Round>> {
                 val rounds = roundDAO.loadRounds(roundIds)
                 val trainingsMap = rounds.map { (_, trainingId) -> trainingId!! }
-                        .distinct()
-                        .map { id -> Pair(id, trainingDAO.loadTraining(id)) }
-                        .toSparseArray()
+                    .distinct()
+                    .map { id -> Pair(id, trainingDAO.loadTraining(id)) }
+                    .toSparseArray()
                 return rounds.map { round -> Pair(trainingsMap.get(round.trainingId!!), round) }
             }
         }
     }
 
-    override fun onLoadFinished(loader: Loader<List<Pair<Training, Round>>>, data: List<Pair<Training, Round>>) {
+    override fun onLoadFinished(
+        loader: Loader<List<Pair<Training, Round>>>,
+        data: List<Pair<Training, Round>>
+    ) {
         rounds = data
         binding.progressBar.hide()
         binding.distanceTags.tags = getDistanceTags()
@@ -187,64 +196,66 @@ class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<Li
         arrowTags = binding.arrowTags.checkedTags.map { it.id }.toHashSet()
         bowTags = binding.bowTags.checkedTags.map { it.id }.toHashSet()
         filteredRounds = rounds!!
-                .filter { (training, round) ->
-                    distanceTags!!.contains(round.distance.toString())
-                            && diameterTags!!.contains(round.target.diameter.toString())
-                            && arrowTags!!.contains(training.arrowId)
-                            && bowTags!!.contains(training.bowId)
-                }
-                .map { it.second }
-                .groupBy { value -> Pair(value.target.id, value.target.getScoringStyle()) }
-                .map { value1 -> Pair(value1.value[0].target, value1.value) }
-                .sortedByDescending { it.second.size }
+            .filter { (training, round) ->
+                distanceTags!!.contains(round.distance.toString())
+                        && diameterTags!!.contains(round.target.diameter.toString())
+                        && arrowTags!!.contains(training.arrowId)
+                        && bowTags!!.contains(training.bowId)
+            }
+            .map { it.second }
+            .groupBy { value -> Pair(value.target.id, value.target.getScoringStyle()) }
+            .map { value1 -> Pair(value1.value[0].target, value1.value) }
+            .sortedByDescending { it.second.size }
         val animate = binding.viewPager.adapter == null
         val adapter = StatisticsPagerAdapter(
-                supportFragmentManager, filteredRounds!!, animate)
+            supportFragmentManager, filteredRounds!!, animate
+        )
         binding.viewPager.adapter = adapter
     }
 
     private fun getBowTags(): List<Tag> {
         return rounds!!
-                .map { it.first.bowId }
-                .distinct()
-                .map { bid ->
-                    if (bid != null) {
-                        val bow = bowDAO.loadBowOrNull(bid) ?: return@map Tag(bid, "Deleted " + bid)
-                        Tag(bow.id, bow.name, bow.thumbnail, true)
-                    } else {
-                        Tag(null, getString(R.string.unknown))
-                    }
+            .map { it.first.bowId }
+            .distinct()
+            .map { bid ->
+                if (bid != null) {
+                    val bow = bowDAO.loadBowOrNull(bid) ?: return@map Tag(bid, "Deleted " + bid)
+                    Tag(bow.id, bow.name, bow.thumbnail, true)
+                } else {
+                    Tag(null, getString(R.string.unknown))
                 }
+            }
     }
 
     private fun getArrowTags(): List<Tag> {
         return rounds!!
-                .map { it.first.arrowId }
-                .distinct()
-                .map { aid ->
-                    if (aid != null) {
-                        val arrow = arrowDAO.loadArrowOrNull(aid) ?: return@map Tag(aid, "Deleted " + aid)
-                        Tag(arrow.id, arrow.name, arrow.thumbnail, true)
-                    } else {
-                        Tag(null, getString(R.string.unknown))
-                    }
+            .map { it.first.arrowId }
+            .distinct()
+            .map { aid ->
+                if (aid != null) {
+                    val arrow =
+                        arrowDAO.loadArrowOrNull(aid) ?: return@map Tag(aid, "Deleted " + aid)
+                    Tag(arrow.id, arrow.name, arrow.thumbnail, true)
+                } else {
+                    Tag(null, getString(R.string.unknown))
                 }
+            }
     }
 
     private fun getDistanceTags(): List<Tag> {
         return rounds!!
-                .map { it.second.distance }
-                .distinct()
-                .sorted()
-                .map { d -> Tag(d.id, d.toString()) }
+            .map { it.second.distance }
+            .distinct()
+            .sorted()
+            .map { d -> Tag(d.id, d.toString()) }
     }
 
     private fun getDiameterTags(): List<Tag> {
         return rounds!!
-                .map { it.second.target.diameter }
-                .distinct()
-                .sorted()
-                .map { Tag(it.id, it.toString()) }
+            .map { it.second.target.diameter }
+            .distinct()
+            .sorted()
+            .map { Tag(it.id, it.toString()) }
     }
 
     override fun onLoaderReset(loader: Loader<List<Pair<Training, Round>>>) {
@@ -254,16 +265,16 @@ class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<Li
     @SuppressLint("StaticFieldLeak")
     internal fun export() {
         val progress = MaterialDialog.Builder(this)
-                .content(R.string.exporting)
-                .progress(true, 0)
-                .show()
+            .content(R.string.exporting)
+            .progress(true, 0)
+            .show()
         object : AsyncTask<Void, Void, Uri>() {
 
             override fun doInBackground(vararg params: Void): Uri? {
                 return try {
                     val f = File(cacheDir, exportFileName)
                     CsvExporter(applicationContext, ApplicationInstance.db)
-                            .exportAll(f, filteredRounds!!.flatMap { it.second }.map { it.id })
+                        .exportAll(f, filteredRounds!!.flatMap { it.second }.map { it.id })
                     f.toUri(this@StatisticsActivity)
                 } catch (e: IOException) {
                     e.printStackTrace()
@@ -280,8 +291,10 @@ class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<Li
                     email.type = "text/csv"
                     startActivity(Intent.createChooser(email, getString(R.string.send_exported)))
                 } else {
-                    Snackbar.make(binding.root, R.string.exporting_failed,
-                            Snackbar.LENGTH_LONG).show()
+                    Snackbar.make(
+                        binding.root, R.string.exporting_failed,
+                        Snackbar.LENGTH_LONG
+                    ).show()
                 }
             }
         }.execute()
@@ -293,7 +306,11 @@ class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<Li
             return "MyTargets_exported_data_" + format.format(Date()) + ".csv"
         }
 
-    inner class StatisticsPagerAdapter internal constructor(fm: FragmentManager, private val targets: List<Pair<Target, List<Round>>>, private val animate: Boolean) : FragmentStatePagerAdapter(fm) {
+    inner class StatisticsPagerAdapter internal constructor(
+        fm: FragmentManager,
+        private val targets: List<Pair<Target, List<Round>>>,
+        private val animate: Boolean
+    ) : FragmentStatePagerAdapter(fm) {
 
         override fun getItem(position: Int): Fragment {
             val item = targets[position]
@@ -312,5 +329,6 @@ class StatisticsActivity : ChildActivityBase(), LoaderManager.LoaderCallbacks<Li
 
     companion object {
         const val ROUND_IDS = "round_ids"
+        const val TRAINING_ID = "training_id"
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlInfoBuilder.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/SpannedInfoBuilder.kt
similarity index 51%
rename from app/src/main/java/de/dreier/mytargets/features/training/details/HtmlInfoBuilder.kt
rename to app/src/main/java/de/dreier/mytargets/features/training/details/SpannedInfoBuilder.kt
index ddcf88fe5..0e69c88ef 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlInfoBuilder.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/SpannedInfoBuilder.kt
@@ -15,36 +15,33 @@
 
 package de.dreier.mytargets.features.training.details
 
-import android.support.annotation.StringRes
-import android.text.TextUtils
+import android.graphics.Typeface.BOLD
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+import android.text.style.StyleSpan
 import de.dreier.mytargets.shared.SharedApplicationInstance
 
-class HtmlInfoBuilder {
-    private val info = StringBuilder()
+class SpannedInfoBuilder {
+    private val info = SpannableStringBuilder()
 
     fun addLine(key: Int, value: Any) {
-        if (info.isNotEmpty()) {
-            info.append("<br>")
-        }
-        info.append(getKeyValueLine(key, value))
+        addLine(SharedApplicationInstance.getStr(key), value)
     }
 
     fun addLine(key: String, value: Any) {
         if (info.isNotEmpty()) {
-            info.append("<br>")
+            info.appendln()
         }
-        info.append(getKeyValueLine(key, value))
-    }
-
-    private fun getKeyValueLine(key: String, value: Any): String {
-        return String.format("%s: <b>%s</b>", key, TextUtils.htmlEncode(value.toString()))
-    }
-
-    private fun getKeyValueLine(@StringRes key: Int, value: Any): String {
-        return getKeyValueLine(SharedApplicationInstance.getStr(key), value)
+        info.append("$key: ")
+        val start = info.length
+        info.append(value.toString())
+        info.setSpan(StyleSpan(BOLD), start, info.length, SPAN_EXCLUSIVE_EXCLUSIVE)
     }
 
-    override fun toString(): String {
-        return info.toString()
+    fun toSpanned(): Spanned {
+        return info
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index ee52b3754..c936fcd3a 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -15,30 +15,24 @@
 
 package de.dreier.mytargets.features.training.details
 
-import android.content.IntentFilter
+import android.arch.lifecycle.Observer
+import android.arch.lifecycle.ViewModelProviders
 import android.databinding.DataBindingUtil
 import android.os.Bundle
 import android.support.annotation.CallSuper
-import android.support.v4.content.LocalBroadcastManager
 import android.text.InputType
 import android.view.*
 import com.afollestad.materialdialogs.MaterialDialog
 import de.dreier.mytargets.R
-import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
-import de.dreier.mytargets.base.db.EndRepository
-import de.dreier.mytargets.base.db.RoundRepository
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase
 import de.dreier.mytargets.base.fragments.ItemActionModeCallback
-import de.dreier.mytargets.base.fragments.LoaderUICallback
+import de.dreier.mytargets.base.viewmodel.ViewModelFactory
 import de.dreier.mytargets.databinding.FragmentTrainingBinding
 import de.dreier.mytargets.databinding.ItemRoundBinding
 import de.dreier.mytargets.features.settings.SettingsManager
-import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
-import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.utils.*
-import de.dreier.mytargets.utils.MobileWearableClient.Companion.BROADCAST_UPDATE_TRAINING_FROM_REMOTE
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 
 /**
@@ -46,81 +40,63 @@ import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
  */
 open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterBase<Round>>() {
 
-    private val equals = BooleanArray(2)
     private lateinit var binding: FragmentTrainingBinding
     private var trainingId: Long = 0
-    private var training: Training? = null
 
-    private val database = ApplicationInstance.db
-    private val trainingDAO = database.trainingDAO()
-    private val roundDAO = database.roundDAO()
-    private val endDAO = database.endDAO()
-    private val endRepository = EndRepository(endDAO)
-    private val roundRepository = RoundRepository(database, roundDAO, endDAO, endRepository)
-
-    private val updateReceiver = object : MobileWearableClient.EndUpdateReceiver() {
-
-        override fun onUpdate(trainingId: Long, roundId: Long, end: End) {
-            if (this@TrainingFragment.trainingId == trainingId) {
-                reloadData()
-            }
-        }
-    }
+    private lateinit var viewModel: TrainingViewModel
+    private val factory = ViewModelFactory()
 
     init {
         itemTypeDelRes = R.plurals.round_deleted
-        actionModeCallback = ItemActionModeCallback(this, selector,
-                R.plurals.round_selected)
+        actionModeCallback = ItemActionModeCallback(
+            this, selector,
+            R.plurals.round_selected
+        )
         actionModeCallback?.setEditCallback { this.onEdit(it) }
         actionModeCallback?.setStatisticsCallback { this.onStatistics(it) }
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        LocalBroadcastManager.getInstance(context!!).registerReceiver(updateReceiver,
-                IntentFilter(BROADCAST_UPDATE_TRAINING_FROM_REMOTE))
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        LocalBroadcastManager.getInstance(context!!).unregisterReceiver(updateReceiver)
-    }
-
     @CallSuper
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_training, container, false)
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.addItemDecoration(
-                DividerItemDecoration(context!!, R.drawable.full_divider))
-        adapter = RoundAdapter()
+            DividerItemDecoration(context!!, R.drawable.full_divider)
+        )
+        adapter = RoundAdapter(BooleanArray(2))
         binding.recyclerView.itemAnimator = SlideInItemAnimator()
         binding.recyclerView.adapter = adapter
 
-        // Get training
-        trainingId = arguments!!.getLong(EditableListFragmentBase.ITEM_ID)
-
         binding.fab.visibility = View.GONE
         binding.fab.setOnClickListener {
             // New round to free training
-            navigationController.navigateToCreateRound(training!!, binding.fab)
+            navigationController.navigateToCreateRound(trainingId, binding.fab)
         }
         return binding.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
+
         ToolbarUtils.setSupportActionBar(this, binding.toolbar)
         ToolbarUtils.showHomeAsUp(this)
         setHasOptionsMenu(true)
-    }
 
-    override fun onLoad(args: Bundle?): LoaderUICallback {
-        training = trainingDAO.loadTraining(trainingId)
-        val rounds = roundDAO.loadRounds(trainingId).toMutableList()
-        return {
+        viewModel = ViewModelProviders.of(this, factory).get(TrainingViewModel::class.java)
+        trainingId = arguments.getLongOrNull(EditableListFragmentBase.ITEM_ID)!!
+        viewModel.setTrainingId(trainingId)
+//        binding.training = viewModel
+        viewModel.training.observe(this, Observer { training1 ->
+            if (training1 == null) {
+                return@Observer
+            }
             // Hide fab for standard rounds
-            val supportsDeletion = training!!.standardRoundId == null
+            val supportsDeletion = training1.standardRoundId == null
             if (supportsDeletion) {
                 actionModeCallback?.setDeleteCallback { this.onDelete(it) }
             } else {
@@ -129,20 +105,30 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
             binding.fab.visibility = if (supportsDeletion) View.VISIBLE else View.GONE
 
             // Set round info
-            val colorDrawable = if (training!!.environment.indoor) {
+            val colorDrawable = if (training1.environment.indoor) {
                 R.drawable.ic_house_24dp
             } else {
-                training!!.environment.weather.colorDrawable
+                training1.environment.weather.colorDrawable
             }
             binding.weatherIcon.setImageResource(colorDrawable)
-            binding.detailRoundInfo.text = HtmlUtils.getTrainingInfoHTML(context!!, training!!, rounds, equals)
-            adapter!!.setList(rounds)
 
             activity!!.invalidateOptionsMenu()
 
-            ToolbarUtils.setTitle(this@TrainingFragment, training!!.title)
-            ToolbarUtils.setSubtitle(this@TrainingFragment, training!!.formattedDate)
-        }
+            ToolbarUtils.setTitle(this@TrainingFragment, training1.title)
+            ToolbarUtils.setSubtitle(this@TrainingFragment, training1.formattedDate)
+        })
+        viewModel.trainingAndRounds.observe(this, Observer { trainingAndRounds ->
+            if (trainingAndRounds == null) {
+                return@Observer
+            }
+
+            val equals = BooleanArray(2)
+            binding.detailRoundInfo.text = TrainingInfoUtils.getTrainingInfo(context!!, trainingAndRounds.first, trainingAndRounds.second, equals)
+
+            adapter = RoundAdapter(equals)
+            binding.recyclerView.adapter = adapter
+            adapter!!.setList(trainingAndRounds.second)
+        })
     }
 
     override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater) {
@@ -151,8 +137,8 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
 
     override fun onPrepareOptionsMenu(menu: Menu) {
         super.onPrepareOptionsMenu(menu)
-        menu.findItem(R.id.action_scoreboard).isVisible = training != null
-        menu.findItem(R.id.action_statistics).isVisible = training != null
+        menu.findItem(R.id.action_scoreboard).isVisible = viewModel.training.value != null
+        menu.findItem(R.id.action_statistics).isVisible = viewModel.training.value != null
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -162,19 +148,18 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
                 return true
             }
             R.id.action_statistics -> {
-                navigationController.navigateToStatistics(roundDAO.loadRounds(training!!.id).map { it.id })
+                navigationController.navigateToStatistics(trainingId)
                 return true
             }
             R.id.action_comment -> {
                 MaterialDialog.Builder(context!!)
-                        .title(R.string.comment)
-                        .inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE)
-                        .input("", training!!.comment) { _, input ->
-                            training!!.comment = input.toString()
-                            trainingDAO.updateTraining(training!!)
-                        }
-                        .negativeText(android.R.string.cancel)
-                        .show()
+                    .title(R.string.comment)
+                    .inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE)
+                    .input("", viewModel.training.value!!.comment) { _, input ->
+                        viewModel.setTrainingComment(input.toString())
+                    }
+                    .negativeText(android.R.string.cancel)
+                    .show()
                 return true
             }
             else -> return super.onOptionsItemSelected(item)
@@ -183,11 +168,11 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
 
     override fun onSelected(item: Round) {
         navigationController.navigateToRound(item)
-                .start()
+            .start()
     }
 
     private fun onEdit(itemId: Long) {
-        navigationController.navigateToEditRound(training!!, itemId)
+        navigationController.navigateToEditRound(trainingId, itemId)
     }
 
     private fun onStatistics(ids: List<Long>) {
@@ -195,37 +180,42 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
     }
 
     override fun deleteItem(item: Round): () -> Round {
-        val round = roundRepository.loadAugmentedRound(item)
-        roundDAO.deleteRound(item)
-        return {
-            roundRepository.insertRound(round)
-            item
-        }
+        return viewModel.deleteTraining(item)
     }
 
-    private inner class RoundAdapter : SimpleListAdapterBase<Round>(compareBy(Round::index)) {
-
+    private inner class RoundAdapter(val equals: BooleanArray) : SimpleListAdapterBase<Round>(compareBy(Round::index)) {
         override fun onCreateViewHolder(parent: ViewGroup): SelectableViewHolder<Round> {
             val itemView = LayoutInflater.from(parent.context)
-                    .inflate(R.layout.item_round, parent, false)
-            return ViewHolder(itemView)
+                .inflate(R.layout.item_round, parent, false)
+            return ViewHolder(itemView, equals)
         }
     }
 
-    private inner class ViewHolder internal constructor(itemView: View) : SelectableViewHolder<Round>(itemView, selector, this@TrainingFragment, this@TrainingFragment) {
+    private inner class ViewHolder internal constructor(
+        itemView: View,
+        val equals: BooleanArray
+    ) :
+        SelectableViewHolder<Round>(
+            itemView,
+            selector,
+            this@TrainingFragment,
+            this@TrainingFragment
+        ) {
         private val binding = ItemRoundBinding.bind(itemView)
 
         override fun bindItem(item: Round) {
-            binding.title.text = resources.getQuantityString(R.plurals.rounds, item
-                    .index + 1, item.index + 1)
-            binding.subtitle.text = HtmlUtils.getRoundInfo(item, equals)
+            binding.title.text = resources.getQuantityString(
+                R.plurals.rounds, item
+                    .index + 1, item.index + 1
+            )
+            binding.subtitle.text = TrainingInfoUtils.getRoundInfo(item, equals)
             if (binding.subtitle.text.isEmpty()) {
                 binding.subtitle.visibility = View.GONE
             } else {
                 binding.subtitle.visibility = View.VISIBLE
             }
             binding.points.text = item.score
-                    .format(Utils.getCurrentLocale(context!!), SettingsManager.scoreConfiguration)
+                .format(Utils.getCurrentLocale(context!!), SettingsManager.scoreConfiguration)
         }
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingInfoUtils.kt
similarity index 89%
rename from app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
rename to app/src/main/java/de/dreier/mytargets/features/training/details/TrainingInfoUtils.kt
index b5695d864..98a226037 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/HtmlUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingInfoUtils.kt
@@ -24,16 +24,16 @@ import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.utils.Utils
 
-object HtmlUtils {
+object TrainingInfoUtils {
 
-    fun getTrainingInfoHTML(context: Context, training: Training, rounds: List<Round>, equals: BooleanArray): Spanned {
-        val info = HtmlInfoBuilder()
+    fun getTrainingInfo(context: Context, training: Training, rounds: List<Round>, equals: BooleanArray): Spanned {
+        val info = SpannedInfoBuilder()
         addStaticTrainingHeaderInfo(context, info, training)
         addDynamicTrainingHeaderInfo(rounds, equals, info)
-        return Utils.fromHtml(info.toString())
+        return info.toSpanned()
     }
 
-    private fun addStaticTrainingHeaderInfo(context: Context, info: HtmlInfoBuilder, training: Training) {
+    private fun addStaticTrainingHeaderInfo(context: Context, info: SpannedInfoBuilder, training: Training) {
         if (training.environment.indoor) {
             info.addLine(R.string.environment, context.getString(R.string.indoor))
         } else {
@@ -61,7 +61,7 @@ object HtmlUtils {
         }
     }
 
-    private fun addDynamicTrainingHeaderInfo(rounds: List<Round>, equals: BooleanArray, info: HtmlInfoBuilder) {
+    private fun addDynamicTrainingHeaderInfo(rounds: List<Round>, equals: BooleanArray, info: SpannedInfoBuilder) {
         if (rounds.isNotEmpty()) {
             getEqualValues(rounds, equals)
             val round = rounds[0]
@@ -86,7 +86,7 @@ object HtmlUtils {
     }
 
     fun getRoundInfo(round: Round, equals: BooleanArray): Spanned {
-        val info = HtmlInfoBuilder()
+        val info = SpannedInfoBuilder()
         if (!equals[0]) {
             info.addLine(R.string.distance, round.distance)
         }
@@ -96,6 +96,6 @@ object HtmlUtils {
         if (!round.comment.isEmpty()) {
             info.addLine(R.string.comment, round.comment)
         }
-        return Utils.fromHtml(info.toString())
+        return info.toSpanned()
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingViewModel.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingViewModel.kt
new file mode 100644
index 000000000..4813bb862
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingViewModel.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.features.training.details
+
+import android.arch.lifecycle.AndroidViewModel
+import android.arch.lifecycle.LiveData
+import android.arch.lifecycle.MutableLiveData
+import android.arch.lifecycle.Transformations
+import de.dreier.mytargets.app.ApplicationInstance
+import de.dreier.mytargets.base.db.RoundRepository
+import de.dreier.mytargets.shared.models.db.Round
+import de.dreier.mytargets.shared.models.db.Training
+import de.dreier.mytargets.utils.LiveDataUtil2
+
+
+class TrainingViewModel(app: ApplicationInstance) : AndroidViewModel(app) {
+    val trainingId = MutableLiveData<Long?>()
+
+    val training: LiveData<Training>
+    val rounds: LiveData<List<Round>>
+    val trainingAndRounds: LiveData<Pair<Training, List<Round>>>
+
+    private val trainingDAO = ApplicationInstance.db.trainingDAO()
+    private val roundDAO = ApplicationInstance.db.roundDAO()
+    private val roundRepository = RoundRepository(ApplicationInstance.db)
+
+    init {
+        training = Transformations.switchMap(trainingId) { id ->
+            if (id == null) {
+                null
+            } else {
+                trainingDAO.loadTrainingLive(id)
+            }
+        }
+        rounds = Transformations.switchMap(trainingId) { id ->
+            if (id == null) {
+                null
+            } else {
+                roundDAO.loadRoundsLive(id)
+            }
+        }
+        trainingAndRounds = LiveDataUtil2<Training, List<Round>, Pair<Training, List<Round>>>().map(
+            training,
+            rounds
+        ) { training, rounds ->
+            Pair(training, rounds)
+        }
+    }
+
+    fun setTrainingId(trainingId: Long?) {
+        this.trainingId.value = trainingId
+    }
+
+    fun setTrainingComment(comment: String) {
+        trainingDAO.updateComment(trainingId.value!!, comment)
+    }
+
+    fun deleteTraining(item: Round): () -> Round {
+        val round = roundRepository.loadAugmentedRound(item)
+        roundDAO.deleteRound(item)
+        return {
+            roundRepository.insertRound(round)
+            item
+        }
+    }
+}
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
index 41d80998e..460aa60a3 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
@@ -84,8 +84,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
     private val bowDAO = database.bowDAO()
     private val arrowDAO = database.arrowDAO()
     private val standardRoundDAO = database.standardRoundDAO()
-    private val endRepository = EndRepository(endDAO)
-    private val roundRepository = RoundRepository(database, roundDAO, endDAO, endRepository)
+    private val roundRepository = RoundRepository(database)
     private val trainingRepository = TrainingRepository(
         database,
         trainingDAO,
@@ -263,7 +262,7 @@ class InputActivity : ChildActivityBase(), TargetViewBase.OnEndFinishedListener,
                 invalidateOptionsMenu()
             }
             R.id.action_settings -> navigationController.navigateToSettings(ESettingsScreens.INPUT)
-            R.id.action_new_round -> navigationController.navigateToCreateRound(data!!.training.training)
+            R.id.action_new_round -> navigationController.navigateToCreateRound(trainingId = data!!.training.training.id)
             else -> return super.onOptionsItemSelected(item)
         }
         return true
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
index abcedabf1..8b1d321c2 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
@@ -54,9 +54,7 @@ class TrainingsFragment : ExpandableListFragment<Header, Training>() {
     private val database = ApplicationInstance.db
     private val trainingDAO = database.trainingDAO()
     private val roundDAO = database.roundDAO()
-    private val endDAO = database.endDAO()
-    private val endRepository = EndRepository(endDAO)
-    private val roundRepository = RoundRepository(database, roundDAO, endDAO, endRepository)
+    private val roundRepository = RoundRepository(database)
     private val trainingRepository = TrainingRepository(database, trainingDAO, roundDAO,roundRepository, database.signatureDAO())
 
     private val updateReceiver = object : BroadcastReceiver() {
diff --git a/app/src/main/java/de/dreier/mytargets/utils/LiveDataUtil2.kt b/app/src/main/java/de/dreier/mytargets/utils/LiveDataUtil2.kt
new file mode 100644
index 000000000..6251f809f
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/utils/LiveDataUtil2.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.utils
+
+import android.arch.lifecycle.LiveData
+import android.arch.lifecycle.MediatorLiveData
+import android.support.annotation.MainThread
+
+class LiveDataUtil2<A, B, Y> {
+
+    private var source: LiveData<Y>? = null
+
+    @MainThread
+    public fun switchMap(
+        trigger1: LiveData<A>,
+        trigger2: LiveData<B>,
+        thunk: (A?, B?) -> LiveData<Y>
+    ): LiveData<Y> {
+        val result: MediatorLiveData<Y> = MediatorLiveData()
+
+        result.addSource(trigger1, { a ->
+            val newLiveData: LiveData<Y> = thunk.invoke(a, trigger2.value)
+            if (source != newLiveData) {
+                if (source != null) {
+                    result.removeSource(source!!)
+                }
+
+                source = newLiveData
+                if (source != null) {
+                    result.addSource(source!!, { y ->
+                        result.setValue(y)
+                    })
+                }
+            }
+        })
+
+        result.addSource(trigger2, { b ->
+            val newLiveData: LiveData<Y> = thunk.invoke(trigger1.value, b)
+            if (source != newLiveData) {
+                if (source != null) {
+                    result.removeSource(source!!)
+                }
+
+                source = newLiveData
+                if (source != null) {
+                    result.addSource(source!!, { y ->
+                        result.setValue(y)
+                    })
+                }
+            }
+        })
+
+        return result
+    }
+
+    fun map(
+        source1: LiveData<A>, source2: LiveData<B>,
+        thunk: (A, B) -> Y
+    ): LiveData<Y> {
+        val result = MediatorLiveData<Y>()
+        var value1: A? = null
+        var value2: B? = null
+        fun setResult(value1: A?, value2: B?) {
+            if (value1 != null && value2 != null) {
+                result.value = thunk.invoke(value1, value2)
+            }
+        }
+        result.addSource(source1, { a ->
+            value1 = a
+            setResult(value1, value2)
+        })
+        result.addSource(source2, { b ->
+            value2 = b
+            setResult(value1, value2)
+        })
+        return result
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
index 12db8f7ca..9c8b37cc1 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
@@ -46,8 +46,7 @@ class MobileWearableListener : WearableListenerService() {
     private val roundDAO = database.roundDAO()
     private val endDAO = database.endDAO()
     private val standardRoundDAO = database.standardRoundDAO()
-    private val endRepository = EndRepository(endDAO)
-    private val roundRepository = RoundRepository(database, roundDAO, endDAO, endRepository)
+    private val roundRepository = RoundRepository(database)
     private val trainingRepository = TrainingRepository(database, trainingDAO, roundDAO,roundRepository, database.signatureDAO())
 
     override fun onMessageReceived(messageEvent: MessageEvent) {

From 0a8b5af34d11b3c0300fe6089546c931859a3309 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Sun, 13 May 2018 19:51:24 +0200
Subject: [PATCH 083/102] Renamed deleteTraining to deleteRound

---
 .../mytargets/features/training/details/TrainingFragment.kt     | 2 +-
 .../mytargets/features/training/details/TrainingViewModel.kt    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index c936fcd3a..d75c36d5b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -180,7 +180,7 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
     }
 
     override fun deleteItem(item: Round): () -> Round {
-        return viewModel.deleteTraining(item)
+        return viewModel.deleteRound(item)
     }
 
     private inner class RoundAdapter(val equals: BooleanArray) : SimpleListAdapterBase<Round>(compareBy(Round::index)) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingViewModel.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingViewModel.kt
index 4813bb862..4c67bd278 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingViewModel.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingViewModel.kt
@@ -68,7 +68,7 @@ class TrainingViewModel(app: ApplicationInstance) : AndroidViewModel(app) {
         trainingDAO.updateComment(trainingId.value!!, comment)
     }
 
-    fun deleteTraining(item: Round): () -> Round {
+    fun deleteRound(item: Round): () -> Round {
         val round = roundRepository.loadAugmentedRound(item)
         roundDAO.deleteRound(item)
         return {

From c5fc6b13cbeeda6659f23fe8d0cba24721c8eb60 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Wed, 16 May 2018 21:27:16 +0200
Subject: [PATCH 084/102] Migrated TrainingsFragment to MVVM

---
 .../mytargets/base/db/dao/TrainingDAO.kt      |   3 +
 .../base/viewmodel/ViewModelFactory.kt        |   2 +
 .../training/details/TrainingFragment.kt      |   4 +-
 .../training/overview/TrainingsFragment.kt    | 152 ++++++++----------
 .../training/overview/TrainingsViewModel.kt   |  65 ++++++++
 5 files changed, 139 insertions(+), 87 deletions(-)
 create mode 100644 app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsViewModel.kt

diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
index ef589ae48..ed355b614 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/TrainingDAO.kt
@@ -25,6 +25,9 @@ abstract class TrainingDAO {
     @Query("SELECT * FROM `Training`")
     abstract fun loadTrainings(): List<Training>
 
+    @Query("SELECT * FROM `Training`")
+    abstract fun loadTrainingsLive(): LiveData<List<Training>>
+
     @Query("SELECT * FROM `Training` WHERE `id` = :id")
     abstract fun loadTraining(id: Long): Training
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt b/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt
index 4f5a5ec8b..55d9f8be4 100644
--- a/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt
@@ -20,6 +20,7 @@ import android.arch.lifecycle.ViewModelProvider
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.features.arrows.EditArrowViewModel
 import de.dreier.mytargets.features.training.details.TrainingViewModel
+import de.dreier.mytargets.features.training.overview.TrainingsViewModel
 
 internal class ViewModelFactory : ViewModelProvider.Factory {
     @Suppress("UNCHECKED_CAST")
@@ -27,6 +28,7 @@ internal class ViewModelFactory : ViewModelProvider.Factory {
         return when(modelClass) {
             EditArrowViewModel::class.java -> EditArrowViewModel(ApplicationInstance.instance) as T
             TrainingViewModel::class.java -> TrainingViewModel(ApplicationInstance.instance) as T
+            TrainingsViewModel::class.java -> TrainingsViewModel(ApplicationInstance.instance) as T
             else -> throw Exception("No implementation for $modelClass provided")
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index d75c36d5b..959de8eb0 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -179,9 +179,7 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
         navigationController.navigateToStatistics(ids)
     }
 
-    override fun deleteItem(item: Round): () -> Round {
-        return viewModel.deleteRound(item)
-    }
+    override fun deleteItem(item: Round) = viewModel.deleteRound(item)
 
     private inner class RoundAdapter(val equals: BooleanArray) : SimpleListAdapterBase<Round>(compareBy(Round::index)) {
         override fun onCreateViewHolder(parent: ViewGroup): SelectableViewHolder<Round> {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
index 8b1d321c2..4adc9c9d8 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsFragment.kt
@@ -15,22 +15,16 @@
 
 package de.dreier.mytargets.features.training.overview
 
-import android.content.BroadcastReceiver
+import android.arch.lifecycle.Observer
+import android.arch.lifecycle.ViewModelProviders
 import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
 import android.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.v4.content.LocalBroadcastManager
 import android.view.*
 import de.dreier.mytargets.R
-import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.adapters.header.ExpandableListAdapter
-import de.dreier.mytargets.base.db.EndRepository
-import de.dreier.mytargets.base.db.RoundRepository
-import de.dreier.mytargets.base.db.TrainingRepository
 import de.dreier.mytargets.base.fragments.ItemActionModeCallback
-import de.dreier.mytargets.base.fragments.LoaderUICallback
+import de.dreier.mytargets.base.viewmodel.ViewModelFactory
 import de.dreier.mytargets.databinding.FragmentTrainingsBinding
 import de.dreier.mytargets.databinding.ItemTrainingBinding
 import de.dreier.mytargets.features.settings.SettingsManager
@@ -38,8 +32,6 @@ import de.dreier.mytargets.features.training.edit.EditTrainingFragment.Companion
 import de.dreier.mytargets.features.training.edit.EditTrainingFragment.Companion.CREATE_TRAINING_WITH_STANDARD_ROUND_ACTION
 import de.dreier.mytargets.shared.models.db.Training
 import de.dreier.mytargets.utils.DividerItemDecoration
-import de.dreier.mytargets.utils.MobileWearableClient.Companion.BROADCAST_CREATE_TRAINING_FROM_REMOTE
-import de.dreier.mytargets.utils.MobileWearableClient.Companion.BROADCAST_UPDATE_TRAINING_FROM_REMOTE
 import de.dreier.mytargets.utils.SlideInItemAnimator
 import de.dreier.mytargets.utils.Utils
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
@@ -51,22 +43,15 @@ class TrainingsFragment : ExpandableListFragment<Header, Training>() {
 
     private lateinit var binding: FragmentTrainingsBinding
 
-    private val database = ApplicationInstance.db
-    private val trainingDAO = database.trainingDAO()
-    private val roundDAO = database.roundDAO()
-    private val roundRepository = RoundRepository(database)
-    private val trainingRepository = TrainingRepository(database, trainingDAO, roundDAO,roundRepository, database.signatureDAO())
-
-    private val updateReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            reloadData()
-        }
-    }
+    private lateinit var viewModel: TrainingsViewModel
+    private val factory = ViewModelFactory()
 
     init {
         itemTypeDelRes = R.plurals.training_deleted
-        actionModeCallback = ItemActionModeCallback(this, selector,
-                R.plurals.training_selected)
+        actionModeCallback = ItemActionModeCallback(
+            this, selector,
+            R.plurals.training_selected
+        )
         actionModeCallback?.setEditCallback(this::onEdit)
         actionModeCallback?.setDeleteCallback(this::onDelete)
         actionModeCallback?.setStatisticsCallback(this::onStatistics)
@@ -77,50 +62,60 @@ class TrainingsFragment : ExpandableListFragment<Header, Training>() {
         binding.fabSpeedDial.closeMenu()
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val filter = IntentFilter()
-        filter.addAction(BROADCAST_UPDATE_TRAINING_FROM_REMOTE)
-        filter.addAction(BROADCAST_CREATE_TRAINING_FROM_REMOTE)
-        LocalBroadcastManager.getInstance(context!!).registerReceiver(updateReceiver, filter)
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        LocalBroadcastManager.getInstance(context!!).unregisterReceiver(updateReceiver)
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_trainings, container, false)
         binding.recyclerView.setHasFixedSize(true)
         adapter = TrainingAdapter(context!!)
         binding.recyclerView.itemAnimator = SlideInItemAnimator()
         binding.recyclerView.adapter = adapter
         binding.recyclerView.addItemDecoration(
-                DividerItemDecoration(context!!, R.drawable.full_divider))
+            DividerItemDecoration(context!!, R.drawable.full_divider)
+        )
         binding.fabSpeedDial.setMenuListener { menuItem ->
             when (menuItem.itemId) {
                 R.id.fab1 -> navigationController
-                        .navigateToCreateTraining(CREATE_FREE_TRAINING_ACTION)
-                        .fromFab(binding.fabSpeedDial
-                                .getFabFromMenuId(R.id.fab1), R.color.fabFreeTraining,
-                                R.drawable.fab_trending_up_white_24dp)
-                        .start()
+                    .navigateToCreateTraining(CREATE_FREE_TRAINING_ACTION)
+                    .fromFab(
+                        binding.fabSpeedDial
+                            .getFabFromMenuId(R.id.fab1), R.color.fabFreeTraining,
+                        R.drawable.fab_trending_up_white_24dp
+                    )
+                    .start()
                 R.id.fab2 -> navigationController
-                        .navigateToCreateTraining(CREATE_TRAINING_WITH_STANDARD_ROUND_ACTION)
-                        .fromFab(binding.fabSpeedDial
-                                .getFabFromMenuId(R.id.fab2), R.color.fabTrainingWithStandardRound,
-                                R.drawable.fab_album_24dp)
-                        .start()
+                    .navigateToCreateTraining(CREATE_TRAINING_WITH_STANDARD_ROUND_ACTION)
+                    .fromFab(
+                        binding.fabSpeedDial
+                            .getFabFromMenuId(R.id.fab2), R.color.fabTrainingWithStandardRound,
+                        R.drawable.fab_album_24dp
+                    )
+                    .start()
                 else -> {
                 }
             }
             false
         }
-        setHasOptionsMenu(true)
         return binding.root
     }
 
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        setHasOptionsMenu(true)
+
+        viewModel = ViewModelProviders.of(this, factory).get(TrainingsViewModel::class.java)
+        viewModel.trainings.observe(this, Observer { trainings ->
+            if (trainings != null) {
+                this@TrainingsFragment.setList(trainings, false)
+                activity?.invalidateOptionsMenu()
+                binding.emptyState!!.root.visibility =
+                        if (trainings.isEmpty()) View.VISIBLE else View.GONE
+            }
+        })
+    }
+
     override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater) {
         inflater.inflate(R.menu.statistics, menu)
     }
@@ -134,9 +129,7 @@ class TrainingsFragment : ExpandableListFragment<Header, Training>() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.action_statistics -> {
-                navigationController.navigateToStatistics(trainingDAO.loadTrainings()
-                        .flatMap { training -> roundDAO.loadRounds(training.id) }
-                        .map { it.id })
+                navigationController.navigateToStatistics(viewModel.getAllRoundIds())
                 true
             }
             else -> super.onOptionsItemSelected(item)
@@ -145,59 +138,50 @@ class TrainingsFragment : ExpandableListFragment<Header, Training>() {
 
     public override fun onSelected(item: Training) {
         navigationController.navigateToTraining(item)
-                .start()
+            .start()
     }
 
     private fun onStatistics(ids: List<Long>) {
-        navigationController.navigateToStatistics(ids
-                .map { trainingDAO.loadTraining(it) }
-                .flatMap { t -> roundDAO.loadRounds(t.id) }
-                .map { it.id })
+        navigationController.navigateToStatistics(viewModel.getRoundIds(ids))
     }
 
     private fun onEdit(itemId: Long) {
         navigationController.navigateToEditTraining(itemId)
     }
 
-    override fun deleteItem(item: Training): () -> Training {
-        val training = trainingRepository.loadAugmentedTraining(item.id)
-        trainingDAO.deleteTraining(item)
-        return {
-            trainingRepository.insertTraining(training)
-            item
-        }
-    }
-
-    override fun onLoad(args: Bundle?): LoaderUICallback {
-        val trainings = trainingDAO.loadTrainings()
-        return {
-            this@TrainingsFragment.setList(trainings, false)
-            activity?.invalidateOptionsMenu()
-            binding.emptyState!!.root.visibility = if (trainings.isEmpty()) View.VISIBLE else View.GONE
-        }
-    }
+    override fun deleteItem(item: Training) = viewModel.deleteTraining(item)
 
-    private inner class TrainingAdapter internal constructor(context: Context
-    ) : ExpandableListAdapter<Header, Training>({ child ->
-        Utils.getMonthHeader(context, child.date)
-    }, compareByDescending(Header::id),
-            compareByDescending(Training::date).thenByDescending(Training::id)) {
+    private inner class TrainingAdapter internal constructor(
+        context: Context
+    ) : ExpandableListAdapter<Header, Training>(
+        { child ->
+            Utils.getMonthHeader(context, child.date)
+        }, compareByDescending(Header::id),
+        compareByDescending(Training::date).thenByDescending(Training::id)
+    ) {
 
         override fun getSecondLevelViewHolder(parent: ViewGroup): ViewHolder {
             val itemView = LayoutInflater.from(parent.context)
-                    .inflate(R.layout.item_training, parent, false)
+                .inflate(R.layout.item_training, parent, false)
             return ViewHolder(itemView)
         }
     }
 
-    private inner class ViewHolder(itemView: View) : SelectableViewHolder<Training>(itemView, selector, this@TrainingsFragment, this@TrainingsFragment) {
+    private inner class ViewHolder(itemView: View) : SelectableViewHolder<Training>(
+        itemView,
+        selector,
+        this@TrainingsFragment,
+        this@TrainingsFragment
+    ) {
         internal var binding = ItemTrainingBinding.bind(itemView)
 
         override fun bindItem(item: Training) {
             binding.training.text = item.title
             binding.trainingDate.text = item.formattedDate
-            binding.gesTraining.text = item.score.format(Utils.getCurrentLocale(context!!),
-                    SettingsManager.scoreConfiguration)
+            binding.gesTraining.text = item.score.format(
+                Utils.getCurrentLocale(context!!),
+                SettingsManager.scoreConfiguration
+            )
         }
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsViewModel.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsViewModel.kt
new file mode 100644
index 000000000..4f1bc4172
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/TrainingsViewModel.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.features.training.overview
+
+import android.arch.lifecycle.AndroidViewModel
+import android.arch.lifecycle.LiveData
+import de.dreier.mytargets.app.ApplicationInstance
+import de.dreier.mytargets.base.db.RoundRepository
+import de.dreier.mytargets.base.db.TrainingRepository
+import de.dreier.mytargets.shared.models.db.Training
+
+
+class TrainingsViewModel(app: ApplicationInstance) : AndroidViewModel(app) {
+
+    val trainings: LiveData<List<Training>>
+
+    private val trainingDAO = ApplicationInstance.db.trainingDAO()
+    private val roundDAO = ApplicationInstance.db.roundDAO()
+    private val roundRepository = RoundRepository(ApplicationInstance.db)
+
+    private val database = ApplicationInstance.db
+    private val trainingRepository = TrainingRepository(
+        ApplicationInstance.db,
+        trainingDAO,
+        roundDAO,
+        roundRepository,
+        database.signatureDAO()
+    )
+
+    init {
+        trainings = trainingDAO.loadTrainingsLive()
+    }
+
+    fun deleteTraining(item: Training): () -> Training {
+        val training = trainingRepository.loadAugmentedTraining(item.id)
+        trainingDAO.deleteTraining(item)
+        return {
+            trainingRepository.insertTraining(training)
+            item
+        }
+    }
+
+    fun getRoundIds(ids: List<Long>) = ids
+        .map { trainingDAO.loadTraining(it) }
+        .flatMap { t -> roundDAO.loadRounds(t.id) }
+        .map { it.id }
+
+    fun getAllRoundIds() = trainingDAO.loadTrainings()
+        .flatMap { training -> roundDAO.loadRounds(training.id) }
+        .map { it.id }
+
+}

From f2bdcc97bd3493710ae08916e5a56999d99aa33d Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Sun, 20 May 2018 17:14:35 +0200
Subject: [PATCH 085/102] Migrated arrows and distances to MVVM

---
 .../mytargets/app/ApplicationInstance.kt      |  2 +-
 .../dreier/mytargets/base/db/dao/ArrowDAO.kt  |  4 +
 .../mytargets/base/db/dao/DimensionDAO.kt     |  3 +-
 .../mytargets/base/fragments/FragmentBase.kt  |  8 +-
 .../base/fragments/SelectItemFragmentBase.kt  |  9 ++-
 .../SelectPureListItemFragmentBase.kt         | 16 +++-
 .../base/viewmodel/ViewModelFactory.kt        |  4 +
 .../features/arrows/ArrowListFragment.kt      | 25 ++++---
 .../features/arrows/ArrowListViewModel.kt     | 43 +++++++++++
 .../features/arrows/EditArrowListFragment.kt  | 32 ++++----
 .../features/bows/EditBowListFragment.kt      |  2 +-
 .../features/distance/DistanceGridFragment.kt | 53 ++++++-------
 .../features/distance/DistancesViewModel.kt   | 66 +++++++++++++++++
 .../features/training/RoundFragment.kt        |  2 +-
 .../training/edit/EditTrainingFragment.kt     | 74 +++++++++++--------
 .../environment/WindDirectionListFragment.kt  |  2 +-
 .../environment/WindSpeedListFragment.kt      |  2 +-
 .../overview/ExpandableListFragment.kt        |  2 +-
 18 files changed, 248 insertions(+), 101 deletions(-)
 create mode 100644 app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListViewModel.kt
 create mode 100644 app/src/main/java/de/dreier/mytargets/features/distance/DistancesViewModel.kt

diff --git a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
index 911d998ba..28a589eb5 100644
--- a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
+++ b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
@@ -110,7 +110,7 @@ class ApplicationInstance : SharedApplicationInstance() {
         lateinit var db: AppDatabase
 
         val lastSharedPreferences: SharedPreferences
-            get() = SharedApplicationInstance.Companion.context.getSharedPreferences(MyBackupAgent.PREFS, 0)
+            get() = SharedApplicationInstance.context.getSharedPreferences(MyBackupAgent.PREFS, 0)
 
         fun initRoomDb(context: Context) {
             db = Room.databaseBuilder(context,
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
index f0c964879..87d37b3d8 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/ArrowDAO.kt
@@ -15,6 +15,7 @@
 
 package de.dreier.mytargets.base.db.dao
 
+import android.arch.lifecycle.LiveData
 import android.arch.persistence.room.*
 import de.dreier.mytargets.shared.models.db.Arrow
 import de.dreier.mytargets.shared.models.db.ArrowImage
@@ -24,6 +25,9 @@ abstract class ArrowDAO {
     @Query("SELECT * FROM `Arrow`")
     abstract fun loadArrows(): List<Arrow>
 
+    @Query("SELECT * FROM `Arrow`")
+    abstract fun loadArrowsLive(): LiveData<List<Arrow>>
+
     @Query("SELECT * FROM `Arrow` WHERE `id` = (:id)")
     abstract fun loadArrow(id: Long): Arrow
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
index ab7bf80e5..17a736e98 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
@@ -15,6 +15,7 @@
 
 package de.dreier.mytargets.base.db.dao
 
+import android.arch.lifecycle.LiveData
 import android.arch.persistence.room.Dao
 import android.arch.persistence.room.Query
 import de.dreier.mytargets.shared.models.Dimension
@@ -30,5 +31,5 @@ interface DimensionDAO {
     @Query("SELECT distance FROM `SightMark` WHERE `distance` LIKE ('% ' || :unit)" +
             "UNION SELECT distance FROM `RoundTemplate` WHERE `distance` LIKE ('% ' || :unit)" +
             "UNION SELECT distance FROM `Round` WHERE `distance` LIKE ('% ' || :unit)")
-    fun getAll(unit: Dimension.Unit): List<Dimension>
+    fun getAll(unit: Dimension.Unit): LiveData<List<Dimension>>
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
index 75478f001..4ea3ab33d 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
@@ -34,7 +34,8 @@ typealias LoaderUICallback = () -> Unit
  * Generic fragment class used as base for most fragments.
  * Has Icepick build in to save state on orientation change.
  */
-abstract class FragmentBase : Fragment(), LoaderManager.LoaderCallbacks<FragmentBase.LoaderUICallbackHelper> {
+abstract class FragmentBase : Fragment(),
+    LoaderManager.LoaderCallbacks<FragmentBase.LoaderUICallbackHelper> {
 
     protected lateinit var navigationController: NavigationController
 
@@ -63,7 +64,10 @@ abstract class FragmentBase : Fragment(), LoaderManager.LoaderCallbacks<Fragment
         return { }
     }
 
-    override fun onLoadFinished(loader: Loader<LoaderUICallbackHelper>, callback: LoaderUICallbackHelper) {
+    override fun onLoadFinished(
+        loader: Loader<LoaderUICallbackHelper>,
+        callback: LoaderUICallbackHelper
+    ) {
         callback.applyData()
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt
index 8acf23a35..7ba86e9b9 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectItemFragmentBase.kt
@@ -33,12 +33,13 @@ import de.dreier.mytargets.utils.multiselector.SingleSelector
  *
  * @param <T> Model of the item which is managed within the fragment.
 </T> */
-abstract class SelectItemFragmentBase<T, U : ListAdapterBase<out ItemBindingHolder<*>, T>> : FragmentBase(), OnItemClickListener<T> where T : IIdProvider, T : Parcelable {
+abstract class SelectItemFragmentBase<T, U : ListAdapterBase<out ItemBindingHolder<*>, T>> :
+    FragmentBase(), OnItemClickListener<T> where T : IIdProvider, T : Parcelable {
 
     /**
      * Adapter for the fragment's RecyclerView
      */
-    protected var adapter: U? = null
+    protected lateinit var adapter: U
 
     /**
      * Selector which manages the item selection
@@ -73,7 +74,7 @@ abstract class SelectItemFragmentBase<T, U : ListAdapterBase<out ItemBindingHold
             val manager = recyclerView.layoutManager as LinearLayoutManager
             val first = manager.findFirstCompletelyVisibleItemPosition()
             val last = manager.findLastCompletelyVisibleItemPosition()
-            val position = adapter!!.getItemPosition(item)
+            val position = adapter.getItemPosition(item)
             if (first > position || last < position) {
                 recyclerView.scrollToPosition(position)
             }
@@ -105,6 +106,6 @@ abstract class SelectItemFragmentBase<T, U : ListAdapterBase<out ItemBindingHold
      * @return The selected item
      */
     protected open fun onSave(): T {
-        return adapter!!.getItemById(selector.getSelectedId()!!)!!
+        return adapter.getItemById(selector.getSelectedId()!!)!!
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt
index 972a86172..f0b2ff220 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/SelectPureListItemFragmentBase.kt
@@ -35,12 +35,16 @@ import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
  *
  */
 abstract class SelectPureListItemFragmentBase<T>(
-        private val comparator: Comparator<T>
+    private val comparator: Comparator<T>
 ) : SelectItemFragmentBase<T, SimpleListAdapterBase<T>>() where T : IIdProvider, T : Parcelable {
 
     protected lateinit var binding: FragmentListBinding
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_list, container, false)
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.itemAnimator = SlideInItemAnimator()
@@ -63,11 +67,15 @@ abstract class SelectPureListItemFragmentBase<T>(
         }
     }
 
-    protected fun onCreateViewHolder(inflater: LayoutInflater, parent: ViewGroup): SelectableViewHolder<T> {
+    protected fun onCreateViewHolder(
+        inflater: LayoutInflater,
+        parent: ViewGroup
+    ): SelectableViewHolder<T> {
         return ViewHolder(inflater.inflate(R.layout.item_image_simple, parent, false))
     }
 
-    private inner class ViewHolder(itemView: View) : SelectableViewHolder<T>(itemView, selector, this@SelectPureListItemFragmentBase) {
+    private inner class ViewHolder(itemView: View) :
+        SelectableViewHolder<T>(itemView, selector, this@SelectPureListItemFragmentBase) {
         internal var binding = ItemImageSimpleBinding.bind(itemView)
 
         override fun bindItem(item: T) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt b/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt
index 55d9f8be4..3d18c3975 100644
--- a/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt
@@ -18,7 +18,9 @@ package de.dreier.mytargets.base.viewmodel
 import android.arch.lifecycle.ViewModel
 import android.arch.lifecycle.ViewModelProvider
 import de.dreier.mytargets.app.ApplicationInstance
+import de.dreier.mytargets.features.arrows.ArrowListViewModel
 import de.dreier.mytargets.features.arrows.EditArrowViewModel
+import de.dreier.mytargets.features.distance.DistancesViewModel
 import de.dreier.mytargets.features.training.details.TrainingViewModel
 import de.dreier.mytargets.features.training.overview.TrainingsViewModel
 
@@ -29,6 +31,8 @@ internal class ViewModelFactory : ViewModelProvider.Factory {
             EditArrowViewModel::class.java -> EditArrowViewModel(ApplicationInstance.instance) as T
             TrainingViewModel::class.java -> TrainingViewModel(ApplicationInstance.instance) as T
             TrainingsViewModel::class.java -> TrainingsViewModel(ApplicationInstance.instance) as T
+            ArrowListViewModel::class.java -> ArrowListViewModel(ApplicationInstance.instance) as T
+            DistancesViewModel::class.java -> DistancesViewModel(ApplicationInstance.instance) as T
             else -> throw Exception("No implementation for $modelClass provided")
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
index d915d35c5..ab2baefa9 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListFragment.kt
@@ -15,24 +15,29 @@
 
 package de.dreier.mytargets.features.arrows
 
+import android.arch.lifecycle.Observer
+import android.arch.lifecycle.ViewModelProviders
 import android.os.Bundle
-import de.dreier.mytargets.app.ApplicationInstance
-import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.base.fragments.SelectPureListItemFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
+import de.dreier.mytargets.base.viewmodel.ViewModelFactory
 import de.dreier.mytargets.shared.models.db.Arrow
 
 class ArrowListFragment : SelectPureListItemFragmentBase<Arrow>(compareBy(Arrow::name, Arrow::id)) {
 
-    private val arrowDAO = ApplicationInstance.db.arrowDAO()
+    private lateinit var viewModel: ArrowListViewModel
+    private val factory = ViewModelFactory()
 
-    override fun onLoad(args: Bundle?): LoaderUICallback {
-        val arrows = arrowDAO.loadArrows().toMutableList()
-        return {
-            adapter!!.setList(arrows)
-            val arrow = arguments!!.getParcelable<Arrow>(ITEM)
-            selectItem(binding.recyclerView, arrow!!)
-        }
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        viewModel = ViewModelProviders.of(this, factory).get(ArrowListViewModel::class.java)
+        viewModel.arrows.observe(this, Observer { arrows ->
+            if (arrows != null) {
+                adapter.setList(arrows)
+                val arrow = arguments!!.getParcelable<Arrow>(ITEM)
+                selectItem(binding.recyclerView, arrow!!)
+            }
+        })
     }
 
     override fun getName(item: Arrow) = item.name
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListViewModel.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListViewModel.kt
new file mode 100644
index 000000000..453726638
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListViewModel.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.features.arrows
+
+import android.arch.lifecycle.AndroidViewModel
+import android.arch.lifecycle.LiveData
+import android.arch.lifecycle.MutableLiveData
+import android.arch.lifecycle.Transformations
+import de.dreier.mytargets.app.ApplicationInstance
+import de.dreier.mytargets.base.db.RoundRepository
+import de.dreier.mytargets.shared.models.db.Arrow
+import de.dreier.mytargets.shared.models.db.Round
+import de.dreier.mytargets.shared.models.db.Training
+import de.dreier.mytargets.utils.LiveDataUtil2
+
+class ArrowListViewModel(app: ApplicationInstance) : AndroidViewModel(app) {
+
+    private val arrowDAO = ApplicationInstance.db.arrowDAO()
+    val arrows  = arrowDAO.loadArrowsLive()
+
+    fun deleteArrow(item: Arrow): () -> Arrow {
+        val images = arrowDAO.loadArrowImages(item.id)
+        arrowDAO.deleteArrow(item)
+        return {
+            arrowDAO.saveArrow(item, images)
+            item
+        }
+    }
+
+}
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
index f2769438c..8ca51245d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
@@ -15,6 +15,8 @@
 
 package de.dreier.mytargets.features.arrows
 
+import android.arch.lifecycle.Observer
+import android.arch.lifecycle.ViewModelProviders
 import android.databinding.DataBindingUtil
 import android.os.Bundle
 import android.support.annotation.CallSuper
@@ -27,6 +29,8 @@ import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase
 import de.dreier.mytargets.base.fragments.ItemActionModeCallback
 import de.dreier.mytargets.base.fragments.LoaderUICallback
+import de.dreier.mytargets.base.navigation.NavigationController
+import de.dreier.mytargets.base.viewmodel.ViewModelFactory
 import de.dreier.mytargets.databinding.FragmentArrowsBinding
 import de.dreier.mytargets.databinding.ItemImageDetailsBinding
 import de.dreier.mytargets.shared.models.db.Arrow
@@ -37,7 +41,9 @@ import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 class EditArrowListFragment : EditableListFragmentBase<Arrow, SimpleListAdapterBase<Arrow>>() {
 
     private lateinit var binding: FragmentArrowsBinding
-    private val arrowDAO = ApplicationInstance.db.arrowDAO()
+
+    private lateinit var viewModel: ArrowListViewModel
+    private val factory = ViewModelFactory()
 
     init {
         itemTypeDelRes = R.plurals.arrow_deleted
@@ -67,12 +73,15 @@ class EditArrowListFragment : EditableListFragmentBase<Arrow, SimpleListAdapterB
         return binding.root
     }
 
-    override fun onLoad(args: Bundle?): LoaderUICallback {
-        val arrows = arrowDAO.loadArrows()
-        return {
-            adapter!!.setList(arrows.toMutableList())
-            binding.emptyState!!.root.visibility = if (arrows.isEmpty()) View.VISIBLE else View.GONE
-        }
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        viewModel = ViewModelProviders.of(this, factory).get(ArrowListViewModel::class.java)
+        viewModel.arrows.observe(this, Observer { arrows ->
+            if (arrows != null) {
+                adapter!!.setList(arrows)
+                binding.emptyState!!.root.visibility = if (arrows.isEmpty()) View.VISIBLE else View.GONE
+            }
+        })
     }
 
     private fun onEdit(itemId: Long) {
@@ -85,14 +94,7 @@ class EditArrowListFragment : EditableListFragmentBase<Arrow, SimpleListAdapterB
                 .start()
     }
 
-    override fun deleteItem(item: Arrow): () -> Arrow {
-        val images = arrowDAO.loadArrowImages(item.id)
-        arrowDAO.deleteArrow(item)
-        return {
-            arrowDAO.saveArrow(item, images)
-            item
-        }
-    }
+    override fun deleteItem(item: Arrow) = viewModel.deleteArrow(item)
 
     private inner class ArrowAdapter : SimpleListAdapterBase<Arrow>(compareBy(Arrow::name, Arrow::id)) {
         public override fun onCreateViewHolder(parent: ViewGroup): ViewHolder {
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
index ef862f29e..f9dfa2321 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
@@ -80,7 +80,7 @@ class EditBowListFragment : EditableListFragmentBase<Bow, SimpleListAdapterBase<
     override fun onLoad(args: Bundle?): LoaderUICallback {
         val bows = bowDAO.loadBows()
         return {
-            adapter!!.setList(bows.toMutableList())
+            adapter!!.setList(bows)
             binding.emptyState!!.root.visibility = if (bows.isEmpty()) View.VISIBLE else View.GONE
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
index 27f023692..831e26a0e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
@@ -15,6 +15,8 @@
 
 package de.dreier.mytargets.features.distance
 
+import android.arch.lifecycle.Observer
+import android.arch.lifecycle.ViewModelProviders
 import android.databinding.DataBindingUtil
 import android.os.Bundle
 import android.support.v7.widget.GridLayoutManager
@@ -22,11 +24,10 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import de.dreier.mytargets.R
-import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
-import de.dreier.mytargets.base.fragments.LoaderUICallback
 import de.dreier.mytargets.base.fragments.SelectItemFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
+import de.dreier.mytargets.base.viewmodel.ViewModelFactory
 import de.dreier.mytargets.databinding.FragmentListBinding
 import de.dreier.mytargets.databinding.ItemDistanceBinding
 import de.dreier.mytargets.shared.models.Dimension
@@ -36,17 +37,14 @@ import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 
 class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapterBase<Dimension>>(), DistanceInputDialog.OnClickListener {
     private lateinit var binding: FragmentListBinding
-    private var distance: Dimension? = null
-    private var unit: Unit? = null
+    private lateinit var unit: Dimension.Unit
 
-    private val dimensionDAO = ApplicationInstance.db.dimensionDAO()
+    private lateinit var viewModel: DistancesViewModel
+    private val factory = ViewModelFactory()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_list, container, false)
         binding.recyclerView.setHasFixedSize(true)
-        val bundle = arguments
-        distance = bundle!!.getParcelable(ITEM)
-        unit = Unit.from(bundle.getString(DISTANCE_UNIT))
         binding.recyclerView.layoutManager = GridLayoutManager(activity, 3)
         binding.recyclerView.addItemDecoration(DistanceItemDecorator(activity!!, 3))
         adapter = DistanceAdapter()
@@ -54,7 +52,7 @@ class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapter
         binding.recyclerView.adapter = adapter
         binding.fab.setOnClickListener {
             DistanceInputDialog.Builder(context!!)
-                    .setUnit(unit!!.toString())
+                    .setUnit(unit.toString())
                     .setOnClickListener(this@DistanceGridFragment)
                     .show()
         }
@@ -62,29 +60,25 @@ class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapter
     }
 
     override fun onOkClickListener(input: String) {
-        var distance = this.distance
-        try {
-            val distanceVal = input.replace("[^0-9]".toRegex(), "").toInt()
-            distance = Dimension(distanceVal.toFloat(), unit)
-        } catch (e: NumberFormatException) {
-            // leave distance as it is
-        }
-        navigationController.setResultSuccess(distance!!)
+        val distance = viewModel.createDistanceFromInput(input)
+        navigationController.setResultSuccess(distance)
         navigationController.finish()
     }
 
-    override fun onLoad(args: Bundle?): LoaderUICallback {
-        val distances = mutableSetOf(Dimension.UNKNOWN)
-
-        // Add currently selected distance to list
-        if (this.distance!!.unit == unit) {
-            distances.add(this.distance!!)
-        }
-        distances.addAll(dimensionDAO.getAll(unit!!))
-        return {
-            adapter!!.setList(distances.toMutableList())
-            selectItem(binding.recyclerView, distance!!)
-        }
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        viewModel = ViewModelProviders.of(this, factory).get(DistancesViewModel::class.java)
+        val bundle = arguments!!
+        val distance: Dimension = bundle.getParcelable(ITEM)
+        unit = Unit.from(bundle.getString(DISTANCE_UNIT))!!
+        viewModel.setUnit(unit)
+        viewModel.setDistance(distance)
+        viewModel.distances.observe(this, Observer { distances ->
+            if (distances != null) {
+                adapter.setList(distances)
+                selectItem(binding.recyclerView, distance)
+            }
+        })
     }
 
     private inner class DistanceAdapter : SimpleListAdapterBase<Dimension>(compareBy(Dimension::value)) {
@@ -96,7 +90,6 @@ class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapter
     }
 
     internal inner class ViewHolder(itemView: View) : SelectableViewHolder<Dimension>(itemView, selector, this@DistanceGridFragment) {
-
         private val binding = ItemDistanceBinding.bind(itemView)
 
         override fun bindItem(item: Dimension) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistancesViewModel.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistancesViewModel.kt
new file mode 100644
index 000000000..1d1a5390f
--- /dev/null
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistancesViewModel.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.features.distance
+
+import android.arch.lifecycle.AndroidViewModel
+import android.arch.lifecycle.LiveData
+import android.arch.lifecycle.MutableLiveData
+import android.arch.lifecycle.Transformations
+import de.dreier.mytargets.app.ApplicationInstance
+import de.dreier.mytargets.shared.models.Dimension
+
+class DistancesViewModel(app: ApplicationInstance) : AndroidViewModel(app) {
+
+    private val unit = MutableLiveData<Dimension.Unit>()
+    private var distance = MutableLiveData<Dimension?>()
+
+    private val dimensionDAO = ApplicationInstance.db.dimensionDAO()
+    val distances: LiveData<List<Dimension>>
+
+    init {
+        val dbDistances = Transformations.switchMap(unit) { unit ->
+            dimensionDAO.getAll(unit)
+        }
+        distances = Transformations.map(dbDistances) { filteredDistances ->
+            val distances = mutableSetOf(de.dreier.mytargets.shared.models.Dimension.UNKNOWN)
+
+            // Add currently selected distance to list
+            if (this.distance.value?.unit == unit) {
+                distances.add(this.distance.value!!)
+            }
+            distances.addAll(filteredDistances)
+            distances.toList()
+        }
+    }
+
+    fun setUnit(unit: Dimension.Unit) {
+        this.unit.value = unit
+    }
+
+    fun setDistance(distance: Dimension?) {
+        this.distance.value = distance
+    }
+
+    fun createDistanceFromInput(input: String): Dimension {
+        return try {
+            val distanceVal = input.replace("[^0-9]".toRegex(), "").toInt()
+            Dimension(distanceVal.toFloat(), unit.value)
+        } catch (e: NumberFormatException) {
+            // leave distance as it is
+            this.distance.value ?: Dimension(10f, unit.value!!)
+        }
+    }
+}
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
index 008b13087..1809d0bab 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
@@ -112,7 +112,7 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
         val showFab = round!!.maxEndCount == null || ends.size < round!!.maxEndCount!!
 
         return {
-            adapter!!.setList(ends.toMutableList())
+            adapter!!.setList(ends)
             binding.fab.visibility = if (showFab) View.VISIBLE else View.GONE
 
             ToolbarUtils.setTitle(this@RoundFragment,
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
index 5c6e0db53..f44523351 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/EditTrainingFragment.kt
@@ -98,9 +98,13 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
             return round
         }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = DataBindingUtil
-                .inflate(inflater, R.layout.fragment_edit_training, container, false)
+            .inflate(inflater, R.layout.fragment_edit_training, container, false)
 
         trainingId = arguments.getLongOrNull(ITEM_ID)
         trainingType = if (activity?.intent?.action == CREATE_TRAINING_WITH_STANDARD_ROUND_ACTION) {
@@ -113,8 +117,13 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
         ToolbarUtils.showUpAsX(this)
         setHasOptionsMenu(true)
 
-        binding.arrows.setOnProgressChangeListener(object : DiscreteSeekBar.OnProgressChangeListener {
-            override fun onProgressChanged(seekBar: DiscreteSeekBar, value: Int, fromUser: Boolean) {
+        binding.arrows.setOnProgressChangeListener(object :
+            DiscreteSeekBar.OnProgressChangeListener {
+            override fun onProgressChanged(
+                seekBar: DiscreteSeekBar,
+                value: Int,
+                fromUser: Boolean
+            ) {
                 updateArrowsLabel()
             }
 
@@ -137,22 +146,24 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
             roundTarget = item!!.roundTemplates[0].targetTemplate
         }
         binding.changeTargetFace.setOnClickListener {
-            navigationController.navigateToTarget(roundTarget!!,
-                    requestCode = SR_TARGET_REQUEST_CODE,
-                    fixedType = TargetListFragment.EFixedType.GROUP)
+            navigationController.navigateToTarget(
+                roundTarget!!,
+                requestCode = SR_TARGET_REQUEST_CODE,
+                fixedType = TargetListFragment.EFixedType.GROUP
+            )
         }
         binding.arrow.setOnAddClickListener {
             navigationController.navigateToCreateArrow()
-                    .forResult(ArrowSelector.ARROW_ADD_REQUEST_CODE)
-                    .start()
+                .forResult(ArrowSelector.ARROW_ADD_REQUEST_CODE)
+                .start()
         }
         binding.arrow.setOnClickListener { selectedItem, _ ->
             navigationController.navigateToArrowList(selectedItem!!)
         }
         binding.bow.setOnAddClickListener {
             navigationController.navigateToCreateBow(EBowType.RECURVE_BOW)
-                    .forResult(BowSelector.BOW_ADD_REQUEST_CODE)
-                    .start()
+                .forResult(BowSelector.BOW_ADD_REQUEST_CODE)
+                .start()
         }
         binding.bow.setOnClickListener { selectedItem, _ ->
             navigationController.navigateToBowList(selectedItem!!)
@@ -165,11 +176,14 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
 
         if (trainingId == null) {
             ToolbarUtils.setTitle(this, R.string.new_training)
-            binding.training.setText(getString(
+            binding.training.setText(
+                getString(
                     if (trainingType == ETrainingType.COMPETITION)
                         R.string.competition
                     else
-                        R.string.training))
+                        R.string.training
+                )
+            )
             setTrainingDate()
             loadRoundDefaultValues()
             binding.bow.setItemId(SettingsManager.bow)
@@ -193,7 +207,8 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
             binding.environment.setItem(train.environment)
             setTrainingDate()
             binding.notEditable.visibility = GONE
-            binding.changeTargetFace.visibility = if (train.standardRoundId != null) VISIBLE else GONE
+            binding.changeTargetFace.visibility =
+                    if (train.standardRoundId != null) VISIBLE else GONE
         }
         applyTrainingType()
         updateArrowsLabel()
@@ -203,7 +218,7 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
 
     private fun updateArrowsLabel() {
         binding.arrowsLabel.text = resources
-                .getQuantityString(R.plurals.arrow, binding.arrows.progress, binding.arrows.progress)
+            .getQuantityString(R.plurals.arrow, binding.arrows.progress, binding.arrows.progress)
     }
 
     private fun setScoringStyleForCompoundBow(bow: Bow?) {
@@ -225,17 +240,13 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
     }
 
     private fun applyTrainingType() {
-        val `in`: View
-        val out: View
         if (trainingType == FREE_TRAINING) {
-            `in` = binding.practiceLayout
-            out = binding.standardRound
+            binding.practiceLayout.visibility = VISIBLE
+            binding.standardRound.visibility = GONE
         } else {
-            out = binding.practiceLayout
-            `in` = binding.standardRound
+            binding.practiceLayout.visibility = GONE
+            binding.standardRound.visibility = VISIBLE
         }
-        `in`.visibility = VISIBLE
-        out.visibility = GONE
     }
 
     private fun onDateClick() {
@@ -244,7 +255,11 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
         datePickerDialog.show(activity!!.supportFragmentManager, "date_picker")
     }
 
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<String>,
+        grantResults: IntArray
+    ) {
         if (requestCode == REQUEST_LOCATION_PERMISSION) {
             binding.environment.onPermissionResult(activity!!, grantResults)
         }
@@ -256,7 +271,8 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
     }
 
     private fun setTrainingDate() {
-        binding.trainingDate.text = date.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM))
+        binding.trainingDate.text =
+                date.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM))
     }
 
     override fun onSave() {
@@ -287,11 +303,11 @@ class EditTrainingFragment : EditFragmentBase(), DatePickerDialog.OnDateSetListe
             val round = rounds[0]
 
             navigationController.navigateToTraining(training)
-                    .noAnimation()
-                    .start()
+                .noAnimation()
+                .start()
             navigationController.navigateToRound(round)
-                    .noAnimation()
-                    .start()
+                .noAnimation()
+                .start()
             navigationController.navigateToCreateEnd(round)
         } else {
             // Edit training
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
index 92cf1e159..93145a0b4 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
@@ -28,7 +28,7 @@ class WindDirectionListFragment : SelectPureListItemFragmentBase<WindDirection>(
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
-        adapter!!.setList(WindDirection.getList(context!!).toMutableList())
+        adapter.setList(WindDirection.getList(context!!))
         val windDirection = arguments!!.getParcelable<WindDirection>(ITEM)
         selectItem(binding.recyclerView, windDirection!!)
         return binding.root
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
index e491aa184..1395eb1ba 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
@@ -29,7 +29,7 @@ class WindSpeedListFragment : SelectPureListItemFragmentBase<WindSpeed>(compareB
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
-        adapter!!.setList(WindSpeed.getList(context!!).toMutableList())
+        adapter.setList(WindSpeed.getList(context!!))
         val windSpeed = arguments!!.getParcelable<WindSpeed>(ITEM)
         selectItem(binding.recyclerView, windSpeed!!)
         return binding.root
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/ExpandableListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/ExpandableListFragment.kt
index 34adab9cc..d2afc5dfb 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/overview/ExpandableListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/ExpandableListFragment.kt
@@ -37,7 +37,7 @@ abstract class ExpandableListFragment<H : IIdProvider, C> : EditableListFragment
             }
             return
         }
-        adapter!!.setList(children.toMutableList())
+        adapter!!.setList(children)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {

From 9238c2e74c2bd64295af1e6fe64db68061208d7c Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Sun, 20 May 2018 18:02:35 +0200
Subject: [PATCH 086/102] Reformatted codebase

---
 .../mytargets/app/ApplicationInstance.kt      |   34 +-
 .../activities/SimpleFragmentActivityBase.kt  |    8 +-
 .../base/adapters/SimpleListAdapterBase.kt    |    2 +-
 .../dynamicitem/DynamicItemAdapter.kt         |   15 +-
 .../adapters/dynamicitem/DynamicItemHolder.kt |    7 +-
 .../adapters/header/ExpandableHeaderHolder.kt |    5 +-
 .../adapters/header/ExpandableListAdapter.kt  |   34 +-
 .../base/adapters/header/HeaderListAdapter.kt |   22 +-
 .../adapters/header/HeaderListAdapterBase.kt  |   23 +-
 .../dreier/mytargets/base/db/AppDatabase.kt   |   46 +-
 .../dreier/mytargets/base/db/EndRepository.kt |   12 +-
 .../mytargets/base/db/StandardRoundFactory.kt | 1871 ++++++++++++-----
 .../mytargets/base/db/TrainingRepository.kt   |   13 +-
 .../mytargets/base/db/dao/DimensionDAO.kt     |    8 +-
 .../dreier/mytargets/base/db/dao/ImageDAO.kt  |    8 +-
 .../mytargets/base/db/dao/StandardRoundDAO.kt |    3 +-
 .../base/db/migrations/Migration13.kt         |   26 +-
 .../base/db/migrations/Migration14.kt         |   12 +-
 .../base/db/migrations/Migration15.kt         |   10 +-
 .../base/db/migrations/Migration16.kt         |   20 +-
 .../base/db/migrations/Migration17.kt         |   76 +-
 .../base/db/migrations/Migration18.kt         |  436 ++--
 .../base/db/migrations/Migration20.kt         |   16 +-
 .../base/db/migrations/Migration24.kt         |  134 +-
 .../base/db/migrations/Migration3.kt          |   10 +-
 .../base/db/migrations/Migration4.kt          |   15 +-
 .../base/db/migrations/Migration5.kt          |   38 +-
 .../base/db/migrations/Migration6.kt          |   10 +-
 .../base/db/migrations/Migration9.kt          |  185 +-
 .../db/migrations/RoomCreationCallback.kt     |   76 +-
 .../fragments/EditWithImageFragmentBase.kt    |   65 +-
 .../fragments/EditableListFragmentBase.kt     |   25 +-
 .../mytargets/base/fragments/FragmentBase.kt  |    2 -
 .../base/fragments/ItemActionModeCallback.kt  |    9 +-
 .../mytargets/base/gallery/GalleryActivity.kt |   73 +-
 .../adapters/HorizontalListAdapters.kt        |   20 +-
 .../base/gallery/adapters/ViewPagerAdapter.kt |   53 +-
 .../base/navigation/NavigationController.kt   |  172 +-
 .../base/viewmodel/ViewModelFactory.kt        |    2 +-
 .../features/arrows/ArrowListViewModel.kt     |    9 +-
 .../features/arrows/EditArrowFragment.kt      |    8 +-
 .../features/arrows/EditArrowListFragment.kt  |   35 +-
 .../features/arrows/EditArrowViewModel.kt     |    7 +-
 .../mytargets/features/bows/BowAdapter.kt     |   11 +-
 .../features/bows/EditBowFragment.kt          |   41 +-
 .../features/bows/EditBowListFragment.kt      |   19 +-
 .../features/distance/DistanceFragment.kt     |   13 +-
 .../features/distance/DistanceGridFragment.kt |   23 +-
 .../features/distance/DistanceInputDialog.kt  |   20 +-
 .../distance/DistanceItemDecorator.kt         |   14 +-
 .../DistanceTabsFragmentPagerAdapter.kt       |   11 +-
 .../mytargets/features/help/HelpFragment.kt   |   14 +-
 .../help/licences/LicencesFragment.kt         |   15 +-
 .../mytargets/features/main/IntroActivity.kt  |   12 +-
 .../mytargets/features/main/MainActivity.kt   |   23 +-
 .../features/rounds/EditRoundFragment.kt      |   43 +-
 .../scoreboard/ScoreboardConfiguration.kt     |    2 +-
 .../features/scoreboard/ScoreboardFragment.kt |   72 +-
 .../features/scoreboard/ScoreboardUtils.kt    |   17 +-
 .../scoreboard/SignatureDialogFragment.kt     |   24 +-
 .../scoreboard/builder/ViewBuilder.kt         |   17 +-
 .../scoreboard/builder/model/Table.kt         |   12 +-
 .../layout/DefaultScoreboardLayout.kt         |   83 +-
 .../scoreboard/layout/InfoTableBuilder.kt     |    6 +-
 .../DatePreferenceDialogFragmentCompat.kt     |   13 +-
 .../features/settings/ESettingsScreens.kt     |    2 +-
 .../settings/InputSettingsFragment.kt         |   32 +-
 .../features/settings/LanguagePreference.kt   |   64 +-
 .../settings/ProfileSettingsFragment.kt       |    8 +-
 .../settings/ScoreboardSettingsFragment.kt    |    6 +-
 .../features/settings/SettingsActivity.kt     |   17 +-
 .../features/settings/SettingsFragmentBase.kt |   10 +-
 .../features/settings/SettingsManager.kt      |  106 +-
 .../settings/TimerSettingsFragment.kt         |    6 +-
 .../features/settings/about/AboutFragment.kt  |   91 +-
 .../features/settings/about/DonateActivity.kt |   24 +-
 .../settings/about/DonationAdapter.kt         |    3 +-
 .../features/settings/backup/BackupAdapter.kt |   10 +-
 .../settings/backup/BackupException.kt        |    3 +-
 .../settings/backup/BackupSettingsFragment.kt |  143 +-
 .../backup/provider/EBackupLocation.kt        |   11 +-
 .../backup/provider/ExternalStorageBackup.kt  |   28 +-
 .../backup/provider/GoogleDriveBackup.kt      |  180 +-
 .../backup/provider/InternalStorageBackup.kt  |   34 +-
 .../synchronization/GenericAccountService.kt  |   36 +-
 .../backup/synchronization/StubProvider.kt    |   18 +-
 .../backup/synchronization/SyncAdapter.kt     |    9 +-
 .../backup/synchronization/SyncUtils.kt       |   13 +-
 .../features/statistics/ChipGroup.kt          |   18 +-
 .../features/statistics/CsvExporter.kt        |   16 +-
 .../features/statistics/CustomPieChart.kt     |    2 +-
 .../statistics/CustomPieChartRenderer.kt      |  157 +-
 .../statistics/DispersionPatternActivity.kt   |   16 +-
 .../statistics/DispersionPatternUtils.kt      |    5 +-
 .../features/statistics/StatisticsActivity.kt |    3 +-
 .../features/statistics/StatisticsFragment.kt |  178 +-
 .../mytargets/features/timer/TimerActivity.kt |    4 +-
 .../mytargets/features/timer/TimerFragment.kt |    6 +-
 .../features/training/RoundFragment.kt        |   78 +-
 .../training/details/SpannedInfoBuilder.kt    |    2 -
 .../training/details/TrainingFragment.kt      |   10 +-
 .../training/details/TrainingInfoUtils.kt     |   29 +-
 .../training/edit/DatePickerFragment.kt       |    6 +-
 .../training/environment/Connectivity.kt      |    2 +-
 .../environment/EnvironmentFragment.kt        |    8 +-
 .../features/training/environment/Locator.kt  |   50 +-
 .../training/environment/WeatherService.kt    |   36 +-
 .../environment/WindDirectionListFragment.kt  |   12 +-
 .../environment/WindSpeedListFragment.kt      |    9 +-
 .../features/training/input/InputActivity.kt  |    1 -
 .../training/input/SummaryConfiguration.kt    |    2 +-
 .../overview/ExpandableListFragment.kt        |    3 +-
 .../features/training/overview/Header.kt      |    4 +-
 .../EditStandardRoundFragment.kt              |   55 +-
 .../StandardRoundListFragment.kt              |   84 +-
 .../training/target/TargetListFragment.kt     |   46 +-
 .../mytargets/utils/AugmentedRoundUtils.kt    |    6 +-
 .../mytargets/utils/DividerItemDecoration.kt  |   31 +-
 .../dreier/mytargets/utils/IntentWrapper.kt   |   23 +-
 .../mytargets/utils/MobileWearableClient.kt   |   32 +-
 .../mytargets/utils/MobileWearableListener.kt |   31 +-
 .../mytargets/utils/RoundedTextDrawable.kt    |   20 +-
 .../de/dreier/mytargets/utils/ScoreUtils.kt   |   38 +-
 .../mytargets/utils/SlideInItemAnimator.kt    |   15 +-
 .../java/de/dreier/mytargets/utils/Utils.kt   |    7 +-
 .../mytargets/utils/backup/DbBackupHelper.kt  |    3 +-
 .../mytargets/utils/backup/MyBackupAgent.kt   |    9 +-
 .../databinding/SpinnerBindingAdapters.kt     |   26 +-
 .../ExpandableHeaderBindingHolder.kt          |   10 +-
 .../utils/multiselector/ItemBindingHolder.kt  |    4 +-
 .../multiselector/SelectableViewHolder.kt     |   21 +-
 .../utils/multiselector/WeakHolderTracker.kt  |    4 +-
 .../utils/print/CustomPrintDocumentAdapter.kt |   24 +-
 .../utils/print/DrawableToPdfWriter.kt        |   19 +-
 .../mytargets/utils/print/IPdfWriter.kt       |    5 +-
 .../mytargets/utils/print/ViewToPdfWriter.kt  |   39 +-
 .../utils/transitions/FabTransform.kt         |   87 +-
 .../utils/transitions/GravityArcMotion.kt     |    3 +-
 .../utils/transitions/NoPauseAnimator.kt      |    5 +-
 .../de/dreier/mytargets/views/NumberPicker.kt |    3 +-
 .../mytargets/views/TextInputEditText.kt      |    7 +-
 .../mytargets/views/speeddial/FabSpeedDial.kt |  157 +-
 .../views/speeddial/FabSpeedDialBehaviour.kt  |   10 +-
 143 files changed, 4181 insertions(+), 2314 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
index 28a589eb5..a97360229 100644
--- a/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
+++ b/app/src/main/java/de/dreier/mytargets/app/ApplicationInstance.kt
@@ -59,7 +59,7 @@ class ApplicationInstance : SharedApplicationInstance() {
         handleDatabaseImport()
         initRoomDb(this)
         wearableClient = MobileWearableClient(this)
-        StateSaver.setEnabledForAllActivitiesAndSupportFragments(this, true);
+        StateSaver.setEnabledForAllActivitiesAndSupportFragments(this, true)
     }
 
     private fun handleDatabaseImport() {
@@ -113,20 +113,24 @@ class ApplicationInstance : SharedApplicationInstance() {
             get() = SharedApplicationInstance.context.getSharedPreferences(MyBackupAgent.PREFS, 0)
 
         fun initRoomDb(context: Context) {
-            db = Room.databaseBuilder(context,
-                    AppDatabase::class.java, AppDatabase.DATABASE_FILE_NAME)
-                    .allowMainThreadQueries()
-                    .addCallback(RoomCreationCallback)
-                    .addMigrations(Migration2, Migration3, Migration4,
-                            Migration5, Migration6, Migration7,
-                            Migration8, Migration9, Migration10,
-                            Migration11, Migration12, Migration13,
-                            Migration14, Migration15, Migration16,
-                            Migration17, Migration18, Migration19,
-                            Migration20, Migration21, Migration22,
-                            Migration23, Migration24, Migration25,
-                            Migration26)
-                    .build()
+            db = Room.databaseBuilder(
+                context,
+                AppDatabase::class.java, AppDatabase.DATABASE_FILE_NAME
+            )
+                .allowMainThreadQueries()
+                .addCallback(RoomCreationCallback)
+                .addMigrations(
+                    Migration2, Migration3, Migration4,
+                    Migration5, Migration6, Migration7,
+                    Migration8, Migration9, Migration10,
+                    Migration11, Migration12, Migration13,
+                    Migration14, Migration15, Migration16,
+                    Migration17, Migration18, Migration19,
+                    Migration20, Migration21, Migration22,
+                    Migration23, Migration24, Migration25,
+                    Migration26
+                )
+                .build()
         }
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/activities/SimpleFragmentActivityBase.kt b/app/src/main/java/de/dreier/mytargets/base/activities/SimpleFragmentActivityBase.kt
index 9a74da036..cc71c2441 100644
--- a/app/src/main/java/de/dreier/mytargets/base/activities/SimpleFragmentActivityBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/activities/SimpleFragmentActivityBase.kt
@@ -39,8 +39,8 @@ abstract class SimpleFragmentActivityBase : ChildActivityBase() {
             }
 
             supportFragmentManager.beginTransaction()
-                    .replace(android.R.id.content, childFragment, FRAGMENT_TAG)
-                    .commit()
+                .replace(android.R.id.content, childFragment, FRAGMENT_TAG)
+                .commit()
         }
     }
 
@@ -54,8 +54,8 @@ abstract class SimpleFragmentActivityBase : ChildActivityBase() {
         }
 
         supportFragmentManager.beginTransaction()
-                .replace(android.R.id.content, childFragment, FRAGMENT_TAG)
-                .commit()
+            .replace(android.R.id.content, childFragment, FRAGMENT_TAG)
+            .commit()
     }
 
     companion object {
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/SimpleListAdapterBase.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/SimpleListAdapterBase.kt
index a6e0f2db5..db27cfb96 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/SimpleListAdapterBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/SimpleListAdapterBase.kt
@@ -24,7 +24,7 @@ import java.util.*
  * The list is automatically sorted in natural order.
  */
 abstract class SimpleListAdapterBase<T>(
-        private val comparator: Comparator<T>
+    private val comparator: Comparator<T>
 ) : ListAdapterBase<SelectableViewHolder<T>, T>() where T : IIdProvider {
 
     private var list: MutableList<T> = ArrayList()
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemAdapter.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemAdapter.kt
index a247e39ae..3cbdc91ba 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemAdapter.kt
@@ -24,9 +24,10 @@ import android.view.View
 import de.dreier.mytargets.R
 
 
-abstract class DynamicItemAdapter<T>(private val fragment: Fragment,
-                                     private var list: MutableList<T>,
-                                     @StringRes private val undoString: Int
+abstract class DynamicItemAdapter<T>(
+    private val fragment: Fragment,
+    private var list: MutableList<T>,
+    @StringRes private val undoString: Int
 ) : RecyclerView.Adapter<DynamicItemHolder<T>>() {
 
     protected val inflater = LayoutInflater.from(fragment.context)!!
@@ -43,10 +44,10 @@ abstract class DynamicItemAdapter<T>(private val fragment: Fragment,
             notifyDataSetChanged()
 
             Snackbar.make(fragment.view!!, undoString, Snackbar.LENGTH_LONG)
-                    .setAction(R.string.undo) {
-                        list.add(currentPosition, item)
-                        notifyItemInserted(position)
-                    }.show()
+                .setAction(R.string.undo) {
+                    list.add(currentPosition, item)
+                    notifyItemInserted(position)
+                }.show()
         })
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemHolder.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemHolder.kt
index bb7b7b470..3691c2b4e 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemHolder.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/dynamicitem/DynamicItemHolder.kt
@@ -22,5 +22,10 @@ import android.view.View
 abstract class DynamicItemHolder<T>(itemView: View) : RecyclerView.ViewHolder(itemView) {
     protected var item: T? = null
 
-    abstract fun onBind(item: T, position: Int, fragment: Fragment, removeListener: View.OnClickListener)
+    abstract fun onBind(
+        item: T,
+        position: Int,
+        fragment: Fragment,
+        removeListener: View.OnClickListener
+    )
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableHeaderHolder.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableHeaderHolder.kt
index 94bd663d0..b5697d3c3 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableHeaderHolder.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableHeaderHolder.kt
@@ -17,7 +17,10 @@ package de.dreier.mytargets.base.adapters.header
 
 import java.util.*
 
-class ExpandableHeaderHolder<P, C> internal constructor(parent: P, childComparator: Comparator<in C>) : HeaderListAdapterBase.HeaderHolder<P, C>(parent, childComparator) {
+class ExpandableHeaderHolder<P, C> internal constructor(
+    parent: P,
+    childComparator: Comparator<in C>
+) : HeaderListAdapterBase.HeaderHolder<P, C>(parent, childComparator) {
     internal var expanded = false
 
     override val totalItemCount: Int
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt
index 7b2562c39..2ead7fadd 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/header/ExpandableListAdapter.kt
@@ -25,19 +25,24 @@ import de.dreier.mytargets.utils.multiselector.ExpandableHeaderBindingHolder
 import de.dreier.mytargets.utils.multiselector.ItemBindingHolder
 
 typealias PartitionDelegate<PARENT, CHILD> = (CHILD) -> PARENT
+
 abstract class ExpandableListAdapter<P : IIdProvider, C : IIdProvider>(
-        partitionDelegate: PartitionDelegate<P, C>,
-        headerComparator: Comparator<P>, childComparator: Comparator<C>
-) : HeaderListAdapterBase<P, C, ExpandableHeaderHolder<P, C>>(partitionDelegate, headerComparator, childComparator) {
+    partitionDelegate: PartitionDelegate<P, C>,
+    headerComparator: Comparator<P>, childComparator: Comparator<C>
+) : HeaderListAdapterBase<P, C, ExpandableHeaderHolder<P, C>>(
+    partitionDelegate,
+    headerComparator,
+    childComparator
+) {
 
     var expandedIds: List<Long>
         get() = headersList
-                .filter { it.expanded }
-                .map { it.item.id }
+            .filter { it.expanded }
+            .map { it.item.id }
         set(expanded) {
             headersList.indices
-                    .map { headersList[it] }
-                    .forEach { it.expanded = expanded.contains(it.item.id) }
+                .map { headersList[it] }
+                .forEach { it.expanded = expanded.contains(it.item.id) }
         }
 
     override fun onBindViewHolder(viewHolder: ItemBindingHolder<IIdProvider>, position: Int) {
@@ -45,7 +50,10 @@ abstract class ExpandableListAdapter<P : IIdProvider, C : IIdProvider>(
         if (viewHolder is ExpandableHeaderBindingHolder<*>) {
             val header = getHeaderForPosition(position)
             (viewHolder as ExpandableHeaderBindingHolder<*>)
-                    .setExpandOnClickListener(View.OnClickListener { expandOrCollapse(header) }, header.expanded)
+                .setExpandOnClickListener(
+                    View.OnClickListener { expandOrCollapse(header) },
+                    header.expanded
+                )
         }
     }
 
@@ -117,17 +125,21 @@ abstract class ExpandableListAdapter<P : IIdProvider, C : IIdProvider>(
         return (0 until headerIndex).sumBy { headersList[it].totalItemCount }
     }
 
-    override fun getHeaderHolder(parent: P, childComparator: Comparator<C>): ExpandableHeaderHolder<P, C> {
+    override fun getHeaderHolder(
+        parent: P,
+        childComparator: Comparator<C>
+    ): ExpandableHeaderHolder<P, C> {
         return ExpandableHeaderHolder(parent, childComparator)
     }
 
     override fun getTopLevelViewHolder(parent: ViewGroup): HeaderViewHolder<P> {
         val itemView = LayoutInflater.from(parent.context)
-                .inflate(R.layout.item_header_expandable, parent, false)
+            .inflate(R.layout.item_header_expandable, parent, false)
         return HeaderViewHolder(itemView)
     }
 
-    class HeaderViewHolder<P> internal constructor(itemView: View) : ExpandableHeaderBindingHolder<P>(itemView, R.id.expand_collapse) {
+    class HeaderViewHolder<P> internal constructor(itemView: View) :
+        ExpandableHeaderBindingHolder<P>(itemView, R.id.expand_collapse) {
         private val binding = ItemHeaderExpandableBinding.bind(itemView)
 
         override fun bindItem(item: P) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapter.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapter.kt
index 5b1e871d7..0d57da76b 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapter.kt
@@ -24,9 +24,19 @@ import de.dreier.mytargets.shared.models.IIdProvider
 import de.dreier.mytargets.utils.multiselector.HeaderBindingHolder
 import java.util.*
 
-abstract class HeaderListAdapter<C : IIdProvider>(parentPartition: PartitionDelegate<SimpleHeader, C>, childComparator: Comparator<C>) : HeaderListAdapterBase<HeaderListAdapter.SimpleHeader, C, HeaderListAdapterBase.HeaderHolder<HeaderListAdapter.SimpleHeader, C>>(parentPartition, Comparator { obj, other -> obj.compareTo(other) }, childComparator) {
+abstract class HeaderListAdapter<C : IIdProvider>(
+    parentPartition: PartitionDelegate<SimpleHeader, C>,
+    childComparator: Comparator<C>
+) : HeaderListAdapterBase<HeaderListAdapter.SimpleHeader, C, HeaderListAdapterBase.HeaderHolder<HeaderListAdapter.SimpleHeader, C>>(
+    parentPartition,
+    Comparator { obj, other -> obj.compareTo(other) },
+    childComparator
+) {
 
-    override fun getHeaderHolder(parent: SimpleHeader, childComparator: Comparator<C>): HeaderListAdapterBase.HeaderHolder<SimpleHeader, C> {
+    override fun getHeaderHolder(
+        parent: SimpleHeader,
+        childComparator: Comparator<C>
+    ): HeaderListAdapterBase.HeaderHolder<SimpleHeader, C> {
         return HeaderListAdapterBase.HeaderHolder(parent, childComparator)
     }
 
@@ -49,11 +59,12 @@ abstract class HeaderListAdapter<C : IIdProvider>(parentPartition: PartitionDele
 
     override fun getTopLevelViewHolder(parent: ViewGroup): HeaderViewHolder {
         val itemView = LayoutInflater.from(parent.context)
-                .inflate(R.layout.item_header, parent, false)
+            .inflate(R.layout.item_header, parent, false)
         return HeaderViewHolder(itemView)
     }
 
-    inner class HeaderViewHolder internal constructor(itemView: View) : HeaderBindingHolder<SimpleHeader>(itemView) {
+    inner class HeaderViewHolder internal constructor(itemView: View) :
+        HeaderBindingHolder<SimpleHeader>(itemView) {
         private val binding = ItemHeaderBinding.bind(itemView)
 
         override fun bindItem(item: SimpleHeader) {
@@ -61,7 +72,8 @@ abstract class HeaderListAdapter<C : IIdProvider>(parentPartition: PartitionDele
         }
     }
 
-    class SimpleHeader(index: Long, internal var title: String) : IIdProvider, Comparable<SimpleHeader> {
+    class SimpleHeader(index: Long, internal var title: String) : IIdProvider,
+        Comparable<SimpleHeader> {
         override var id: Long = index
 
         override fun compareTo(other: SimpleHeader): Int {
diff --git a/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt b/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt
index bdd0bc1f4..5543b4e06 100644
--- a/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/adapters/header/HeaderListAdapterBase.kt
@@ -24,9 +24,9 @@ import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 import java.util.*
 
 abstract class HeaderListAdapterBase<P : IIdProvider, C : IIdProvider, H : HeaderListAdapterBase.HeaderHolder<P, C>>(
-        private val partitionDelegate: PartitionDelegate<P, C>,
-        private val headerComparator: Comparator<P>,
-        private val childComparator: Comparator<C>
+    private val partitionDelegate: PartitionDelegate<P, C>,
+    private val headerComparator: Comparator<P>,
+    private val childComparator: Comparator<C>
 ) : ListAdapterBase<ItemBindingHolder<IIdProvider>, C>() {
 
     protected var headersList: MutableList<H> = ArrayList()
@@ -62,7 +62,10 @@ abstract class HeaderListAdapterBase<P : IIdProvider, C : IIdProvider, H : Heade
     }
 
     @Suppress("UNCHECKED_CAST")
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemBindingHolder<IIdProvider> {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int
+    ): ItemBindingHolder<IIdProvider> {
         return if (viewType == HEADER_TYPE) {
             getTopLevelViewHolder(parent) as ItemBindingHolder<IIdProvider>
         } else {
@@ -157,16 +160,20 @@ abstract class HeaderListAdapterBase<P : IIdProvider, C : IIdProvider, H : Heade
 
     override fun getItemById(id: Long): C? {
         return headersList
-                .flatMap { it.children }
-                .firstOrNull { it.id == id }
+            .flatMap { it.children }
+            .firstOrNull { it.id == id }
     }
 
     internal fun getHeaderIndex(h: H): Int {
-        return Collections.binarySearch(headersList, h
+        return Collections.binarySearch(
+            headersList, h
         ) { holder1, holder2 -> headerComparator.compare(holder1.item, holder2.item) }
     }
 
-    open class HeaderHolder<HEADER, CHILD> internal constructor(internal var item: HEADER, private val childComparator: Comparator<in CHILD>) {
+    open class HeaderHolder<HEADER, CHILD> internal constructor(
+        internal var item: HEADER,
+        private val childComparator: Comparator<in CHILD>
+    ) {
         internal var children: MutableList<CHILD> = mutableListOf()
 
         /**
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/AppDatabase.kt b/app/src/main/java/de/dreier/mytargets/base/db/AppDatabase.kt
index 0144bd7fb..875965cd3 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/AppDatabase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/AppDatabase.kt
@@ -22,29 +22,31 @@ import de.dreier.mytargets.base.db.dao.*
 import de.dreier.mytargets.base.db.typeconverters.*
 import de.dreier.mytargets.shared.models.db.*
 
-@Database(entities = [
-    Arrow::class,
-    ArrowImage::class,
-    Bow::class,
-    BowImage::class,
-    End::class,
-    EndImage::class,
-    Round::class,
-    RoundTemplate::class,
-    Shot::class,
-    SightMark::class,
-    Signature::class,
-    StandardRound::class,
-    Training::class
-], version = AppDatabase.VERSION)
+@Database(
+    entities = [
+        Arrow::class,
+        ArrowImage::class,
+        Bow::class,
+        BowImage::class,
+        End::class,
+        EndImage::class,
+        Round::class,
+        RoundTemplate::class,
+        Shot::class,
+        SightMark::class,
+        Signature::class,
+        StandardRound::class,
+        Training::class
+    ], version = AppDatabase.VERSION
+)
 @TypeConverters(
-        DimensionConverters::class,
-        ThumbnailConverters::class,
-        LocalDateConverters::class,
-        EWeatherConverters::class,
-        BitmapConverters::class,
-        LocalTimeConverters::class,
-        EBowTypeConverters::class
+    DimensionConverters::class,
+    ThumbnailConverters::class,
+    LocalDateConverters::class,
+    EWeatherConverters::class,
+    BitmapConverters::class,
+    LocalTimeConverters::class,
+    EBowTypeConverters::class
 )
 abstract class AppDatabase : RoomDatabase() {
     companion object {
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/EndRepository.kt b/app/src/main/java/de/dreier/mytargets/base/db/EndRepository.kt
index 2e700cd36..07d622685 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/EndRepository.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/EndRepository.kt
@@ -19,11 +19,17 @@ import de.dreier.mytargets.base.db.dao.EndDAO
 import de.dreier.mytargets.shared.models.augmented.AugmentedEnd
 
 class EndRepository(
-        private val endDAO: EndDAO
+    private val endDAO: EndDAO
 ) {
     fun loadAugmentedEnds(roundId: Long): List<AugmentedEnd> {
         return endDAO.loadEnds(roundId)
-                .map { AugmentedEnd(it, endDAO.loadShots(it.id).toMutableList(), endDAO.loadEndImages(it.id).toMutableList()) }
-                .toMutableList()
+            .map {
+                AugmentedEnd(
+                    it,
+                    endDAO.loadShots(it.id).toMutableList(),
+                    endDAO.loadEndImages(it.id).toMutableList()
+                )
+            }
+            .toMutableList()
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/StandardRoundFactory.kt b/app/src/main/java/de/dreier/mytargets/base/db/StandardRoundFactory.kt
index 69b193f1d..ebe600d7c 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/StandardRoundFactory.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/StandardRoundFactory.kt
@@ -53,642 +53,1434 @@ object StandardRoundFactory {
         roundCounter = 0
 
         // Indoor
-        rounds.add(build(AUSTRALIAN, R.string.australian_combined_indoor,
-                METER, CENTIMETER,
-                WA5Ring.ID, 0, 3, 18, 40, 10, 25, 60, 10))
-        rounds.add(build(AUSTRALIAN, R.string.australian_indoor_1,
-                METER, CENTIMETER,
-                WA5Ring.ID, 0, 3, 18, 40, 10))
-        rounds.add(build(AUSTRALIAN, R.string.australian_indoor_2,
-                METER, CENTIMETER,
-                WA5Ring.ID, 0, 3, 25, 60, 10))
-        rounds.add(build(ASA, R.string.dair_380,
-                METER, CENTIMETER,
-                DAIR3D.ID, 0, 3, 25, 60, 10))
-        rounds.add(build(WA, R.string.wa_18_40cm,
-                METER, CENTIMETER,
-                WA5Ring.ID, 0, 3, 18, 40, 20))
-        rounds.add(build(WA, R.string.wa_18_60cm,
-                METER, CENTIMETER,
-                WA5Ring.ID, 0, 3, 18, 60, 20))
-        rounds.add(build(WA, R.string.wa_25,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 3, 25, 60, 20))
-        rounds.add(build(WA, R.string.wa_combined,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 3, 25, 60, 20, 18, 40, 20))
-        rounds.add(build(WA, R.string.match_round,
-                METER, CENTIMETER,
-                WAVertical3Spot.ID, 0, 3, 18, 40, 4))
-        rounds.add(build(ARCHERY_GB, R.string.stafford,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 3, 30, 80, 24))
-        rounds.add(build(ARCHERY_GB, R.string.bray_i,
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.australian_combined_indoor,
+                METER, CENTIMETER,
+                WA5Ring.ID, 0, 3, 18, 40, 10, 25, 60, 10
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.australian_indoor_1,
+                METER, CENTIMETER,
+                WA5Ring.ID, 0, 3, 18, 40, 10
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.australian_indoor_2,
+                METER, CENTIMETER,
+                WA5Ring.ID, 0, 3, 25, 60, 10
+            )
+        )
+        rounds.add(
+            build(
+                ASA, R.string.dair_380,
+                METER, CENTIMETER,
+                DAIR3D.ID, 0, 3, 25, 60, 10
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_18_40cm,
+                METER, CENTIMETER,
+                WA5Ring.ID, 0, 3, 18, 40, 20
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_18_60cm,
+                METER, CENTIMETER,
+                WA5Ring.ID, 0, 3, 18, 60, 20
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_25,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 3, 25, 60, 20
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_combined,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 3, 25, 60, 20, 18, 40, 20
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.match_round,
+                METER, CENTIMETER,
+                WAVertical3Spot.ID, 0, 3, 18, 40, 4
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.stafford,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 3, 30, 80, 24
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.bray_i,
                 YARDS, CENTIMETER,
-                WAFull.ID, 0, 6, 20, 40, 5))
-        rounds.add(build(ARCHERY_GB, R.string.bray_ii,
+                WAFull.ID, 0, 6, 20, 40, 5
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.bray_ii,
                 YARDS, CENTIMETER,
-                WAFull.ID, 0, 6, 25, 60, 5))
-        rounds.add(build(ARCHERY_GB, R.string.portsmouth,
+                WAFull.ID, 0, 6, 25, 60, 5
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.portsmouth,
                 YARDS, CENTIMETER,
-                WAFull.ID, 0, 3, 20, 60, 20))
-        rounds.add(build(ARCHERY_GB, R.string.worcester,
+                WAFull.ID, 0, 3, 20, 60, 20
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.worcester,
                 YARDS, INCH,
-                Worcester.ID, 0, 5, 20, 16, 12))
-        rounds.add(build(ARCHERY_GB, R.string.vegas_300,
+                Worcester.ID, 0, 5, 20, 16, 12
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.vegas_300,
                 YARDS, CENTIMETER,
-                WA5Ring.ID, 0, 3, 20, 40, 20))
-        rounds.add(build(IFAA, R.string.ifaa_150_indoor,
+                WA5Ring.ID, 0, 3, 20, 40, 20
+            )
+        )
+        rounds.add(
+            build(
+                IFAA, R.string.ifaa_150_indoor,
                 YARDS, CENTIMETER,
-                WA5Ring.ID, 0, 5, 20, 40, 6))
-        rounds.add(build(IFAA, R.string.ifaa_150_indoor_cub,
+                WA5Ring.ID, 0, 5, 20, 40, 6
+            )
+        )
+        rounds.add(
+            build(
+                IFAA, R.string.ifaa_150_indoor_cub,
                 YARDS, CENTIMETER,
-                WA5Ring.ID, 0, 5, 10, 40, 6))
-        rounds.add(build(NASP, R.string.nasp_300,
-                METER, CENTIMETER,
-                WA5Ring.ID, 0, 5, 10, 80, 3, 15, 80, 3))
-        rounds.add(build(NFAA, R.string.nfaa_420,
+                WA5Ring.ID, 0, 5, 10, 40, 6
+            )
+        )
+        rounds.add(
+            build(
+                NASP, R.string.nasp_300,
+                METER, CENTIMETER,
+                WA5Ring.ID, 0, 5, 10, 80, 3, 15, 80, 3
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_420,
                 YARDS, CENTIMETER,
-                NFAAIndoor.ID, 2, 5, 10, 40, 12))
-        rounds.add(build(NFAA, R.string.nfaa_300_cub,
+                NFAAIndoor.ID, 2, 5, 10, 40, 12
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_300_cub,
                 YARDS, CENTIMETER,
-                NFAAIndoor.ID, 2, 5, 20, 40, 12))
-        rounds.add(build(NFAA, R.string.flint_bowman_indoor,
+                NFAAIndoor.ID, 2, 5, 20, 40, 12
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.flint_bowman_indoor,
                 YARDS, CENTIMETER,
-                NFAAField.ID, 0, 4, -1, -1, 7))
+                NFAAField.ID, 0, 4, -1, -1, 7
+            )
+        )
 
         // WA
-        rounds.add(build(WA, R.string.wa_50,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 50, 80, 12))
-        rounds.add(build(WA, R.string.wa_60,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 60, 122, 12))
-        rounds.add(build(WA, R.string.wa_70,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 70, 122, 12))
-        rounds.add(build(WA, R.string.wa_900,
+        rounds.add(
+            build(
+                WA, R.string.wa_50,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 50, 80, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_60,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 60, 122, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_70,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 70, 122, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_900,
                 METER, CENTIMETER,
                 WAFull.ID, 0, 6, 60, 122, 5, 50, 122, 5,
-                40, 122, 5))
-        rounds.add(build(WA, R.string.wa_bowman,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 30, 122, 6, 25, 122, 6, 25, 80, 6, 20, 80, 6))
-        rounds.add(build(WA, R.string.wa_1440_cadet_men,
+                40, 122, 5
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_bowman,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 30, 122, 6, 25, 122, 6, 25, 80, 6, 20, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_1440_cadet_men,
                 METER, CENTIMETER,
                 WAFull.ID, 0, 6, 70, 122, 6, 60, 122, 6,
-                50, 80, 6, 30, 80, 6))
-        rounds.add(build(WA, R.string.wa_1440_cadet_women,
+                50, 80, 6, 30, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_1440_cadet_women,
                 METER, CENTIMETER,
                 WAFull.ID, 0, 6, 60, 122, 6,
-                50, 122, 6, 40, 80, 6, 30, 80, 6))
-        rounds.add(build(WA, R.string.wa_compound_individual,
-                METER, CENTIMETER,
-                WA6Ring.ID, 0, 3, 50, 80, 5))
-        rounds.add(build(WA, R.string.wa_compound_qualification,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 50, 80, 12))
-        rounds.add(build(WA, R.string.wa_cub,
+                50, 122, 6, 40, 80, 6, 30, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_compound_individual,
+                METER, CENTIMETER,
+                WA6Ring.ID, 0, 3, 50, 80, 5
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_compound_qualification,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 50, 80, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_cub,
                 METER, CENTIMETER,
                 WAFull.ID, 0, 6, 50, 122, 6, 40, 122, 6, 30, 80,
-                6, 20, 80, 6))
-        rounds.add(build(WA, R.string.wa_standard,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 50, 122, 6, 30, 122, 6))
-        rounds.add(build(WA, R.string.olympic_round,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 3, 70, 122, 4))
+                6, 20, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_standard,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 50, 122, 6, 30, 122, 6
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.olympic_round,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 3, 70, 122, 4
+            )
+        )
 
-        rounds.add(build(WA, R.string.wa_1440_junior_men,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 90, 122, 6, 70, 122, 6, 50, 80, 6, 30, 80, 6))
-        rounds.add(build(WA, R.string.wa_1440_junior_women,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 70, 122, 6, 60, 122, 6, 50, 80, 6, 30, 80, 6))
+        rounds.add(
+            build(
+                WA, R.string.wa_1440_junior_men,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 90, 122, 6, 70, 122, 6, 50, 80, 6, 30, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_1440_junior_women,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 70, 122, 6, 60, 122, 6, 50, 80, 6, 30, 80, 6
+            )
+        )
 
-        rounds.add(build(WA, R.string.wa_1440_men_master_50,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 70, 122, 6, 60, 122, 6, 50, 80, 6, 30, 80, 6))
-        rounds.add(build(WA, R.string.wa_1440_men_master_60,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 70, 122, 6, 60, 122, 6, 50, 80, 6, 30, 80, 6))
-        rounds.add(build(WA, R.string.wa_1440_men_master_70,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 60, 122, 6, 50, 122, 6, 40, 80, 6, 30, 80, 6))
-        rounds.add(build(WA, R.string.wa_1440_men_senior,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 90, 122, 6, 70, 122, 6, 50, 80, 6, 30, 80, 6))
-        rounds.add(build(WA, R.string.wa_1440_women_master_50,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 60, 122, 6, 50, 122, 6, 40, 80, 6, 30, 80, 6))
-        rounds.add(build(WA, R.string.wa_1440_women_master_60,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 60, 122, 6, 50, 122, 6, 40, 80, 6, 30, 80, 6))
-        rounds.add(build(WA, R.string.wa_1440_women_master_70,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 60, 122, 6, 50, 122, 6, 40, 80, 6, 30, 80, 6))
-        rounds.add(build(WA, R.string.wa_1440_women_senior,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 70, 122, 6, 60, 122, 6, 50, 80, 6, 30, 80, 6))
-        rounds.add(build(WA, R.string.half_wa_1440_cadet_men,
+        rounds.add(
+            build(
+                WA, R.string.wa_1440_men_master_50,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 70, 122, 6, 60, 122, 6, 50, 80, 6, 30, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_1440_men_master_60,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 70, 122, 6, 60, 122, 6, 50, 80, 6, 30, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_1440_men_master_70,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 60, 122, 6, 50, 122, 6, 40, 80, 6, 30, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_1440_men_senior,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 90, 122, 6, 70, 122, 6, 50, 80, 6, 30, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_1440_women_master_50,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 60, 122, 6, 50, 122, 6, 40, 80, 6, 30, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_1440_women_master_60,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 60, 122, 6, 50, 122, 6, 40, 80, 6, 30, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_1440_women_master_70,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 60, 122, 6, 50, 122, 6, 40, 80, 6, 30, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_1440_women_senior,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 70, 122, 6, 60, 122, 6, 50, 80, 6, 30, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.half_wa_1440_cadet_men,
                 METER, METER,
                 WAFull.ID, 0, 6, 70, 122, 3, 60, 122, 3,
-                50, 80, 3, 30, 80, 3))
-        rounds.add(build(WA, R.string.half_wa_1440_cadet_women,
+                50, 80, 3, 30, 80, 3
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.half_wa_1440_cadet_women,
                 METER, METER,
                 WAFull.ID, 0, 6, 60, 122, 3, 50, 122, 3,
-                40, 80, 3, 30, 80, 3))
-        rounds.add(build(WA, R.string.half_wa_1440_junior_men,
+                40, 80, 3, 30, 80, 3
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.half_wa_1440_junior_men,
                 METER, CENTIMETER,
                 WAFull.ID, 0, 6, 90, 122, 3,
-                70, 122, 3, 50, 80, 3, 30, 80, 3))
-        rounds.add(build(WA, R.string.half_wa_1440_junior_women,
+                70, 122, 3, 50, 80, 3, 30, 80, 3
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.half_wa_1440_junior_women,
                 METER, CENTIMETER,
                 WAFull.ID, 0, 6, 70, 122, 3,
-                60, 122, 3, 50, 80, 3, 30, 80, 3))
-        rounds.add(build(WA, R.string.half_wa_1440_men_master_50,
+                60, 122, 3, 50, 80, 3, 30, 80, 3
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.half_wa_1440_men_master_50,
                 METER, CENTIMETER,
                 WAFull.ID, 0, 6, 70, 122, 3,
-                60, 122, 3, 50, 80, 3, 30, 80, 3))
-        rounds.add(build(WA, R.string.half_wa_1440_men_master_60,
+                60, 122, 3, 50, 80, 3, 30, 80, 3
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.half_wa_1440_men_master_60,
                 METER, CENTIMETER,
                 WAFull.ID, 0, 6, 70, 122, 3,
-                60, 122, 3, 50, 80, 3, 30, 80, 3))
-        rounds.add(build(WA, R.string.half_wa_1440_men_master_70,
+                60, 122, 3, 50, 80, 3, 30, 80, 3
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.half_wa_1440_men_master_70,
                 METER, CENTIMETER,
                 WAFull.ID, 0, 6, 60, 122, 3,
-                50, 122, 3, 40, 80, 3, 30, 80, 3))
-        rounds.add(build(WA, R.string.half_wa_1440_men_senior,
+                50, 122, 3, 40, 80, 3, 30, 80, 3
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.half_wa_1440_men_senior,
                 METER, CENTIMETER,
                 WAFull.ID, 0, 6, 90, 122, 3,
-                70, 122, 3, 50, 80, 3, 30, 80, 3))
-        rounds.add(build(WA, R.string.half_wa_1440_women_master_50,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 60, 122, 3, 50, 122, 3, 40, 80, 3, 30, 80, 3))
-        rounds.add(build(WA, R.string.half_wa_1440_women_master_60,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 60, 122, 3, 50, 122, 3, 40, 80, 3, 30, 80, 3))
-        rounds.add(build(WA, R.string.half_wa_1440_women_master_70,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 60, 122, 3, 50, 122, 3, 40, 80, 3, 30, 80, 3))
-        rounds.add(build(WA, R.string.half_wa_1440_women_senior,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 70, 122, 3, 60, 122, 3, 50, 80, 3, 30, 80, 3))
-        rounds.add(build(WA, R.string.wa_double_720_30_80cm,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 30, 80, 12, 30, 80, 12))
-        rounds.add(build(WA, R.string.wa_double_720_40_80cm,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 40, 80, 12, 40, 80, 12))
-        rounds.add(build(WA, R.string.wa_double_720_40_122cm,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 40, 122, 12, 40, 122, 12))
-        rounds.add(build(WA, R.string.wa_double_720_50_80cm,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 50, 80, 12, 50, 80, 12))
-        rounds.add(build(WA, R.string.wa_double_720_50_122cm,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 50, 122, 12, 50, 122, 12))
-        rounds.add(build(WA, R.string.wa_double_720_60_122cm,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 60, 122, 12, 60, 122, 12))
-        rounds.add(build(WA, R.string.wa_double_720_70_122cm,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 70, 122, 12, 70, 122, 12))
-        rounds.add(build(WA, R.string.wa_individual_compound_eleminiation_18,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 3, 18, 40, 5))
-        rounds.add(build(WA, R.string.wa_individual_compound_eleminiation_40,
-                METER, CENTIMETER,
-                WA6Ring.ID, 0, 3, 40, 80, 5))
-        rounds.add(build(WA, R.string.wa_individual_compound_eleminiation_50,
-                METER, CENTIMETER,
-                WA6Ring.ID, 0, 3, 50, 80, 5))
-        rounds.add(build(WA, R.string.wa_recurve_elimination_18,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 3, 18, 40, 5))
-        rounds.add(build(WA, R.string.wa_recurve_elimination_50,
-                METER, CENTIMETER,
-                WA6Ring.ID, 0, 3, 50, 122, 5))
-        rounds.add(build(WA, R.string.wa_recurve_elimination_60,
-                METER, CENTIMETER,
-                WA6Ring.ID, 0, 3, 60, 122, 5))
-        rounds.add(build(WA, R.string.wa_recurve_elimination_70,
-                METER, CENTIMETER,
-                WA6Ring.ID, 0, 3, 70, 122, 5))
+                70, 122, 3, 50, 80, 3, 30, 80, 3
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.half_wa_1440_women_master_50,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 60, 122, 3, 50, 122, 3, 40, 80, 3, 30, 80, 3
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.half_wa_1440_women_master_60,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 60, 122, 3, 50, 122, 3, 40, 80, 3, 30, 80, 3
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.half_wa_1440_women_master_70,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 60, 122, 3, 50, 122, 3, 40, 80, 3, 30, 80, 3
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.half_wa_1440_women_senior,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 70, 122, 3, 60, 122, 3, 50, 80, 3, 30, 80, 3
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_double_720_30_80cm,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 30, 80, 12, 30, 80, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_double_720_40_80cm,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 40, 80, 12, 40, 80, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_double_720_40_122cm,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 40, 122, 12, 40, 122, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_double_720_50_80cm,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 50, 80, 12, 50, 80, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_double_720_50_122cm,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 50, 122, 12, 50, 122, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_double_720_60_122cm,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 60, 122, 12, 60, 122, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_double_720_70_122cm,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 70, 122, 12, 70, 122, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_individual_compound_eleminiation_18,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 3, 18, 40, 5
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_individual_compound_eleminiation_40,
+                METER, CENTIMETER,
+                WA6Ring.ID, 0, 3, 40, 80, 5
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_individual_compound_eleminiation_50,
+                METER, CENTIMETER,
+                WA6Ring.ID, 0, 3, 50, 80, 5
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_recurve_elimination_18,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 3, 18, 40, 5
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_recurve_elimination_50,
+                METER, CENTIMETER,
+                WA6Ring.ID, 0, 3, 50, 122, 5
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_recurve_elimination_60,
+                METER, CENTIMETER,
+                WA6Ring.ID, 0, 3, 60, 122, 5
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_recurve_elimination_70,
+                METER, CENTIMETER,
+                WA6Ring.ID, 0, 3, 70, 122, 5
+            )
+        )
 
         // ARCHERY_GB Imperial
-        rounds.add(build(ARCHERY_GB, R.string.albion,
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.albion,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 80, 122, 6, 60, 122, 6, 50, 122, 6))
-        rounds.add(build(ARCHERY_GB, R.string.american,
+                WAFull.ID, 5, 6, 80, 122, 6, 60, 122, 6, 50, 122, 6
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.american,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 60, 122, 5, 50, 122, 5, 40, 122, 5))
+                WAFull.ID, 5, 6, 60, 122, 5, 50, 122, 5, 40, 122, 5
+            )
+        )
 
-        rounds.add(build(ARCHERY_GB, R.string.bristol_i,
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.bristol_i,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 80, 122, 12, 60, 122, 8, 50, 122, 4))
-        rounds.add(build(ARCHERY_GB, R.string.bristol_ii,
+                WAFull.ID, 5, 6, 80, 122, 12, 60, 122, 8, 50, 122, 4
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.bristol_ii,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 60, 122, 12, 50, 122, 8, 40, 122, 4))
-        rounds.add(build(ARCHERY_GB, R.string.bristol_iii,
+                WAFull.ID, 5, 6, 60, 122, 12, 50, 122, 8, 40, 122, 4
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.bristol_iii,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 50, 122, 12, 40, 122, 8, 30, 122, 4))
-        rounds.add(build(ARCHERY_GB, R.string.bristol_iv,
+                WAFull.ID, 5, 6, 50, 122, 12, 40, 122, 8, 30, 122, 4
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.bristol_iv,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 40, 122, 12, 30, 122, 8, 20, 122, 4))
-        rounds.add(build(ARCHERY_GB, R.string.bristol_v,
+                WAFull.ID, 5, 6, 40, 122, 12, 30, 122, 8, 20, 122, 4
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.bristol_v,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 30, 122, 12, 20, 122, 8, 10, 122, 4))
+                WAFull.ID, 5, 6, 30, 122, 12, 20, 122, 8, 10, 122, 4
+            )
+        )
 
-        rounds.add(build(ARCHERY_GB, R.string.hereford,
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.hereford,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 80, 122, 12, 60, 122, 8, 50, 122, 4))
+                WAFull.ID, 5, 6, 80, 122, 12, 60, 122, 8, 50, 122, 4
+            )
+        )
 
-        rounds.add(build(ARCHERY_GB, R.string.short_junior_national,
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.short_junior_national,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 30, 122, 8, 20, 122, 4))
-        rounds.add(build(ARCHERY_GB, R.string.short_junior_warwick,
+                WAFull.ID, 5, 6, 30, 122, 8, 20, 122, 4
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.short_junior_warwick,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 30, 122, 4, 20, 122, 4))
-        rounds.add(build(ARCHERY_GB, R.string.short_junior_western,
+                WAFull.ID, 5, 6, 30, 122, 4, 20, 122, 4
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.short_junior_western,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 30, 122, 8, 20, 122, 8))
-        rounds.add(build(ARCHERY_GB, R.string.short_junior_windsor,
+                WAFull.ID, 5, 6, 30, 122, 8, 20, 122, 8
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.short_junior_windsor,
                 YARDS, CENTIMETER,
                 WAFull.ID, 5, 6, 30, 122, 6, 20,
-                122, 6, 10, 122, 6))
+                122, 6, 10, 122, 6
+            )
+        )
 
-        rounds.add(build(ARCHERY_GB, R.string.junior_national,
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.junior_national,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 40, 122, 8, 30, 122, 4))
-        rounds.add(build(ARCHERY_GB, R.string.junior_warwick,
+                WAFull.ID, 5, 6, 40, 122, 8, 30, 122, 4
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.junior_warwick,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 40, 122, 4, 30, 122, 4))
-        rounds.add(build(ARCHERY_GB, R.string.junior_western,
+                WAFull.ID, 5, 6, 40, 122, 4, 30, 122, 4
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.junior_western,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 40, 122, 8, 30, 122, 8))
-        rounds.add(build(ARCHERY_GB, R.string.junior_windsor,
+                WAFull.ID, 5, 6, 40, 122, 8, 30, 122, 8
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.junior_windsor,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 40, 122, 6, 30, 122, 6, 20, 122, 6))
+                WAFull.ID, 5, 6, 40, 122, 6, 30, 122, 6, 20, 122, 6
+            )
+        )
 
-        rounds.add(build(ARCHERY_GB, R.string.short_national,
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.short_national,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 50, 122, 8, 40, 122, 4))
-        rounds.add(build(ARCHERY_GB, R.string.short_warwick,
+                WAFull.ID, 5, 6, 50, 122, 8, 40, 122, 4
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.short_warwick,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 50, 122, 4, 40, 122, 4))
-        rounds.add(build(ARCHERY_GB, R.string.short_western,
+                WAFull.ID, 5, 6, 50, 122, 4, 40, 122, 4
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.short_western,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 50, 122, 8, 40, 122, 8))
-        rounds.add(build(ARCHERY_GB, R.string.short_windsor,
+                WAFull.ID, 5, 6, 50, 122, 8, 40, 122, 8
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.short_windsor,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 50, 122, 6, 40, 122, 6, 30, 122, 6))
+                WAFull.ID, 5, 6, 50, 122, 6, 40, 122, 6, 30, 122, 6
+            )
+        )
 
-        rounds.add(build(ARCHERY_GB, R.string.national,
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.national,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 60, 122, 8, 50, 122, 4))
-        rounds.add(build(ARCHERY_GB, R.string.st_george,
+                WAFull.ID, 5, 6, 60, 122, 8, 50, 122, 4
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.st_george,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 100, 122, 6, 80, 122, 6, 60, 122, 6))
-        rounds.add(build(ARCHERY_GB, R.string.st_nicholas,
+                WAFull.ID, 5, 6, 100, 122, 6, 80, 122, 6, 60, 122, 6
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.st_nicholas,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 40, 122, 8, 30, 122, 6))
-        rounds.add(build(ARCHERY_GB, R.string.warwick,
+                WAFull.ID, 5, 6, 40, 122, 8, 30, 122, 6
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.warwick,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 60, 122, 4, 50, 122, 4))
-        rounds.add(build(ARCHERY_GB, R.string.western,
+                WAFull.ID, 5, 6, 60, 122, 4, 50, 122, 4
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.western,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 60, 122, 8, 50, 122, 8))
-        rounds.add(build(ARCHERY_GB, R.string.windsor,
+                WAFull.ID, 5, 6, 60, 122, 8, 50, 122, 8
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.windsor,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 60, 122, 6, 50, 122, 6, 40, 122, 6))
-        rounds.add(build(ARCHERY_GB, R.string.york,
+                WAFull.ID, 5, 6, 60, 122, 6, 50, 122, 6, 40, 122, 6
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.york,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 100, 122, 12, 80, 122, 8, 60, 122, 4))
+                WAFull.ID, 5, 6, 100, 122, 12, 80, 122, 8, 60, 122, 4
+            )
+        )
 
-        rounds.add(build(ARCHERY_GB, R.string.long_national,
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.long_national,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 80, 122, 8, 60, 122, 4))
-        rounds.add(build(ARCHERY_GB, R.string.long_warwick,
+                WAFull.ID, 5, 6, 80, 122, 8, 60, 122, 4
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.long_warwick,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 80, 122, 4, 60, 122, 4))
-        rounds.add(build(ARCHERY_GB, R.string.long_western,
+                WAFull.ID, 5, 6, 80, 122, 4, 60, 122, 4
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.long_western,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 80, 122, 8, 60, 122, 8))
+                WAFull.ID, 5, 6, 80, 122, 8, 60, 122, 8
+            )
+        )
 
-        rounds.add(build(ARCHERY_GB, R.string.new_national,
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.new_national,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 100, 122, 8, 80, 122, 4))
-        rounds.add(build(ARCHERY_GB, R.string.new_warwick,
+                WAFull.ID, 5, 6, 100, 122, 8, 80, 122, 4
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.new_warwick,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 100, 122, 4, 80, 122, 4))
-        rounds.add(build(ARCHERY_GB, R.string.new_western,
+                WAFull.ID, 5, 6, 100, 122, 4, 80, 122, 4
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.new_western,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 6, 100, 122, 8, 80, 122, 8))
+                WAFull.ID, 5, 6, 100, 122, 8, 80, 122, 8
+            )
+        )
 
         // ARCHERY_GB Metric
-        rounds.add(build(ARCHERY_GB, R.string.frostbite,
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.frostbite,
                 METER, CENTIMETER,
-                WAFull.ID, 0, 3, 30, 80, 12))
-        rounds.add(build(ARCHERY_GB, R.string.half_metric_i,
+                WAFull.ID, 0, 3, 30, 80, 12
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.half_metric_i,
                 METER, CENTIMETER,
                 WAFull.ID, 0, 6, 70, 122, 3, 60,
-                122, 3, 50, 80, 3, 30, 80, 3))
-        rounds.add(build(ARCHERY_GB, R.string.half_metric_ii,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 60, 122, 3, 50, 122, 3, 40, 80, 3, 30, 80, 3))
-        rounds.add(build(ARCHERY_GB, R.string.half_metric_iii,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 50, 122, 3, 40, 122, 3, 30, 80, 3, 20, 80, 3))
-        rounds.add(build(ARCHERY_GB, R.string.half_metric_iv,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 40, 122, 3, 30, 122, 3, 20, 80, 3, 10, 80, 3))
-        rounds.add(build(ARCHERY_GB, R.string.half_metric_v,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 30, 122, 3, 20, 122, 3, 15, 80, 3, 10, 80, 3))
+                122, 3, 50, 80, 3, 30, 80, 3
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.half_metric_ii,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 60, 122, 3, 50, 122, 3, 40, 80, 3, 30, 80, 3
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.half_metric_iii,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 50, 122, 3, 40, 122, 3, 30, 80, 3, 20, 80, 3
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.half_metric_iv,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 40, 122, 3, 30, 122, 3, 20, 80, 3, 10, 80, 3
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.half_metric_v,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 30, 122, 3, 20, 122, 3, 15, 80, 3, 10, 80, 3
+            )
+        )
 
-        rounds.add(build(ARCHERY_GB, R.string.short_metric_i,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 50, 80, 6, 30, 80, 6))
-        rounds.add(build(ARCHERY_GB, R.string.short_metric_ii,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 40, 80, 6, 30, 80, 6))
-        rounds.add(build(ARCHERY_GB, R.string.short_metric_iii,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 30, 80, 6, 20, 80, 6))
-        rounds.add(build(ARCHERY_GB, R.string.short_metric_iv,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 20, 80, 6, 10, 80, 6))
-        rounds.add(build(ARCHERY_GB, R.string.short_metric_v,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 15, 80, 6, 10, 80, 6))
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.short_metric_i,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 50, 80, 6, 30, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.short_metric_ii,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 40, 80, 6, 30, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.short_metric_iii,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 30, 80, 6, 20, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.short_metric_iv,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 20, 80, 6, 10, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.short_metric_v,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 15, 80, 6, 10, 80, 6
+            )
+        )
 
-        rounds.add(build(ARCHERY_GB, R.string.metric_i,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 70, 122, 6, 60, 122, 6, 50, 80, 6, 30, 80, 6))
-        rounds.add(build(ARCHERY_GB, R.string.metric_ii,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 60, 122, 6, 50, 122, 6, 40, 80, 6, 30, 80, 6))
-        rounds.add(build(ARCHERY_GB, R.string.metric_iii,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 50, 122, 6, 40, 122, 6, 30, 80, 6, 20, 80, 6))
-        rounds.add(build(ARCHERY_GB, R.string.metric_iv,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 40, 122, 6, 30, 122, 6, 20, 80, 6, 10, 80, 6))
-        rounds.add(build(ARCHERY_GB, R.string.metric_v,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 30, 122, 6, 20, 122, 6, 15, 80, 6, 10, 80, 6))
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.metric_i,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 70, 122, 6, 60, 122, 6, 50, 80, 6, 30, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.metric_ii,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 60, 122, 6, 50, 122, 6, 40, 80, 6, 30, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.metric_iii,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 50, 122, 6, 40, 122, 6, 30, 80, 6, 20, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.metric_iv,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 40, 122, 6, 30, 122, 6, 20, 80, 6, 10, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.metric_v,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 30, 122, 6, 20, 122, 6, 15, 80, 6, 10, 80, 6
+            )
+        )
 
-        rounds.add(build(ARCHERY_GB, R.string.long_metric_i,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 70, 122, 6, 60, 122, 6))
-        rounds.add(build(ARCHERY_GB, R.string.long_metric_ii,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 60, 122, 6, 50, 122, 6))
-        rounds.add(build(ARCHERY_GB, R.string.long_metric_iii,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 50, 122, 6, 40, 122, 6))
-        rounds.add(build(ARCHERY_GB, R.string.long_metric_iv,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 40, 122, 6, 30, 122, 6))
-        rounds.add(build(ARCHERY_GB, R.string.long_metric_v,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 30, 122, 6, 20, 122, 6))
-        rounds.add(build(ARCHERY_GB, R.string.long_metric_gents,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 90, 122, 6, 70, 122, 6))
-        rounds.add(build(ARCHERY_GB, R.string.long_metric_ladies,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 70, 122, 6, 60, 122, 6))
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.long_metric_i,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 70, 122, 6, 60, 122, 6
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.long_metric_ii,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 60, 122, 6, 50, 122, 6
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.long_metric_iii,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 50, 122, 6, 40, 122, 6
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.long_metric_iv,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 40, 122, 6, 30, 122, 6
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.long_metric_v,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 30, 122, 6, 20, 122, 6
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.long_metric_gents,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 90, 122, 6, 70, 122, 6
+            )
+        )
+        rounds.add(
+            build(
+                ARCHERY_GB, R.string.long_metric_ladies,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 70, 122, 6, 60, 122, 6
+            )
+        )
 
         // Australia
-        rounds.add(build(AUSTRALIAN, R.string.adelaide,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 60, 122, 5, 50, 122, 5, 40, 80, 5, 30, 80, 5))
-        rounds.add(build(AUSTRALIAN, R.string.brisbane,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 70, 122, 5, 60, 122, 5, 50, 80, 5, 40, 80, 5))
-        rounds.add(build(AUSTRALIAN, R.string.canberra,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 60, 122, 5, 50, 122, 5, 40, 122, 5))
-        rounds.add(build(AUSTRALIAN, R.string.darwin,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 40, 122, 15))
-        rounds.add(build(AUSTRALIAN, R.string.drake,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 30, 80, 15))
-        rounds.add(build(AUSTRALIAN, R.string.fremantle,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 60, 122, 6, 50, 122, 6, 40, 80, 6, 30, 80, 6))
-        rounds.add(build(AUSTRALIAN, R.string.geelong,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 30, 122, 15))
-        rounds.add(build(AUSTRALIAN, R.string.grange,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 60, 122, 15))
-        rounds.add(build(AUSTRALIAN, R.string.hobart,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 90, 122, 5, 70, 122, 5, 50, 122, 5))
-        rounds.add(build(AUSTRALIAN, R.string.holt,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 50, 80, 15))
-        rounds.add(build(AUSTRALIAN, R.string.horsham,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 40, 122, 6, 35, 122, 6, 30, 80, 6, 25, 80, 6))
-        rounds.add(build(AUSTRALIAN, R.string.intermediate,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 55, 122, 6, 45, 122, 6, 35, 80, 6, 25, 80, 6))
-        rounds.add(build(AUSTRALIAN, R.string.junior_canberra,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 40, 122, 5, 30, 122, 5, 20, 122, 5))
-        rounds.add(build(AUSTRALIAN, R.string.launcheston,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 50, 80, 6, 30, 80, 6))
-        rounds.add(build(AUSTRALIAN, R.string.long_brisbane,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 90, 122, 5, 70, 122, 5, 60, 80, 5, 50, 80, 5))
-        rounds.add(build(AUSTRALIAN, R.string.long_sydney,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 90, 122, 5, 70, 122, 5, 60, 122, 5, 50, 122, 5))
-        rounds.add(build(AUSTRALIAN, R.string.melbourne,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 90, 122, 15))
-        rounds.add(build(AUSTRALIAN, R.string.newcastle,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 20, 122, 15))
-        rounds.add(build(AUSTRALIAN, R.string.perth,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 70, 122, 5, 60, 122, 5, 50, 122, 5))
-        rounds.add(build(AUSTRALIAN, R.string.short_adelaide,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 50, 122, 5, 40, 122, 5, 30, 80, 5, 20, 80, 5))
-        rounds.add(build(AUSTRALIAN, R.string.short_canberra,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 50, 122, 5, 40, 122, 5, 30, 122, 5))
-        rounds.add(build(AUSTRALIAN, R.string.sydney,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 70, 122, 5, 60, 122, 5, 50, 122, 5, 40, 122, 5))
-        rounds.add(build(AUSTRALIAN, R.string.townsville,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 60, 122, 6, 50, 122, 6))
-        rounds.add(build(AUSTRALIAN, R.string.wollongong,
-                METER, CENTIMETER,
-                WAFull.ID, 0, 6, 90, 122, 6, 70, 122, 6))
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.adelaide,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 60, 122, 5, 50, 122, 5, 40, 80, 5, 30, 80, 5
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.brisbane,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 70, 122, 5, 60, 122, 5, 50, 80, 5, 40, 80, 5
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.canberra,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 60, 122, 5, 50, 122, 5, 40, 122, 5
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.darwin,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 40, 122, 15
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.drake,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 30, 80, 15
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.fremantle,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 60, 122, 6, 50, 122, 6, 40, 80, 6, 30, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.geelong,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 30, 122, 15
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.grange,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 60, 122, 15
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.hobart,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 90, 122, 5, 70, 122, 5, 50, 122, 5
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.holt,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 50, 80, 15
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.horsham,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 40, 122, 6, 35, 122, 6, 30, 80, 6, 25, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.intermediate,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 55, 122, 6, 45, 122, 6, 35, 80, 6, 25, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.junior_canberra,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 40, 122, 5, 30, 122, 5, 20, 122, 5
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.launcheston,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 50, 80, 6, 30, 80, 6
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.long_brisbane,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 90, 122, 5, 70, 122, 5, 60, 80, 5, 50, 80, 5
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.long_sydney,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 90, 122, 5, 70, 122, 5, 60, 122, 5, 50, 122, 5
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.melbourne,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 90, 122, 15
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.newcastle,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 20, 122, 15
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.perth,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 70, 122, 5, 60, 122, 5, 50, 122, 5
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.short_adelaide,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 50, 122, 5, 40, 122, 5, 30, 80, 5, 20, 80, 5
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.short_canberra,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 50, 122, 5, 40, 122, 5, 30, 122, 5
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.sydney,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 70, 122, 5, 60, 122, 5, 50, 122, 5, 40, 122, 5
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.townsville,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 60, 122, 6, 50, 122, 6
+            )
+        )
+        rounds.add(
+            build(
+                AUSTRALIAN, R.string.wollongong,
+                METER, CENTIMETER,
+                WAFull.ID, 0, 6, 90, 122, 6, 70, 122, 6
+            )
+        )
 
         // NFAA
-        rounds.add(build(NFAA, R.string.nfaa_600,
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_600,
                 YARDS, CENTIMETER,
-                WAFull.ID, 0, 5, 60, 122, 4, 50, 122, 4, 40, 122, 4))
-        rounds.add(build(NFAA, R.string.nfaa_600_classic,
+                WAFull.ID, 0, 5, 60, 122, 4, 50, 122, 4, 40, 122, 4
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_600_classic,
                 YARDS, CENTIMETER,
-                WAFull.ID, 0, 5, 40, 92, 4, 50, 92, 4, 60, 92, 4))
-        rounds.add(build(NFAA, R.string.nfaa_600_classic_cub,
+                WAFull.ID, 0, 5, 40, 92, 4, 50, 92, 4, 60, 92, 4
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_600_classic_cub,
                 YARDS, CENTIMETER,
-                WAFull.ID, 0, 5, 10, 92, 4, 20, 92, 4, 30, 92, 4))
-        rounds.add(build(NFAA, R.string.nfaa_600_classic_junior,
+                WAFull.ID, 0, 5, 10, 92, 4, 20, 92, 4, 30, 92, 4
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_600_classic_junior,
                 YARDS, CENTIMETER,
-                WAFull.ID, 0, 5, 30, 92, 4, 40, 92, 4, 50, 92, 4))
-        rounds.add(build(NFAA, R.string.nfaa_600_cub,
+                WAFull.ID, 0, 5, 30, 92, 4, 40, 92, 4, 50, 92, 4
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_600_cub,
                 YARDS, CENTIMETER,
-                WAFull.ID, 0, 5, 30, 122, 4, 20, 122, 4, 10, 122, 4))
-        rounds.add(build(NFAA, R.string.nfaa_600_junior,
+                WAFull.ID, 0, 5, 30, 122, 4, 20, 122, 4, 10, 122, 4
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_600_junior,
                 YARDS, CENTIMETER,
-                WAFull.ID, 0, 5, 50, 122, 4, 40, 122, 4, 30, 122, 4))
-        rounds.add(build(NFAA, R.string.nfaa_810,
+                WAFull.ID, 0, 5, 50, 122, 4, 40, 122, 4, 30, 122, 4
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_810,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 5, 60, 122, 6, 50, 122, 6, 40, 122, 6))
-        rounds.add(build(NFAA, R.string.nfaa_810_cub,
+                WAFull.ID, 5, 5, 60, 122, 6, 50, 122, 6, 40, 122, 6
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_810_cub,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 5, 30, 122, 6, 20, 122, 6, 10, 122, 6))
-        rounds.add(build(NFAA, R.string.nfaa_810_junior,
+                WAFull.ID, 5, 5, 30, 122, 6, 20, 122, 6, 10, 122, 6
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_810_junior,
                 YARDS, CENTIMETER,
-                WAFull.ID, 5, 5, 50, 122, 6, 40, 122, 6, 30, 122, 6))
-        rounds.add(build(NFAA, R.string.nfaa_900,
+                WAFull.ID, 5, 5, 50, 122, 6, 40, 122, 6, 30, 122, 6
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_900,
                 YARDS, CENTIMETER,
-                WAFull.ID, 0, 5, 60, 122, 6, 50, 122, 6, 40, 122, 6))
-        rounds.add(build(NFAA, R.string.nfaa_900_cub,
+                WAFull.ID, 0, 5, 60, 122, 6, 50, 122, 6, 40, 122, 6
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_900_cub,
                 YARDS, CENTIMETER,
-                WAFull.ID, 0, 5, 30, 122, 6, 20, 122, 6, 10, 122, 6))
-        rounds.add(build(NFAA, R.string.nfaa_900_junior,
+                WAFull.ID, 0, 5, 30, 122, 6, 20, 122, 6, 10, 122, 6
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_900_junior,
                 YARDS, CENTIMETER,
-                WAFull.ID, 0, 5, 50, 122, 6, 40, 122, 6, 30, 122, 6))
+                WAFull.ID, 0, 5, 50, 122, 6, 40, 122, 6, 30, 122, 6
+            )
+        )
 
         // Other
-        rounds.add(build(NFAA, R.string.canadian_900,
+        rounds.add(
+            build(
+                NFAA, R.string.canadian_900,
                 YARDS, CENTIMETER,
-                WAFull.ID, 0, 6, 55, 122, 5, 45, 122, 5, 35, 122, 5))
-        rounds.add(build(NFAA, R.string.t2s_900,
+                WAFull.ID, 0, 6, 55, 122, 5, 45, 122, 5, 35, 122, 5
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.t2s_900,
                 YARDS, CENTIMETER,
-                WAFull.ID, 0, 6, 35, 80, 5, 30, 80, 5, 25, 80, 5))
+                WAFull.ID, 0, 6, 35, 80, 5, 30, 80, 5, 25, 80, 5
+            )
+        )
 
         // Field
-        rounds.add(build(IFAA, R.string.ifaa_animal_280,
-                METER, CENTIMETER,
-                IFAAAnimal.ID, 0, 3, -1, -1, 14))
-        rounds.add(build(IFAA, R.string.ifaa_animal_300,
-                METER, CENTIMETER,
-                IFAAAnimal.ID, 0, 3, -1, -1, 15))
-        rounds.add(build(IFAA, R.string.ifaa_animal_560,
-                METER, CENTIMETER,
-                IFAAAnimal.ID, 0, 3, -1, -1, 14, -1, -1, 14))
-        rounds.add(build(NFAA, R.string.nfaa_international_150,
-                METER, CENTIMETER,
-                NFAAHunter.ID, 0, 3, -1, -1, 10))
-        rounds.add(build(NFAA, R.string.nfaa_international_300,
-                METER, CENTIMETER,
-                NFAAHunter.ID, 0, 3, -1, -1, 10, -1, -1, 10))
-        rounds.add(build(NFAA, R.string.nfaa_animal_280,
-                METER, CENTIMETER,
-                NFAAAnimal.ID, 0, 3, -1, -1, 14))
-        rounds.add(build(NFAA, R.string.nfaa_animal_300,
-                METER, CENTIMETER,
-                NFAAAnimal.ID, 0, 3, -1, -1, 15))
-        rounds.add(build(NFAA, R.string.nfaa_animal_588,
-                METER, CENTIMETER,
-                NFAAAnimal.ID, 0, 3, -1, -1, 14, -1, -1, 14))
-        rounds.add(build(NFAA, R.string.nfaa_lake_of_woods,
-                METER, CENTIMETER,
-                WAFull.ID, 4, 3, -1, -1, 10))
-        rounds.add(build(NFAA, R.string.nfaa_expert_field_300,
-                METER, CENTIMETER,
-                NFAAExpertField.ID, 0, 4, -1, -1, 15))
-        rounds.add(build(NFAA, R.string.nfaa_expert_field_only_560,
-                METER, CENTIMETER,
-                NFAAExpertField.ID, 0, 4, -1, -1, 14, -1, -1, 14))
-        rounds.add(build(NFAA, R.string.nfaa_field_280,
-                METER, CENTIMETER,
-                NFAAField.ID, 0, 4, -1, -1, 14))
-        rounds.add(build(NFAA, R.string.nfaa_field_300,
-                METER, CENTIMETER,
-                NFAAField.ID, 0, 4, -1, -1, 15))
-        rounds.add(build(NFAA, R.string.nfaa_field_560,
-                METER, CENTIMETER,
-                NFAAField.ID, 0, 4, -1, -1, 14, -1, -1, 14))
-        rounds.add(build(NFAA, R.string.nfaa_hunter_280,
-                METER, CENTIMETER,
-                NFAAHunter.ID, 0, 4, -1, -1, 14))
-        rounds.add(build(NFAA, R.string.nfaa_hunter_300,
-                METER, CENTIMETER,
-                NFAAHunter.ID, 0, 4, -1, -1, 15))
-        rounds.add(build(NFAA, R.string.nfaa_hunter_560,
-                METER, CENTIMETER,
-                NFAAHunter.ID, 0, 4, -1, -1, 14, -1, -1, 14))
-        rounds.add(build(NFAA, R.string.nfaa_field_hunter_560,
+        rounds.add(
+            build(
+                IFAA, R.string.ifaa_animal_280,
+                METER, CENTIMETER,
+                IFAAAnimal.ID, 0, 3, -1, -1, 14
+            )
+        )
+        rounds.add(
+            build(
+                IFAA, R.string.ifaa_animal_300,
+                METER, CENTIMETER,
+                IFAAAnimal.ID, 0, 3, -1, -1, 15
+            )
+        )
+        rounds.add(
+            build(
+                IFAA, R.string.ifaa_animal_560,
+                METER, CENTIMETER,
+                IFAAAnimal.ID, 0, 3, -1, -1, 14, -1, -1, 14
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_international_150,
+                METER, CENTIMETER,
+                NFAAHunter.ID, 0, 3, -1, -1, 10
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_international_300,
+                METER, CENTIMETER,
+                NFAAHunter.ID, 0, 3, -1, -1, 10, -1, -1, 10
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_animal_280,
+                METER, CENTIMETER,
+                NFAAAnimal.ID, 0, 3, -1, -1, 14
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_animal_300,
+                METER, CENTIMETER,
+                NFAAAnimal.ID, 0, 3, -1, -1, 15
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_animal_588,
+                METER, CENTIMETER,
+                NFAAAnimal.ID, 0, 3, -1, -1, 14, -1, -1, 14
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_lake_of_woods,
+                METER, CENTIMETER,
+                WAFull.ID, 4, 3, -1, -1, 10
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_expert_field_300,
+                METER, CENTIMETER,
+                NFAAExpertField.ID, 0, 4, -1, -1, 15
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_expert_field_only_560,
+                METER, CENTIMETER,
+                NFAAExpertField.ID, 0, 4, -1, -1, 14, -1, -1, 14
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_field_280,
+                METER, CENTIMETER,
+                NFAAField.ID, 0, 4, -1, -1, 14
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_field_300,
+                METER, CENTIMETER,
+                NFAAField.ID, 0, 4, -1, -1, 15
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_field_560,
+                METER, CENTIMETER,
+                NFAAField.ID, 0, 4, -1, -1, 14, -1, -1, 14
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_hunter_280,
+                METER, CENTIMETER,
+                NFAAHunter.ID, 0, 4, -1, -1, 14
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_hunter_300,
+                METER, CENTIMETER,
+                NFAAHunter.ID, 0, 4, -1, -1, 15
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_hunter_560,
+                METER, CENTIMETER,
+                NFAAHunter.ID, 0, 4, -1, -1, 14, -1, -1, 14
+            )
+        )
+        rounds.add(
+            build(
+                NFAA, R.string.nfaa_field_hunter_560,
                 METER, CENTIMETER,
                 NFAAField.ID, 0, Target(NFAAHunter.ID, 0, Dimension.UNKNOWN), 4, -1, -1,
-                14, -1, -1, 14))
-        rounds.add(build(WA, R.string.wa_field_unmarked_marked_red,
-                METER, CENTIMETER,
-                WAField.ID, 1, 3, -1, -1, 12, -1, -1, 12))
-        rounds.add(build(WA, R.string.wa_field_marked_12_red,
-                METER, CENTIMETER,
-                WAField.ID, 1, 3, -1, -1, 12))
-        rounds.add(build(WA, R.string.wa_field_marked_24_red,
-                METER, CENTIMETER,
-                WAField.ID, 1, 3, -1, -1, 24))
-        rounds.add(build(WA, R.string.wa_field_unmarked_12_red,
-                METER, CENTIMETER,
-                WAField.ID, 1, 3, -1, -1, 12))
-        rounds.add(build(WA, R.string.wa_field_unmarked_24_red,
-                METER, CENTIMETER,
-                WAField.ID, 1, 3, -1, -1, 24))
-        rounds.add(build(WA, R.string.wa_field_unmarked_marked_blue,
-                METER, CENTIMETER,
-                WAField.ID, 1, 3, -1, -1, 12, -1, -1, 12))
-        rounds.add(build(WA, R.string.wa_field_marked_12_blue,
-                METER, CENTIMETER,
-                WAField.ID, 1, 3, -1, -1, 12))
-        rounds.add(build(WA, R.string.wa_field_marked_24_blue,
-                METER, CENTIMETER,
-                WAField.ID, 1, 3, -1, -1, 24))
-        rounds.add(build(WA, R.string.wa_field_unmarked_12_blue,
-                METER, CENTIMETER,
-                WAField.ID, 1, 3, -1, -1, 12))
-        rounds.add(build(WA, R.string.wa_field_unmarked_24_blue,
-                METER, CENTIMETER,
-                WAField.ID, 1, 3, -1, -1, 24))
-        rounds.add(build(WA, R.string.wa_field_unmarked_marked_yellow,
-                METER, CENTIMETER,
-                WAField.ID, 1, 3, -1, -1, 12, -1, -1, 12))
-        rounds.add(build(WA, R.string.wa_field_marked_12_yellow,
-                METER, CENTIMETER,
-                WAField.ID, 1, 3, -1, -1, 12))
-        rounds.add(build(WA, R.string.wa_field_marked_24_yellow,
-                METER, CENTIMETER,
-                WAField.ID, 1, 3, -1, -1, 24))
-        rounds.add(build(WA, R.string.wa_field_unmarked_12_yellow,
-                METER, CENTIMETER,
-                WAField.ID, 1, 3, -1, -1, 12))
-        rounds.add(build(WA, R.string.wa_field_unmarked_24_yellow,
-                METER, CENTIMETER,
-                WAField.ID, 1, 3, -1, -1, 24))
-        rounds.add(build(NFAS, R.string.big_game_36,
-                METER, CENTIMETER,
-                NFASField.ID, 0, 3, -1, -1, 24))
-        rounds.add(build(NFAS, R.string.big_game_40,
-                METER, CENTIMETER,
-                NFASField.ID, 0, 3, -1, -1, 40))
+                14, -1, -1, 14
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_field_unmarked_marked_red,
+                METER, CENTIMETER,
+                WAField.ID, 1, 3, -1, -1, 12, -1, -1, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_field_marked_12_red,
+                METER, CENTIMETER,
+                WAField.ID, 1, 3, -1, -1, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_field_marked_24_red,
+                METER, CENTIMETER,
+                WAField.ID, 1, 3, -1, -1, 24
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_field_unmarked_12_red,
+                METER, CENTIMETER,
+                WAField.ID, 1, 3, -1, -1, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_field_unmarked_24_red,
+                METER, CENTIMETER,
+                WAField.ID, 1, 3, -1, -1, 24
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_field_unmarked_marked_blue,
+                METER, CENTIMETER,
+                WAField.ID, 1, 3, -1, -1, 12, -1, -1, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_field_marked_12_blue,
+                METER, CENTIMETER,
+                WAField.ID, 1, 3, -1, -1, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_field_marked_24_blue,
+                METER, CENTIMETER,
+                WAField.ID, 1, 3, -1, -1, 24
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_field_unmarked_12_blue,
+                METER, CENTIMETER,
+                WAField.ID, 1, 3, -1, -1, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_field_unmarked_24_blue,
+                METER, CENTIMETER,
+                WAField.ID, 1, 3, -1, -1, 24
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_field_unmarked_marked_yellow,
+                METER, CENTIMETER,
+                WAField.ID, 1, 3, -1, -1, 12, -1, -1, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_field_marked_12_yellow,
+                METER, CENTIMETER,
+                WAField.ID, 1, 3, -1, -1, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_field_marked_24_yellow,
+                METER, CENTIMETER,
+                WAField.ID, 1, 3, -1, -1, 24
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_field_unmarked_12_yellow,
+                METER, CENTIMETER,
+                WAField.ID, 1, 3, -1, -1, 12
+            )
+        )
+        rounds.add(
+            build(
+                WA, R.string.wa_field_unmarked_24_yellow,
+                METER, CENTIMETER,
+                WAField.ID, 1, 3, -1, -1, 24
+            )
+        )
+        rounds.add(
+            build(
+                NFAS, R.string.big_game_36,
+                METER, CENTIMETER,
+                NFASField.ID, 0, 3, -1, -1, 24
+            )
+        )
+        rounds.add(
+            build(
+                NFAS, R.string.big_game_40,
+                METER, CENTIMETER,
+                NFASField.ID, 0, 3, -1, -1, 40
+            )
+        )
 
         return rounds
     }
@@ -705,7 +1497,16 @@ object StandardRoundFactory {
      * @param roundDetails Per round distance, targetSize and number of ends are expected
      * @return The standard round with the specified properties
      */
-    private fun build(institution: Int, name: Int, distanceUnit: Dimension.Unit, targetUnit: Dimension.Unit, target: Long, scoringStyle: Int, shotsPerEnd: Int, vararg roundDetails: Int): AugmentedStandardRound {
+    private fun build(
+        institution: Int,
+        name: Int,
+        distanceUnit: Dimension.Unit,
+        targetUnit: Dimension.Unit,
+        target: Long,
+        scoringStyle: Int,
+        shotsPerEnd: Int,
+        vararg roundDetails: Int
+    ): AugmentedStandardRound {
         val standardRound = StandardRound()
         idCounter++
         standardRound.id = idCounter
@@ -719,7 +1520,11 @@ object StandardRoundFactory {
             roundTemplate.id = roundCounter
             roundTemplate.shotsPerEnd = shotsPerEnd
             roundTemplate.distance = Dimension(roundDetails[i].toFloat(), distanceUnit)
-            roundTemplate.targetTemplate = Target(target, scoringStyle, Dimension(roundDetails[i + 1].toFloat(), targetUnit))
+            roundTemplate.targetTemplate = Target(
+                target,
+                scoringStyle,
+                Dimension(roundDetails[i + 1].toFloat(), targetUnit)
+            )
             roundTemplate.endCount = roundDetails[i + 2]
             roundTemplate.index = rounds.size
             roundTemplate.standardRoundId = standardRound.id
@@ -729,9 +1534,21 @@ object StandardRoundFactory {
         return AugmentedStandardRound(standardRound, rounds)
     }
 
-    private fun build(institution: Int, name: Int, distanceUnit: Dimension.Unit, targetUnit: Dimension.Unit, target: Long, scoringStyle: Int, target2: Target, shotsPerEnd: Int, vararg roundDetails: Int): AugmentedStandardRound {
-        val standardRound = build(institution, name, distanceUnit,
-                targetUnit, target, scoringStyle, shotsPerEnd, *roundDetails)
+    private fun build(
+        institution: Int,
+        name: Int,
+        distanceUnit: Dimension.Unit,
+        targetUnit: Dimension.Unit,
+        target: Long,
+        scoringStyle: Int,
+        target2: Target,
+        shotsPerEnd: Int,
+        vararg roundDetails: Int
+    ): AugmentedStandardRound {
+        val standardRound = build(
+            institution, name, distanceUnit,
+            targetUnit, target, scoringStyle, shotsPerEnd, *roundDetails
+        )
         val round2 = standardRound.roundTemplates[1]
         target2.diameter = round2.targetTemplate.diameter
         round2.targetTemplate = target2
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt b/app/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt
index 36b86f93f..ee0115aa6 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/TrainingRepository.kt
@@ -24,14 +24,15 @@ import de.dreier.mytargets.shared.models.db.Signature
 import de.dreier.mytargets.shared.models.db.Training
 
 class TrainingRepository(
-        private val database: RoomDatabase,
-        private val trainingDAO: TrainingDAO,
-        private val roundDAO: RoundDAO,
-        private val roundRepository: RoundRepository,
-        private val signatureDAO: SignatureDAO
+    private val database: RoomDatabase,
+    private val trainingDAO: TrainingDAO,
+    private val roundDAO: RoundDAO,
+    private val roundRepository: RoundRepository,
+    private val signatureDAO: SignatureDAO
 ) {
 
-    fun loadAugmentedTraining(id: Long): AugmentedTraining = AugmentedTraining(trainingDAO.loadTraining(id), roundDAO.loadRounds(id)
+    fun loadAugmentedTraining(id: Long): AugmentedTraining =
+        AugmentedTraining(trainingDAO.loadTraining(id), roundDAO.loadRounds(id)
             .map { roundRepository.loadAugmentedRound(it) }
             .toMutableList())
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
index 17a736e98..918d0104d 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/DimensionDAO.kt
@@ -28,8 +28,10 @@ interface DimensionDAO {
      * @param unit     Distances are only returned which match the specified unit
      * @return List of distances
      */
-    @Query("SELECT distance FROM `SightMark` WHERE `distance` LIKE ('% ' || :unit)" +
-            "UNION SELECT distance FROM `RoundTemplate` WHERE `distance` LIKE ('% ' || :unit)" +
-            "UNION SELECT distance FROM `Round` WHERE `distance` LIKE ('% ' || :unit)")
+    @Query(
+        "SELECT distance FROM `SightMark` WHERE `distance` LIKE ('% ' || :unit)" +
+                "UNION SELECT distance FROM `RoundTemplate` WHERE `distance` LIKE ('% ' || :unit)" +
+                "UNION SELECT distance FROM `Round` WHERE `distance` LIKE ('% ' || :unit)"
+    )
     fun getAll(unit: Dimension.Unit): LiveData<List<Dimension>>
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
index 5a62b92d6..4692241bf 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/ImageDAO.kt
@@ -23,8 +23,10 @@ interface ImageDAO {
     /**
      * Returns a list of file names, which are implicitly placed in the ../files/ folder of the app.
      */
-    @Query("SELECT fileName FROM `BowImage` " +
-            "UNION SELECT fileName FROM `EndImage` " +
-            "UNION SELECT fileName FROM `ArrowImage`")
+    @Query(
+        "SELECT fileName FROM `BowImage` " +
+                "UNION SELECT fileName FROM `EndImage` " +
+                "UNION SELECT fileName FROM `ArrowImage`"
+    )
     fun loadAllFileNames(): List<String>
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
index 64b9f5b23..4220733ae 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/StandardRoundDAO.kt
@@ -29,7 +29,8 @@ abstract class StandardRoundDAO {
     abstract fun loadStandardRound(id: Long): StandardRound
 
     @Transaction
-    open fun loadAugmentedStandardRound(id: Long): AugmentedStandardRound = AugmentedStandardRound(loadStandardRound(id), loadRoundTemplates(id).toMutableList())
+    open fun loadAugmentedStandardRound(id: Long): AugmentedStandardRound =
+        AugmentedStandardRound(loadStandardRound(id), loadRoundTemplates(id).toMutableList())
 
     @Query("SELECT * FROM `StandardRound` WHERE `id` = :id")
     abstract fun loadStandardRoundOrNull(id: Long): StandardRound?
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration13.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration13.kt
index 08ab326a9..ed4d7138b 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration13.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration13.kt
@@ -20,17 +20,21 @@ import android.arch.persistence.room.migration.Migration
 
 object Migration13 : Migration(12, 13) {
     override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("UPDATE PASSE SET exact=1 " +
-                "WHERE _id IN (SELECT DISTINCT p._id " +
-                "FROM PASSE p, SHOOT s " +
-                "WHERE p._id=s.passe " +
-                "AND s.x!=0)")
+        database.execSQL(
+            "UPDATE PASSE SET exact=1 " +
+                    "WHERE _id IN (SELECT DISTINCT p._id " +
+                    "FROM PASSE p, SHOOT s " +
+                    "WHERE p._id=s.passe " +
+                    "AND s.x!=0)"
+        )
         database.execSQL("ALTER TABLE TRAINING ADD COLUMN exact INTEGER DEFAULT 0")
-        database.execSQL("UPDATE TRAINING SET exact=1 " +
-                "WHERE _id IN (SELECT DISTINCT t._id " +
-                "FROM TRAINING t, ROUND r, PASSE p " +
-                "WHERE t._id=r.training " +
-                "AND r._id=p.round " +
-                "AND p.exact=1)")
+        database.execSQL(
+            "UPDATE TRAINING SET exact=1 " +
+                    "WHERE _id IN (SELECT DISTINCT t._id " +
+                    "FROM TRAINING t, ROUND r, PASSE p " +
+                    "WHERE t._id=r.training " +
+                    "AND r._id=p.round " +
+                    "AND p.exact=1)"
+        )
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration14.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration14.kt
index 4105164fd..6b0aa84f5 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration14.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration14.kt
@@ -20,10 +20,12 @@ import android.arch.persistence.room.migration.Migration
 
 object Migration14 : Migration(13, 14) {
     override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("UPDATE PASSE SET exact=1 WHERE _id IN (SELECT DISTINCT p._id " +
-                "FROM PASSE p, ROUND r, TRAINING t " +
-                "WHERE p.round=r._id " +
-                "AND r.training=t._id " +
-                "AND t.exact=1)")
+        database.execSQL(
+            "UPDATE PASSE SET exact=1 WHERE _id IN (SELECT DISTINCT p._id " +
+                    "FROM PASSE p, ROUND r, TRAINING t " +
+                    "WHERE p.round=r._id " +
+                    "AND r.training=t._id " +
+                    "AND t.exact=1)"
+        )
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration15.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration15.kt
index 687005db2..106a829c5 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration15.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration15.kt
@@ -21,9 +21,11 @@ import android.arch.persistence.room.migration.Migration
 object Migration15 : Migration(14, 15) {
     override fun migrate(database: SupportSQLiteDatabase) {
         database.execSQL("UPDATE SHOOT SET arrow = NULL WHERE arrow = '-1'")
-        database.execSQL("UPDATE PASSE SET exact = 1 WHERE _id IN (SELECT DISTINCT p._id " +
-                "FROM PASSE p, SHOOT s " +
-                "WHERE p._id = s.passe " +
-                "AND s.x != 0)")
+        database.execSQL(
+            "UPDATE PASSE SET exact = 1 WHERE _id IN (SELECT DISTINCT p._id " +
+                    "FROM PASSE p, SHOOT s " +
+                    "WHERE p._id = s.passe " +
+                    "AND s.x != 0)"
+        )
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration16.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration16.kt
index 7bb6e7222..82862d149 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration16.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration16.kt
@@ -23,14 +23,16 @@ object Migration16 : Migration(15, 16) {
         database.execSQL("ALTER TABLE ARROW ADD COLUMN diameter TEXT DEFAULT '5.0'")
         database.execSQL("ALTER TABLE ARROW ADD COLUMN diameter_unit TEXT DEFAULT 'mm'")
         database.execSQL("ALTER TABLE PASSE ADD COLUMN save_time INTEGER")
-        database.execSQL("UPDATE PASSE " +
-                "SET save_time=(" +
-                "SELECT t.datum + 43200000 + COUNT(p2._id) * 300000 " +
-                "FROM TRAINING t " +
-                "JOIN  ROUND r1 ON r1.training = t._id AND r1._id = PASSE.round " +
-                "LEFT OUTER JOIN ROUND r2 ON r2.training = t._id " +
-                "LEFT OUTER JOIN PASSE p2 ON r2._id = p2.round AND p2._id < PASSE._id " +
-                "GROUP BY t._id, t.datum " +
-                ")")
+        database.execSQL(
+            "UPDATE PASSE " +
+                    "SET save_time=(" +
+                    "SELECT t.datum + 43200000 + COUNT(p2._id) * 300000 " +
+                    "FROM TRAINING t " +
+                    "JOIN  ROUND r1 ON r1.training = t._id AND r1._id = PASSE.round " +
+                    "LEFT OUTER JOIN ROUND r2 ON r2.training = t._id " +
+                    "LEFT OUTER JOIN PASSE p2 ON r2._id = p2.round AND p2._id < PASSE._id " +
+                    "GROUP BY t._id, t.datum " +
+                    ")"
+        )
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration17.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration17.kt
index 4fd90cd15..3059a63ea 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration17.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration17.kt
@@ -20,37 +20,51 @@ import android.arch.persistence.room.migration.Migration
 
 object Migration17 : Migration(16, 17) {
     override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("CREATE TEMP TABLE IF NOT EXISTS DAIR_TRANSLATION AS " +
-                "SELECT  sr._id " +
-                "FROM STANDARD_ROUND_TEMPLATE sr " +
-                "WHERE sr._id>198 " +
-                "AND sr.club<256 " +
-                "AND sr.name='DAIR 380'")
-        database.execSQL("CREATE TEMP TABLE IF NOT EXISTS SR_TRANSLATION AS " +
-                "SELECT  sr._id AS fromSR, (4+sr._id-(SELECT MAX(tr._id) FROM DAIR_TRANSLATION tr WHERE tr._id-4<sr._id)) AS toSR " +
-                "FROM STANDARD_ROUND_TEMPLATE sr " +
-                "WHERE sr._id>198 " +
-                "AND sr.club<256")
-        database.execSQL("CREATE TEMP TABLE IF NOT EXISTS R_TRANSLATION AS " +
-                "SELECT  r1._id AS fromR, r2._id AS toR " +
-                "FROM ROUND_TEMPLATE r1, ROUND_TEMPLATE r2, SR_TRANSLATION sr " +
-                "WHERE r1.sid=sr.fromSR " +
-                "AND r2.sid=sr.toSR " +
-                "AND r1.r_index=r2.r_index")
-        database.execSQL("UPDATE ROUND " +
-                "SET template = (SELECT toR " +
-                "FROM R_TRANSLATION " +
-                "WHERE fromR=template) " +
-                "WHERE template IN (SELECT fromR FROM R_TRANSLATION)")
-        database.execSQL("UPDATE TRAINING " +
-                "SET standard_round = (SELECT toSR " +
-                "FROM SR_TRANSLATION " +
-                "WHERE fromSR=standard_round) " +
-                "WHERE standard_round IN (SELECT fromSR FROM SR_TRANSLATION)")
-        database.execSQL("DELETE FROM STANDARD_ROUND_TEMPLATE " +
-                "WHERE _id IN (SELECT fromSR FROM SR_TRANSLATION)")
-        database.execSQL("DELETE FROM ROUND_TEMPLATE " +
-                "WHERE _id IN (SELECT fromR FROM R_TRANSLATION)")
+        database.execSQL(
+            "CREATE TEMP TABLE IF NOT EXISTS DAIR_TRANSLATION AS " +
+                    "SELECT  sr._id " +
+                    "FROM STANDARD_ROUND_TEMPLATE sr " +
+                    "WHERE sr._id>198 " +
+                    "AND sr.club<256 " +
+                    "AND sr.name='DAIR 380'"
+        )
+        database.execSQL(
+            "CREATE TEMP TABLE IF NOT EXISTS SR_TRANSLATION AS " +
+                    "SELECT  sr._id AS fromSR, (4+sr._id-(SELECT MAX(tr._id) FROM DAIR_TRANSLATION tr WHERE tr._id-4<sr._id)) AS toSR " +
+                    "FROM STANDARD_ROUND_TEMPLATE sr " +
+                    "WHERE sr._id>198 " +
+                    "AND sr.club<256"
+        )
+        database.execSQL(
+            "CREATE TEMP TABLE IF NOT EXISTS R_TRANSLATION AS " +
+                    "SELECT  r1._id AS fromR, r2._id AS toR " +
+                    "FROM ROUND_TEMPLATE r1, ROUND_TEMPLATE r2, SR_TRANSLATION sr " +
+                    "WHERE r1.sid=sr.fromSR " +
+                    "AND r2.sid=sr.toSR " +
+                    "AND r1.r_index=r2.r_index"
+        )
+        database.execSQL(
+            "UPDATE ROUND " +
+                    "SET template = (SELECT toR " +
+                    "FROM R_TRANSLATION " +
+                    "WHERE fromR=template) " +
+                    "WHERE template IN (SELECT fromR FROM R_TRANSLATION)"
+        )
+        database.execSQL(
+            "UPDATE TRAINING " +
+                    "SET standard_round = (SELECT toSR " +
+                    "FROM SR_TRANSLATION " +
+                    "WHERE fromSR=standard_round) " +
+                    "WHERE standard_round IN (SELECT fromSR FROM SR_TRANSLATION)"
+        )
+        database.execSQL(
+            "DELETE FROM STANDARD_ROUND_TEMPLATE " +
+                    "WHERE _id IN (SELECT fromSR FROM SR_TRANSLATION)"
+        )
+        database.execSQL(
+            "DELETE FROM ROUND_TEMPLATE " +
+                    "WHERE _id IN (SELECT fromR FROM R_TRANSLATION)"
+        )
         database.execSQL("DROP TABLE DAIR_TRANSLATION")
         database.execSQL("DROP TABLE SR_TRANSLATION")
         database.execSQL("DROP TABLE R_TRANSLATION")
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration18.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration18.kt
index e5b3f810d..52248a672 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration18.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration18.kt
@@ -38,221 +38,269 @@ object Migration18 : Migration(17, 18) {
         database.execSQL("ALTER TABLE VISIER RENAME TO VISIER_OLD")
 
         // Arrow migration
-        database.execSQL("CREATE TABLE IF NOT EXISTS `Arrow`( " +
-                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
-                "`name` TEXT," +
-                "`length` TEXT," +
-                "`material` TEXT," +
-                "`spine` TEXT," +
-                "`weight` TEXT," +
-                "`tipWeight` TEXT," +
-                "`vanes` TEXT," +
-                "`nock` TEXT," +
-                "`comment` TEXT," +
-                "`diameter` TEXT," +
-                "`thumbnail` BLOB " +
-                ")")
-        database.execSQL("INSERT INTO `Arrow` " +
-                "SELECT `_id`,`name`,`length`,`material`,`spine`," +
-                "`weight`,`tip_weight`,`vanes`,`nock`," +
-                "`comment`,`diameter` || ' ' || `diameter_unit`," +
-                "`thumbnail` " +
-                "FROM ARROW_OLD")
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `Arrow`( " +
+                    "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    "`name` TEXT," +
+                    "`length` TEXT," +
+                    "`material` TEXT," +
+                    "`spine` TEXT," +
+                    "`weight` TEXT," +
+                    "`tipWeight` TEXT," +
+                    "`vanes` TEXT," +
+                    "`nock` TEXT," +
+                    "`comment` TEXT," +
+                    "`diameter` TEXT," +
+                    "`thumbnail` BLOB " +
+                    ")"
+        )
+        database.execSQL(
+            "INSERT INTO `Arrow` " +
+                    "SELECT `_id`,`name`,`length`,`material`,`spine`," +
+                    "`weight`,`tip_weight`,`vanes`,`nock`," +
+                    "`comment`,`diameter` || ' ' || `diameter_unit`," +
+                    "`thumbnail` " +
+                    "FROM ARROW_OLD"
+        )
 
         // Arrow image migration
-        database.execSQL("CREATE TABLE IF NOT EXISTS `ArrowImage`( " +
-                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
-                "`fileName` TEXT," +
-                "`arrow` INTEGER," +
-                "FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
-                ")")
-        database.execSQL("INSERT INTO `ArrowImage`(`fileName`,`arrow`) " +
-                "SELECT `image`, `_id` " +
-                "FROM ARROW_OLD " +
-                "WHERE `image` <> ''")
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `ArrowImage`( " +
+                    "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    "`fileName` TEXT," +
+                    "`arrow` INTEGER," +
+                    "FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
+                    ")"
+        )
+        database.execSQL(
+            "INSERT INTO `ArrowImage`(`fileName`,`arrow`) " +
+                    "SELECT `image`, `_id` " +
+                    "FROM ARROW_OLD " +
+                    "WHERE `image` <> ''"
+        )
 
         // Bow migration
-        database.execSQL("CREATE TABLE IF NOT EXISTS `Bow`( " +
-                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
-                "`name` TEXT," +
-                "`type` INTEGER," +
-                "`brand` TEXT," +
-                "`size` TEXT," +
-                "`braceHeight` TEXT," +
-                "`tiller` TEXT," +
-                "`limbs` TEXT," +
-                "`sight` TEXT," +
-                "`drawWeight` TEXT," +
-                "`stabilizer` TEXT," +
-                "`clicker` TEXT," +
-                "`button` TEXT," +
-                "`string` TEXT," +
-                "`nockingPoint` TEXT," +
-                "`letoffWeight` TEXT," +
-                "`arrowRest` TEXT," +
-                "`restHorizontalPosition` TEXT," +
-                "`restVerticalPosition` TEXT," +
-                "`restStiffness` TEXT," +
-                "`camSetting` TEXT," +
-                "`scopeMagnification` TEXT," +
-                "`description` TEXT," +
-                "`thumbnail` BLOB " +
-                ")")
-        database.execSQL("INSERT INTO `Bow` " +
-                "SELECT `_id`,`name`,`type`,`brand`,`size`," +
-                "`height`,`tiller`,`limbs`,`sight`," +
-                "`draw_weight`,`stabilizer`,`clicker`," +
-                "'', '', '', '', ''," +
-                "'', '', '', '', ''," +
-                "`description`,`thumbnail` " +
-                "FROM BOW_OLD")
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `Bow`( " +
+                    "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    "`name` TEXT," +
+                    "`type` INTEGER," +
+                    "`brand` TEXT," +
+                    "`size` TEXT," +
+                    "`braceHeight` TEXT," +
+                    "`tiller` TEXT," +
+                    "`limbs` TEXT," +
+                    "`sight` TEXT," +
+                    "`drawWeight` TEXT," +
+                    "`stabilizer` TEXT," +
+                    "`clicker` TEXT," +
+                    "`button` TEXT," +
+                    "`string` TEXT," +
+                    "`nockingPoint` TEXT," +
+                    "`letoffWeight` TEXT," +
+                    "`arrowRest` TEXT," +
+                    "`restHorizontalPosition` TEXT," +
+                    "`restVerticalPosition` TEXT," +
+                    "`restStiffness` TEXT," +
+                    "`camSetting` TEXT," +
+                    "`scopeMagnification` TEXT," +
+                    "`description` TEXT," +
+                    "`thumbnail` BLOB " +
+                    ")"
+        )
+        database.execSQL(
+            "INSERT INTO `Bow` " +
+                    "SELECT `_id`,`name`,`type`,`brand`,`size`," +
+                    "`height`,`tiller`,`limbs`,`sight`," +
+                    "`draw_weight`,`stabilizer`,`clicker`," +
+                    "'', '', '', '', ''," +
+                    "'', '', '', '', ''," +
+                    "`description`,`thumbnail` " +
+                    "FROM BOW_OLD"
+        )
         // Bow image migration
-        database.execSQL("CREATE TABLE IF NOT EXISTS `BowImage`(" +
-                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
-                "`fileName` TEXT," +
-                "`bow` INTEGER," +
-                "FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
-                ")")
-        database.execSQL("INSERT INTO `BowImage`(`fileName`,`bow`) " +
-                "SELECT `image`, `_id` " +
-                "FROM BOW_OLD " +
-                "WHERE `image` <> ''")
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `BowImage`(" +
+                    "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    "`fileName` TEXT," +
+                    "`bow` INTEGER," +
+                    "FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
+                    ")"
+        )
+        database.execSQL(
+            "INSERT INTO `BowImage`(`fileName`,`bow`) " +
+                    "SELECT `image`, `_id` " +
+                    "FROM BOW_OLD " +
+                    "WHERE `image` <> ''"
+        )
         // StandardRound migration
-        database.execSQL("CREATE TABLE IF NOT EXISTS `StandardRound`(" +
-                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
-                "`club` INTEGER," +
-                "`name` TEXT " +
-                ")")
-        database.execSQL("INSERT INTO `StandardRound` " +
-                "SELECT `_id`,`club`,`name` " +
-                "FROM STANDARD_ROUND_TEMPLATE_OLD " +
-                "WHERE `club` < 512")
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `StandardRound`(" +
+                    "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    "`club` INTEGER," +
+                    "`name` TEXT " +
+                    ")"
+        )
+        database.execSQL(
+            "INSERT INTO `StandardRound` " +
+                    "SELECT `_id`,`club`,`name` " +
+                    "FROM STANDARD_ROUND_TEMPLATE_OLD " +
+                    "WHERE `club` < 512"
+        )
         // RoundTemplate migration
-        database.execSQL("CREATE TABLE IF NOT EXISTS `RoundTemplate`( " +
-                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
-                "`standardRound` INTEGER," +
-                "`index` INTEGER," +
-                "`shotsPerEnd` INTEGER," +
-                "`endCount` INTEGER," +
-                "`distance` TEXT," +
-                "`targetId` INTEGER," +
-                "`targetScoringStyle` INTEGER," +
-                "`targetDiameter` TEXT," +
-                "FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
-                ")")
-        database.execSQL("INSERT INTO `RoundTemplate` " +
-                "SELECT `_id`,`sid`,`r_index`,`arrows`,`passes`," +
-                "`distance` || ' ' || `unit`," +
-                "`target`,`scoring_style`,`size` || ' ' || `target_unit` " +
-                "FROM ROUND_TEMPLATE_OLD")
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `RoundTemplate`( " +
+                    "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    "`standardRound` INTEGER," +
+                    "`index` INTEGER," +
+                    "`shotsPerEnd` INTEGER," +
+                    "`endCount` INTEGER," +
+                    "`distance` TEXT," +
+                    "`targetId` INTEGER," +
+                    "`targetScoringStyle` INTEGER," +
+                    "`targetDiameter` TEXT," +
+                    "FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
+                    ")"
+        )
+        database.execSQL(
+            "INSERT INTO `RoundTemplate` " +
+                    "SELECT `_id`,`sid`,`r_index`,`arrows`,`passes`," +
+                    "`distance` || ' ' || `unit`," +
+                    "`target`,`scoring_style`,`size` || ' ' || `target_unit` " +
+                    "FROM ROUND_TEMPLATE_OLD"
+        )
         // Training migration
-        database.execSQL("CREATE TABLE IF NOT EXISTS `Training`( " +
-                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
-                "`title` TEXT," +
-                "`date` INTEGER," +
-                "`standardRound` INTEGER," +
-                "`bow` INTEGER," +
-                "`arrow` INTEGER," +
-                "`arrowNumbering` INTEGER," +
-                "`indoor` INTEGER," +
-                "`weather` INTEGER," +
-                "`windDirection` INTEGER," +
-                "`windSpeed` INTEGER," +
-                "`location` TEXT," +
-                "FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE NO ACTION," +
-                "FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL," +
-                "FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL " +
-                ")")
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `Training`( " +
+                    "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    "`title` TEXT," +
+                    "`date` INTEGER," +
+                    "`standardRound` INTEGER," +
+                    "`bow` INTEGER," +
+                    "`arrow` INTEGER," +
+                    "`arrowNumbering` INTEGER," +
+                    "`indoor` INTEGER," +
+                    "`weather` INTEGER," +
+                    "`windDirection` INTEGER," +
+                    "`windSpeed` INTEGER," +
+                    "`location` TEXT," +
+                    "FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE NO ACTION," +
+                    "FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL," +
+                    "FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL " +
+                    ")"
+        )
         database.execSQL("UPDATE TRAINING_OLD SET bow = null WHERE bow < 1")
         database.execSQL("UPDATE TRAINING_OLD SET arrow = null WHERE arrow < 1")
 
-        database.execSQL("INSERT INTO `Training` " +
-                "SELECT t.`_id`,t.`title`,t.`datum`," +
-                "CASE WHEN s.club < 512 THEN t.`standard_round` ELSE NULL END," +
-                "t.`bow`,t.`arrow`, t.`arrow_numbering`," +
-                "s.`indoor`,t.`weather`,t.`wind_direction`,t.`wind_speed`,t.`location` " +
-                "FROM TRAINING_OLD t, STANDARD_ROUND_TEMPLATE_OLD s " +
-                "WHERE t.standard_round=s._id")
+        database.execSQL(
+            "INSERT INTO `Training` " +
+                    "SELECT t.`_id`,t.`title`,t.`datum`," +
+                    "CASE WHEN s.club < 512 THEN t.`standard_round` ELSE NULL END," +
+                    "t.`bow`,t.`arrow`, t.`arrow_numbering`," +
+                    "s.`indoor`,t.`weather`,t.`wind_direction`,t.`wind_speed`,t.`location` " +
+                    "FROM TRAINING_OLD t, STANDARD_ROUND_TEMPLATE_OLD s " +
+                    "WHERE t.standard_round=s._id"
+        )
 
         // Round migration
-        database.execSQL("CREATE TABLE IF NOT EXISTS `Round`( " +
-                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
-                "`training` INTEGER," +
-                "`index` INTEGER," +
-                "`shotsPerEnd` INTEGER," +
-                "`maxEndCount` INTEGER," +
-                "`distance` TEXT," +
-                "`comment` TEXT," +
-                "`targetId` INTEGER," +
-                "`targetScoringStyle` INTEGER," +
-                "`targetDiameter` TEXT," +
-                "FOREIGN KEY(`training`) REFERENCES Training(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
-                ")")
-        database.execSQL("INSERT INTO `Round` " +
-                "SELECT r.`_id`,r.`training`,t.`r_index`,t.`arrows`," +
-                "CASE WHEN s.club = 512 THEN NULL ELSE t.`passes` END," +
-                "t.`distance` || ' ' || t.`unit`, r.`comment`,r.`target`,r.`scoring_style`," +
-                "t.`size` || ' ' || t.`target_unit` " +
-                "FROM ROUND_OLD r, ROUND_TEMPLATE_OLD t, STANDARD_ROUND_TEMPLATE_OLD s " +
-                "WHERE r.template=t._id " +
-                "AND s._id=t.sid")
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `Round`( " +
+                    "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    "`training` INTEGER," +
+                    "`index` INTEGER," +
+                    "`shotsPerEnd` INTEGER," +
+                    "`maxEndCount` INTEGER," +
+                    "`distance` TEXT," +
+                    "`comment` TEXT," +
+                    "`targetId` INTEGER," +
+                    "`targetScoringStyle` INTEGER," +
+                    "`targetDiameter` TEXT," +
+                    "FOREIGN KEY(`training`) REFERENCES Training(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
+                    ")"
+        )
+        database.execSQL(
+            "INSERT INTO `Round` " +
+                    "SELECT r.`_id`,r.`training`,t.`r_index`,t.`arrows`," +
+                    "CASE WHEN s.club = 512 THEN NULL ELSE t.`passes` END," +
+                    "t.`distance` || ' ' || t.`unit`, r.`comment`,r.`target`,r.`scoring_style`," +
+                    "t.`size` || ' ' || t.`target_unit` " +
+                    "FROM ROUND_OLD r, ROUND_TEMPLATE_OLD t, STANDARD_ROUND_TEMPLATE_OLD s " +
+                    "WHERE r.template=t._id " +
+                    "AND s._id=t.sid"
+        )
 
         // End migration
-        database.execSQL("CREATE TABLE IF NOT EXISTS `End`( " +
-                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
-                "`index` INTEGER," +
-                "`round` INTEGER," +
-                "`exact` INTEGER," +
-                "`saveTime` INTEGER," +
-                "FOREIGN KEY(`round`) REFERENCES Round(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
-                ")")
-        database.execSQL("INSERT INTO `End` " +
-                "SELECT `_id`, (SELECT COUNT(*) " +
-                "     FROM PASSE_OLD p " +
-                "     WHERE PASSE_OLD.round = p.round " +
-                "     AND PASSE_OLD._id > p._id)," +
-                "     `round`,`exact`,`save_time` " +
-                "FROM PASSE_OLD")
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `End`( " +
+                    "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    "`index` INTEGER," +
+                    "`round` INTEGER," +
+                    "`exact` INTEGER," +
+                    "`saveTime` INTEGER," +
+                    "FOREIGN KEY(`round`) REFERENCES Round(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
+                    ")"
+        )
+        database.execSQL(
+            "INSERT INTO `End` " +
+                    "SELECT `_id`, (SELECT COUNT(*) " +
+                    "     FROM PASSE_OLD p " +
+                    "     WHERE PASSE_OLD.round = p.round " +
+                    "     AND PASSE_OLD._id > p._id)," +
+                    "     `round`,`exact`,`save_time` " +
+                    "FROM PASSE_OLD"
+        )
 
         // End image migration
-        database.execSQL("CREATE TABLE IF NOT EXISTS `EndImage`( " +
-                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
-                "`fileName` TEXT," +
-                "`end` INTEGER," +
-                "FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE" +
-                ")")
-        database.execSQL("INSERT INTO `EndImage`(`fileName`,`end`) " +
-                "SELECT `image`, `_id` " +
-                "FROM PASSE_OLD " +
-                "WHERE `image` <> ''")
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `EndImage`( " +
+                    "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    "`fileName` TEXT," +
+                    "`end` INTEGER," +
+                    "FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE" +
+                    ")"
+        )
+        database.execSQL(
+            "INSERT INTO `EndImage`(`fileName`,`end`) " +
+                    "SELECT `image`, `_id` " +
+                    "FROM PASSE_OLD " +
+                    "WHERE `image` <> ''"
+        )
 
         // Shot migration
-        database.execSQL("CREATE TABLE IF NOT EXISTS `Shot`( " +
-                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
-                "`index` INTEGER," +
-                "`end` INTEGER," +
-                "`x` REAL," +
-                "`y` REAL," +
-                "`scoringRing` INTEGER," +
-                "`comment` TEXT," +
-                "`arrowNumber` TEXT," +
-                "FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
-                ")")
-        database.execSQL("INSERT INTO `Shot` " +
-                "SELECT `_id`,`arrow_index`,`passe`,`x`,`y`,`points`,`comment`,`arrow` " +
-                "FROM SHOOT_OLD")
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `Shot`( " +
+                    "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    "`index` INTEGER," +
+                    "`end` INTEGER," +
+                    "`x` REAL," +
+                    "`y` REAL," +
+                    "`scoringRing` INTEGER," +
+                    "`comment` TEXT," +
+                    "`arrowNumber` TEXT," +
+                    "FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
+                    ")"
+        )
+        database.execSQL(
+            "INSERT INTO `Shot` " +
+                    "SELECT `_id`,`arrow_index`,`passe`,`x`,`y`,`points`,`comment`,`arrow` " +
+                    "FROM SHOOT_OLD"
+        )
 
         // SightMark migration
-        database.execSQL("CREATE TABLE IF NOT EXISTS `SightMark`( " +
-                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
-                "`bow` INTEGER," +
-                "`distance` TEXT," +
-                "`value` TEXT," +
-                "FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
-                ")")
-        database.execSQL("INSERT INTO `SightMark` " +
-                "SELECT `_id`,`bow`,`distance` || ' ' || `unit`,`setting` " +
-                "FROM VISIER_OLD")
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `SightMark`( " +
+                    "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    "`bow` INTEGER," +
+                    "`distance` TEXT," +
+                    "`value` TEXT," +
+                    "FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
+                    ")"
+        )
+        database.execSQL(
+            "INSERT INTO `SightMark` " +
+                    "SELECT `_id`,`bow`,`distance` || ' ' || `unit`,`setting` " +
+                    "FROM VISIER_OLD"
+        )
 
         // Remove old tables
         database.execSQL("DROP TABLE ARROW_OLD")
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration20.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration20.kt
index dbe0bb0f9..d8396dd51 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration20.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration20.kt
@@ -20,11 +20,15 @@ import android.arch.persistence.room.migration.Migration
 
 object Migration20 : Migration(19, 20) {
     override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("UPDATE Round SET targetScoringStyle = targetScoringStyle+1 "+
-                "WHERE targetScoringStyle > 0 "+
-                "AND (targetId < 7 OR targetId = 26 OR targetId = 27)")
-        database.execSQL("UPDATE RoundTemplate SET targetScoringStyle = targetScoringStyle+1 "+
-                "WHERE targetScoringStyle > 0 "+
-                "AND (targetId < 7 OR targetId = 26 OR targetId = 27)")
+        database.execSQL(
+            "UPDATE Round SET targetScoringStyle = targetScoringStyle+1 " +
+                    "WHERE targetScoringStyle > 0 " +
+                    "AND (targetId < 7 OR targetId = 26 OR targetId = 27)"
+        )
+        database.execSQL(
+            "UPDATE RoundTemplate SET targetScoringStyle = targetScoringStyle+1 " +
+                    "WHERE targetScoringStyle > 0 " +
+                    "AND (targetId < 7 OR targetId = 26 OR targetId = 27)"
+        )
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration24.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration24.kt
index a9e011b27..07bafaf91 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration24.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration24.kt
@@ -21,11 +21,13 @@ import android.arch.persistence.room.migration.Migration
 object Migration24 : Migration(23, 24) {
     override fun migrate(database: SupportSQLiteDatabase) {
         // Add signature table
-        database.execSQL("CREATE TABLE IF NOT EXISTS `Signature`( " +
-                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT, " +
-                "`name` TEXT, " +
-                "`bitmap` BLOB" +
-                ")")
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `Signature`( " +
+                    "`_id` INTEGER PRIMARY KEY AUTOINCREMENT, " +
+                    "`name` TEXT, " +
+                    "`bitmap` BLOB" +
+                    ")"
+        )
 
         // Rename existing tables
         database.execSQL("ALTER TABLE `Shot` RENAME TO SHOT_OLD")
@@ -33,66 +35,78 @@ object Migration24 : Migration(23, 24) {
         database.execSQL("ALTER TABLE `Training` RENAME TO TRAINING_OLD")
 
         // Training migration
-        database.execSQL("CREATE TABLE IF NOT EXISTS `Training`( " +
-                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT, " +
-                "`title` TEXT, " +
-                "`date` TEXT, " +
-                "`standardRound` INTEGER, " +
-                "`bow` INTEGER, " +
-                "`arrow` INTEGER, " +
-                "`arrowNumbering` INTEGER, " +
-                "`indoor` INTEGER, " +
-                "`weather` INTEGER, " +
-                "`windDirection` INTEGER, " +
-                "`windSpeed` INTEGER, " +
-                "`location` TEXT, " +
-                "`comment` TEXT, " +
-                "`archerSignature` INTEGER, " +
-                "`witnessSignature` INTEGER, " +
-                "FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, " +
-                "FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, " +
-                "FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, " +
-                "FOREIGN KEY(`archerSignature`) REFERENCES Signature(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, " +
-                "FOREIGN KEY(`witnessSignature`) REFERENCES Signature(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL " +
-                ")")
-        database.execSQL("INSERT INTO `Training` " +
-                "SELECT `_id`, `title`, date(`date`/1000, 'unixepoch', 'localtime'), " +
-                "`standardRound`, `bow`, `arrow`, " +
-                "`arrowNumbering`, `indoor`, " +
-                "`weather`, `windDirection`, `windSpeed`, `location`, '', NULL, NULL " +
-                "FROM TRAINING_OLD")
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `Training`( " +
+                    "`_id` INTEGER PRIMARY KEY AUTOINCREMENT, " +
+                    "`title` TEXT, " +
+                    "`date` TEXT, " +
+                    "`standardRound` INTEGER, " +
+                    "`bow` INTEGER, " +
+                    "`arrow` INTEGER, " +
+                    "`arrowNumbering` INTEGER, " +
+                    "`indoor` INTEGER, " +
+                    "`weather` INTEGER, " +
+                    "`windDirection` INTEGER, " +
+                    "`windSpeed` INTEGER, " +
+                    "`location` TEXT, " +
+                    "`comment` TEXT, " +
+                    "`archerSignature` INTEGER, " +
+                    "`witnessSignature` INTEGER, " +
+                    "FOREIGN KEY(`standardRound`) REFERENCES StandardRound(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, " +
+                    "FOREIGN KEY(`bow`) REFERENCES Bow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, " +
+                    "FOREIGN KEY(`arrow`) REFERENCES Arrow(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, " +
+                    "FOREIGN KEY(`archerSignature`) REFERENCES Signature(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL, " +
+                    "FOREIGN KEY(`witnessSignature`) REFERENCES Signature(`_id`) ON UPDATE NO ACTION ON DELETE SET NULL " +
+                    ")"
+        )
+        database.execSQL(
+            "INSERT INTO `Training` " +
+                    "SELECT `_id`, `title`, date(`date`/1000, 'unixepoch', 'localtime'), " +
+                    "`standardRound`, `bow`, `arrow`, " +
+                    "`arrowNumbering`, `indoor`, " +
+                    "`weather`, `windDirection`, `windSpeed`, `location`, '', NULL, NULL " +
+                    "FROM TRAINING_OLD"
+        )
         database.execSQL("UPDATE Round SET comment = \"\" WHERE comment = NULL")
         database.execSQL("UPDATE Round SET targetDiameter = \"-1 m\" WHERE targetDiameter = NULL")
         database.execSQL("UPDATE RoundTemplate SET targetDiameter = \"-1 m\" WHERE targetDiameter = NULL")
 
         // End migration
-        database.execSQL("CREATE TABLE IF NOT EXISTS `End`( " +
-                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT, " +
-                "`index` INTEGER, " +
-                "`round` INTEGER, " +
-                "`exact` INTEGER, " +
-                "`saveTime` TEXT, " +
-                "`comment` TEXT, " +
-                "FOREIGN KEY(`round`) REFERENCES Round(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
-                ")")
-        database.execSQL("INSERT INTO `End` " +
-                "SELECT e.`_id`, e.`index`, e.`round`, e.`exact`, time(e.`saveTime`/1000, 'unixepoch', 'localtime'), " +
-                "TRIM(GROUP_CONCAT(s.`comment`, x'0a'), x'0a' || \" \") " +
-                "FROM END_OLD e LEFT OUTER JOIN SHOT_OLD s ON s.`end`=e._id " +
-                "GROUP BY e._id")
-        database.execSQL("CREATE TABLE IF NOT EXISTS `Shot`( " +
-                "`_id` INTEGER PRIMARY KEY AUTOINCREMENT, " +
-                "`index` INTEGER, " +
-                "`end` INTEGER, " +
-                "`x` REAL, " +
-                "`y` REAL, " +
-                "`scoringRing` INTEGER, " +
-                "`arrowNumber` TEXT, " +
-                "FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
-                ")")
-        database.execSQL("INSERT INTO `Shot` " +
-                "SELECT `_id`,`index`,`end`,`x`,`y`,`scoringRing`,`arrowNumber` " +
-                "FROM SHOT_OLD")
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `End`( " +
+                    "`_id` INTEGER PRIMARY KEY AUTOINCREMENT, " +
+                    "`index` INTEGER, " +
+                    "`round` INTEGER, " +
+                    "`exact` INTEGER, " +
+                    "`saveTime` TEXT, " +
+                    "`comment` TEXT, " +
+                    "FOREIGN KEY(`round`) REFERENCES Round(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
+                    ")"
+        )
+        database.execSQL(
+            "INSERT INTO `End` " +
+                    "SELECT e.`_id`, e.`index`, e.`round`, e.`exact`, time(e.`saveTime`/1000, 'unixepoch', 'localtime'), " +
+                    "TRIM(GROUP_CONCAT(s.`comment`, x'0a'), x'0a' || \" \") " +
+                    "FROM END_OLD e LEFT OUTER JOIN SHOT_OLD s ON s.`end`=e._id " +
+                    "GROUP BY e._id"
+        )
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS `Shot`( " +
+                    "`_id` INTEGER PRIMARY KEY AUTOINCREMENT, " +
+                    "`index` INTEGER, " +
+                    "`end` INTEGER, " +
+                    "`x` REAL, " +
+                    "`y` REAL, " +
+                    "`scoringRing` INTEGER, " +
+                    "`arrowNumber` TEXT, " +
+                    "FOREIGN KEY(`end`) REFERENCES End(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE " +
+                    ")"
+        )
+        database.execSQL(
+            "INSERT INTO `Shot` " +
+                    "SELECT `_id`,`index`,`end`,`x`,`y`,`scoringRing`,`arrowNumber` " +
+                    "FROM SHOT_OLD"
+        )
 
         // Remove old tables
         database.execSQL("DROP TABLE SHOT_OLD")
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt
index 8255e3849..a9fa7fdb9 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration3.kt
@@ -22,10 +22,12 @@ object Migration3 : Migration(2, 3) {
     override fun migrate(database: SupportSQLiteDatabase) {
         database.execSQL("ALTER TABLE SHOOT ADD COLUMN x REAL")
         database.execSQL("ALTER TABLE SHOOT ADD COLUMN y REAL")
-        val cur = database.query("SELECT s._id, s.points, r.target " +
-                "FROM SHOOT s, PASSE p, ROUND r " +
-                "WHERE s.passe=p._id " +
-                "AND p.round=r._id")
+        val cur = database.query(
+            "SELECT s._id, s.points, r.target " +
+                    "FROM SHOOT s, PASSE p, ROUND r " +
+                    "WHERE s.passe=p._id " +
+                    "AND p.round=r._id"
+        )
         if (cur.moveToFirst()) {
             do {
                 val shoot = cur.getInt(0)
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt
index 077054340..4a0b2a9fc 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration4.kt
@@ -21,15 +21,18 @@ import android.arch.persistence.room.migration.Migration
 object Migration4 : Migration(3, 4) {
     override fun migrate(database: SupportSQLiteDatabase) {
         database.execSQL(
-                "CREATE TABLE IF NOT EXISTS VISIER ( _id INTEGER PRIMARY KEY AUTOINCREMENT," +
-                        "bow REFERENCES BOW ON DELETE CASCADE," +
-                        "distance INTEGER," +
-                        "setting TEXT);")
+            "CREATE TABLE IF NOT EXISTS VISIER ( _id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    "bow REFERENCES BOW ON DELETE CASCADE," +
+                    "distance INTEGER," +
+                    "setting TEXT);"
+        )
         val valuesMetric = intArrayOf(10, 15, 18, 20, 25, 30, 40, 50, 60, 70, 90)
         for (table in arrayOf("ROUND", "VISIER")) {
             for (i in 10 downTo 0) {
-                database.execSQL("UPDATE " + table + " SET distance=" +
-                        valuesMetric[i] + " WHERE distance=" + i)
+                database.execSQL(
+                    "UPDATE " + table + " SET distance=" +
+                            valuesMetric[i] + " WHERE distance=" + i
+                )
             }
         }
         database.execSQL("ALTER TABLE BOW ADD COLUMN height TEXT DEFAULT '';")
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration5.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration5.kt
index 638545ef2..206ec5bb9 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration5.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration5.kt
@@ -21,19 +21,21 @@ import android.arch.persistence.room.migration.Migration
 object Migration5 : Migration(4, 5) {
     override fun migrate(database: SupportSQLiteDatabase) {
         database.execSQL("DROP TABLE IF EXISTS ARROW")
-        database.execSQL("CREATE TABLE IF NOT EXISTS ARROW (" +
-                "_id INTEGER PRIMARY KEY AUTOINCREMENT,"+
-                "name TEXT,"+
-                "length TEXT,"+
-                "material TEXT,"+
-                "spine TEXT,"+
-                "weight TEXT,"+
-                "tip_wight TEXT,"+
-                "vanes TEXT,"+
-                "nock TEXT,"+
-                "comment TEXT,"+
-                "thumbnail BLOB,"+
-                "image TEXT)")
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS ARROW (" +
+                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    "name TEXT," +
+                    "length TEXT," +
+                    "material TEXT," +
+                    "spine TEXT," +
+                    "weight TEXT," +
+                    "tip_wight TEXT," +
+                    "vanes TEXT," +
+                    "nock TEXT," +
+                    "comment TEXT," +
+                    "thumbnail BLOB," +
+                    "image TEXT)"
+        )
         database.execSQL("ALTER TABLE ROUND ADD COLUMN arrow INTEGER REFERENCES ARROW ON DELETE SET NULL")
         database.execSQL("ALTER TABLE ROUND ADD COLUMN comment TEXT DEFAULT ''")
         database.execSQL("ALTER TABLE SHOOT ADD COLUMN comment TEXT DEFAULT ''")
@@ -43,9 +45,11 @@ object Migration5 : Migration(4, 5) {
         database.execSQL("UPDATE ROUND SET target=4 WHERE target=8")
         database.execSQL("UPDATE ROUND SET target=5 WHERE target=9")
         database.execSQL("UPDATE ROUND SET target=6 WHERE target=10")
-        database.execSQL("UPDATE SHOOT SET points=2 WHERE _id IN (SELECT s._id "+
-                "FROM ROUND r, PASSE p, SHOOT s LEFT JOIN BOW b ON b._id=r.bow "+
-                "WHERE r._id=p.round AND s.passe=p._id "+
-                "AND (r.bow=-2 OR b.type=1) AND s.points=1 AND r.target=3)")
+        database.execSQL(
+            "UPDATE SHOOT SET points=2 WHERE _id IN (SELECT s._id " +
+                    "FROM ROUND r, PASSE p, SHOOT s LEFT JOIN BOW b ON b._id=r.bow " +
+                    "WHERE r._id=p.round AND s.passe=p._id " +
+                    "AND (r.bow=-2 OR b.type=1) AND s.points=1 AND r.target=3)"
+        )
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt
index eb04fc7bb..21217a19e 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration6.kt
@@ -33,8 +33,9 @@ object Migration6 : Migration(5, 6) {
                 val file = File.createTempFile("img_", ".png", filesDir)
                 File(fileName).copyTo(file, overwrite = true)
                 database.execSQL(
-                        "UPDATE BOW SET image=\"" + file.name + "\" WHERE image=\"" +
-                                fileName + "\"")
+                    "UPDATE BOW SET image=\"" + file.name + "\" WHERE image=\"" +
+                            fileName + "\""
+                )
             } catch (e: IOException) {
                 e.printStackTrace()
             }
@@ -50,8 +51,9 @@ object Migration6 : Migration(5, 6) {
                 val file = File.createTempFile("img_", ".png", filesDir)
                 File(fileName).copyTo(file)
                 database.execSQL(
-                        "UPDATE ARROW SET image=\"" + file.name + "\" WHERE image=\"" +
-                                fileName + "\"")
+                    "UPDATE ARROW SET image=\"" + file.name + "\" WHERE image=\"" +
+                            fileName + "\""
+                )
             } catch (e: IOException) {
                 e.printStackTrace()
             }
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
index 7cc94b043..081e9e921 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration9.kt
@@ -49,57 +49,69 @@ object Migration9 : Migration(8, 9) {
         database.execSQL("UPDATE ROUND SET target=4 WHERE target=3") // WA 3 Spot -> vegas
 
         // Set all compound 3 spot to vertical
-        database.execSQL("UPDATE ROUND SET target=target+1 " +
-                "WHERE _id IN (SELECT r._id FROM ROUND r " +
-                "LEFT JOIN BOW b ON b._id=r.bow " +
-                "WHERE (r.bow=-2 OR b.type=1) AND r.target=4)")
+        database.execSQL(
+            "UPDATE ROUND SET target=target+1 " +
+                    "WHERE _id IN (SELECT r._id FROM ROUND r " +
+                    "LEFT JOIN BOW b ON b._id=r.bow " +
+                    "WHERE (r.bow=-2 OR b.type=1) AND r.target=4)"
+        )
 
         // Add shot indices
-        database.execSQL("UPDATE SHOOT SET arrow_index=( " +
-                "SELECT COUNT(*) FROM SHOOT s " +
-                "WHERE s._id<SHOOT._id " +
-                "AND s.passe=SHOOT.passe) " +
-                "WHERE arrow_index=-1")
+        database.execSQL(
+            "UPDATE SHOOT SET arrow_index=( " +
+                    "SELECT COUNT(*) FROM SHOOT s " +
+                    "WHERE s._id<SHOOT._id " +
+                    "AND s.passe=SHOOT.passe) " +
+                    "WHERE arrow_index=-1"
+        )
 
         // transform before inner points to after inner points
-        database.execSQL("UPDATE SHOOT SET x = x/2.0, y = y/2.0 " +
-                "WHERE _id IN (SELECT s._id " +
-                "FROM ROUND r " +
-                "LEFT JOIN PASSE p ON r._id = p.round " +
-                "LEFT JOIN SHOOT s ON p._id = s.passe " +
-                "WHERE r.target<11 AND s.points=0);")
+        database.execSQL(
+            "UPDATE SHOOT SET x = x/2.0, y = y/2.0 " +
+                    "WHERE _id IN (SELECT s._id " +
+                    "FROM ROUND r " +
+                    "LEFT JOIN PASSE p ON r._id = p.round " +
+                    "LEFT JOIN SHOOT s ON p._id = s.passe " +
+                    "WHERE r.target<11 AND s.points=0);"
+        )
         database.execSQL("ALTER TABLE ROUND RENAME TO ROUND_OLD")
 
-        database.execSQL("CREATE TABLE IF NOT EXISTS STANDARD_ROUND_TEMPLATE (" +
-                "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
-                "name TEXT," +
-                "club INTEGER," +
-                "indoor INTEGER);")
-        database.execSQL("CREATE TABLE IF NOT EXISTS ROUND_TEMPLATE (" +
-                "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
-                "sid INTEGER," +
-                "r_index INTEGER," +
-                "distance INTEGER," +
-                "unit TEXT," +
-                "passes INTEGER," +
-                "arrows INTEGER," +
-                "target INTEGER," +
-                "size INTEGER," +
-                "target_unit INTEGER," +
-                "scoring_style INTEGER," +
-                "UNIQUE(sid, r_index) ON CONFLICT REPLACE);")
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS STANDARD_ROUND_TEMPLATE (" +
+                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    "name TEXT," +
+                    "club INTEGER," +
+                    "indoor INTEGER);"
+        )
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS ROUND_TEMPLATE (" +
+                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    "sid INTEGER," +
+                    "r_index INTEGER," +
+                    "distance INTEGER," +
+                    "unit TEXT," +
+                    "passes INTEGER," +
+                    "arrows INTEGER," +
+                    "target INTEGER," +
+                    "size INTEGER," +
+                    "target_unit INTEGER," +
+                    "scoring_style INTEGER," +
+                    "UNIQUE(sid, r_index) ON CONFLICT REPLACE);"
+        )
         val rounds = StandardRoundFactory.initTable()
         for (round in rounds) {
             insertStandardRound(database, round)
         }
 
-        database.execSQL("CREATE TABLE IF NOT EXISTS ROUND (" +
-                "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
-                "training INTEGER," +
-                "comment TEXT," +
-                "template INTEGER," +
-                "target INTEGER," +
-                "scoring_style INTEGER);")
+        database.execSQL(
+            "CREATE TABLE IF NOT EXISTS ROUND (" +
+                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    "training INTEGER," +
+                    "comment TEXT," +
+                    "template INTEGER," +
+                    "target INTEGER," +
+                    "scoring_style INTEGER);"
+        )
 
         val trainings = database.query("SELECT _id FROM TRAINING")
         if (trainings.moveToFirst()) {
@@ -110,22 +122,25 @@ object Migration9 : Migration(8, 9) {
                     database.execSQL("DELETE FROM TRAINING WHERE _id=" + training)
                 } else {
                     database.execSQL(
-                            "UPDATE TRAINING SET standard_round=$sid WHERE _id=$training")
+                        "UPDATE TRAINING SET standard_round=$sid WHERE _id=$training"
+                    )
                 }
 
                 val res = database.query(
-                        "SELECT r._id, r.comment, r.target, r.bow, r.arrow " +
-                                "FROM ROUND_OLD r " +
-                                "WHERE r.training=" + training + " " +
-                                "GROUP BY r._id " +
-                                "ORDER BY r._id ASC")
+                    "SELECT r._id, r.comment, r.target, r.bow, r.arrow " +
+                            "FROM ROUND_OLD r " +
+                            "WHERE r.training=" + training + " " +
+                            "GROUP BY r._id " +
+                            "ORDER BY r._id ASC"
+                )
                 var index = 0
                 if (res.moveToFirst()) {
                     val bow = res.getLong(3)
                     val arrow = res.getLong(4)
                     database.execSQL(
-                            "UPDATE TRAINING SET bow=" + bow + ", arrow=" + arrow + " WHERE _id=" +
-                                    training)
+                        "UPDATE TRAINING SET bow=" + bow + ", arrow=" + arrow + " WHERE _id=" +
+                                training
+                    )
                     do {
                         val info = getRoundTemplate(database, sid, index)
                         val target = res.getInt(2)
@@ -135,9 +150,11 @@ object Migration9 : Migration(8, 9) {
                         contentValues.put("training", training)
                         contentValues.put("template", info!!.id)
                         contentValues
-                                .put("target", if (target == 4) 5 else target)
-                        contentValues.put("scoring_style",
-                                if (target == 5) 1 else 0)
+                            .put("target", if (target == 4) 5 else target)
+                        contentValues.put(
+                            "scoring_style",
+                            if (target == 5) 1 else 0
+                        )
                         database.insert("ROUND", CONFLICT_IGNORE, contentValues)
                         index++
                     } while (res.moveToNext())
@@ -150,12 +167,13 @@ object Migration9 : Migration(8, 9) {
 
     private fun getOrCreateStandardRound(db: SupportSQLiteDatabase, training: Long): Long? {
         val res = db.query(
-                "SELECT r.ppp, r.target, r.distance, r.unit, COUNT(p._id), r.indoor " +
-                        "FROM ROUND_OLD r " +
-                        "LEFT JOIN PASSE p ON r._id = p.round " +
-                        "WHERE r.training=" + training + " " +
-                        "GROUP BY r._id " +
-                        "ORDER BY r._id ASC")
+            "SELECT r.ppp, r.target, r.distance, r.unit, COUNT(p._id), r.indoor " +
+                    "FROM ROUND_OLD r " +
+                    "LEFT JOIN PASSE p ON r._id = p.round " +
+                    "WHERE r.training=" + training + " " +
+                    "GROUP BY r._id " +
+                    "ORDER BY r._id ASC"
+        )
         val sr = StandardRound()
         sr.name = "Practice"
         sr.club = 512
@@ -166,7 +184,8 @@ object Migration9 : Migration(8, 9) {
                 template.shotsPerEnd = res.getInt(0)
                 val target = res.getInt(1)
                 template.targetTemplate = Target(
-                        (if (target == 4) 5 else target).toLong(), if (target == 5) 1 else 0)
+                    (if (target == 4) 5 else target).toLong(), if (target == 5) 1 else 0
+                )
                 template.distance = Dimension.from(res.getInt(2).toFloat(), res.getString(3))
                 template.endCount = res.getInt(4)
                 template.index = rounds.size
@@ -189,7 +208,7 @@ object Migration9 : Migration(8, 9) {
         values.put("indoor", 0)
         if (item.id == 0L) {
             item.standardRound.id = database
-                    .insert("STANDARD_ROUND_TEMPLATE", CONFLICT_NONE, values)
+                .insert("STANDARD_ROUND_TEMPLATE", CONFLICT_NONE, values)
             for (r in item.roundTemplates) {
                 r.standardRoundId = item.id
             }
@@ -217,18 +236,23 @@ object Migration9 : Migration(8, 9) {
         values.put("scoring_style", item.targetTemplate.scoringStyleIndex)
         if (item.id == 0L) {
             item.id = database
-                    .insert("ROUND_TEMPLATE", CONFLICT_NONE, values)
+                .insert("ROUND_TEMPLATE", CONFLICT_NONE, values)
         } else {
             values.put("_id", item.id)
             database.insert("ROUND_TEMPLATE", CONFLICT_REPLACE, values)
         }
     }
 
-    private fun loadRoundTemplates(database: SupportSQLiteDatabase, sid: Long): List<RoundTemplate> {
-        val cursor = database.query("SELECT _id, r_index, arrows, target, scoring_style, " +
-                "target, scoring_style, distance, unit, size, target_unit, passes, sid " +
-                "FROM ROUND_TEMPLATE WHERE sid=?",
-                arrayOf(sid.toString()))
+    private fun loadRoundTemplates(
+        database: SupportSQLiteDatabase,
+        sid: Long
+    ): List<RoundTemplate> {
+        val cursor = database.query(
+            "SELECT _id, r_index, arrows, target, scoring_style, " +
+                    "target, scoring_style, distance, unit, size, target_unit, passes, sid " +
+                    "FROM ROUND_TEMPLATE WHERE sid=?",
+            arrayOf(sid.toString())
+        )
         val r: MutableList<RoundTemplate> = mutableListOf()
         if (cursor.moveToFirst()) {
             r.add(cursorToRoundTemplate(cursor, 0))
@@ -237,11 +261,17 @@ object Migration9 : Migration(8, 9) {
         return r
     }
 
-    private fun getRoundTemplate(database: SupportSQLiteDatabase, sid: Long, index: Int): RoundTemplate? {
-        val cursor = database.query("SELECT _id, r_index, arrows, target, scoring_style, " +
-                "target, scoring_style, distance, unit, size, target_unit, passes, sid " +
-                "FROM ROUND_TEMPLATE WHERE sid=? AND r_index=?",
-                arrayOf(sid.toString(), index.toString()))
+    private fun getRoundTemplate(
+        database: SupportSQLiteDatabase,
+        sid: Long,
+        index: Int
+    ): RoundTemplate? {
+        val cursor = database.query(
+            "SELECT _id, r_index, arrows, target, scoring_style, " +
+                    "target, scoring_style, distance, unit, size, target_unit, passes, sid " +
+                    "FROM ROUND_TEMPLATE WHERE sid=? AND r_index=?",
+            arrayOf(sid.toString(), index.toString())
+        )
         var r: RoundTemplate? = null
         if (cursor.moveToFirst()) {
             r = cursorToRoundTemplate(cursor, 0)
@@ -256,11 +286,16 @@ object Migration9 : Migration(8, 9) {
         roundTemplate.index = cursor.getInt(startColumnIndex + 1)
         roundTemplate.shotsPerEnd = cursor.getInt(startColumnIndex + 2)
         val diameter = Dimension.from(
-                cursor.getInt(startColumnIndex + 9).toFloat(), cursor.getString(startColumnIndex + 10))
-        roundTemplate.targetTemplate = Target(cursor.getLong(startColumnIndex + 3),
-                cursor.getInt(startColumnIndex + 4), diameter)
-        roundTemplate.distance = Dimension.from(cursor.getInt(startColumnIndex + 7).toFloat(),
-                cursor.getString(startColumnIndex + 8))
+            cursor.getInt(startColumnIndex + 9).toFloat(), cursor.getString(startColumnIndex + 10)
+        )
+        roundTemplate.targetTemplate = Target(
+            cursor.getLong(startColumnIndex + 3),
+            cursor.getInt(startColumnIndex + 4), diameter
+        )
+        roundTemplate.distance = Dimension.from(
+            cursor.getInt(startColumnIndex + 7).toFloat(),
+            cursor.getString(startColumnIndex + 8)
+        )
         roundTemplate.endCount = cursor.getInt(startColumnIndex + 11)
         roundTemplate.standardRoundId = cursor.getLong(startColumnIndex + 12)
         return roundTemplate
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
index 3a67b12e6..d027cf5da 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
@@ -68,9 +68,15 @@ object RoomCreationCallback : RoomDatabase.Callback() {
         }
     }
 
-    private fun insertStandardRound(db: SupportSQLiteDatabase, standardRound: StandardRound, idColumn: String) {
-        db.execSQL("INSERT OR REPLACE INTO StandardRound($idColumn, club, name) VALUES (?,?,?)",
-                arrayOf(standardRound.id, standardRound.club, standardRound.name))
+    private fun insertStandardRound(
+        db: SupportSQLiteDatabase,
+        standardRound: StandardRound,
+        idColumn: String
+    ) {
+        db.execSQL(
+            "INSERT OR REPLACE INTO StandardRound($idColumn, club, name) VALUES (?,?,?)",
+            arrayOf(standardRound.id, standardRound.club, standardRound.name)
+        )
     }
 
     private fun insertRoundTemplate(
@@ -80,37 +86,45 @@ object RoomCreationCallback : RoomDatabase.Callback() {
         standardRoundColumn: String,
         scoringStyleColumn: String
     ) {
-        db.execSQL("INSERT OR REPLACE INTO RoundTemplate($idColumn, $standardRoundColumn, `index`, " +
-                "shotsPerEnd, endCount, distance, targetId, $scoringStyleColumn, targetDiameter) " +
-                "VALUES (?,?,?,?,?,?,?,?,?)",
-                arrayOf(roundTemplate.id, roundTemplate.standardRoundId, roundTemplate.index,
-                        roundTemplate.shotsPerEnd, roundTemplate.endCount,
-                        "${roundTemplate.distance.value} ${roundTemplate.distance.unit}",
-                        roundTemplate.targetTemplate.id,
-                        roundTemplate.targetTemplate.scoringStyleIndex,
-                        roundTemplate.targetTemplate.diameter.value.toString() + " " +
-                                roundTemplate.targetTemplate.diameter.unit))
+        db.execSQL(
+            "INSERT OR REPLACE INTO RoundTemplate($idColumn, $standardRoundColumn, `index`, " +
+                    "shotsPerEnd, endCount, distance, targetId, $scoringStyleColumn, targetDiameter) " +
+                    "VALUES (?,?,?,?,?,?,?,?,?)",
+            arrayOf(
+                roundTemplate.id, roundTemplate.standardRoundId, roundTemplate.index,
+                roundTemplate.shotsPerEnd, roundTemplate.endCount,
+                "${roundTemplate.distance.value} ${roundTemplate.distance.unit}",
+                roundTemplate.targetTemplate.id,
+                roundTemplate.targetTemplate.scoringStyleIndex,
+                roundTemplate.targetTemplate.diameter.value.toString() + " " +
+                        roundTemplate.targetTemplate.diameter.unit
+            )
+        )
     }
 
     fun createScoreTriggers(database: SupportSQLiteDatabase) {
-        database.execSQL("CREATE TRIGGER round_sum_score " +
-                "AFTER UPDATE ON `End` " +
-                "BEGIN " +
-                "UPDATE `Round` SET " +
-                "reachedPoints = (SELECT SUM(reachedPoints) FROM `End` WHERE roundId = NEW.roundId), " +
-                "totalPoints = (SELECT SUM(totalPoints) FROM `End` WHERE roundId = NEW.roundId), " +
-                "shotCount = (SELECT SUM(shotCount) FROM `End` WHERE roundId = NEW.roundId) " +
-                "WHERE id = NEW.roundId;" +
-                "END;")
+        database.execSQL(
+            "CREATE TRIGGER round_sum_score " +
+                    "AFTER UPDATE ON `End` " +
+                    "BEGIN " +
+                    "UPDATE `Round` SET " +
+                    "reachedPoints = (SELECT SUM(reachedPoints) FROM `End` WHERE roundId = NEW.roundId), " +
+                    "totalPoints = (SELECT SUM(totalPoints) FROM `End` WHERE roundId = NEW.roundId), " +
+                    "shotCount = (SELECT SUM(shotCount) FROM `End` WHERE roundId = NEW.roundId) " +
+                    "WHERE id = NEW.roundId;" +
+                    "END;"
+        )
 
-        database.execSQL("CREATE TRIGGER training_sum_score " +
-                "AFTER UPDATE ON `Round` " +
-                "BEGIN " +
-                "UPDATE `Training` SET " +
-                "reachedPoints = (SELECT SUM(reachedPoints) FROM `Round` WHERE trainingId = NEW.trainingId), " +
-                "totalPoints = (SELECT SUM(totalPoints) FROM `Round` WHERE trainingId = NEW.trainingId), " +
-                "shotCount = (SELECT SUM(shotCount) FROM `Round` WHERE trainingId = NEW.trainingId) " +
-                "WHERE id = NEW.trainingId;" +
-                "END;")
+        database.execSQL(
+            "CREATE TRIGGER training_sum_score " +
+                    "AFTER UPDATE ON `Round` " +
+                    "BEGIN " +
+                    "UPDATE `Training` SET " +
+                    "reachedPoints = (SELECT SUM(reachedPoints) FROM `Round` WHERE trainingId = NEW.trainingId), " +
+                    "totalPoints = (SELECT SUM(totalPoints) FROM `Round` WHERE trainingId = NEW.trainingId), " +
+                    "shotCount = (SELECT SUM(shotCount) FROM `Round` WHERE trainingId = NEW.trainingId) " +
+                    "WHERE id = NEW.trainingId;" +
+                    "END;"
+        )
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
index b4f7ad32a..c1d72e9b0 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/EditWithImageFragmentBase.kt
@@ -32,11 +32,11 @@ import com.evernote.android.state.State
 import com.squareup.picasso.Picasso
 import de.dreier.mytargets.R
 import de.dreier.mytargets.databinding.FragmentEditImageBinding
-import de.dreier.mytargets.shared.models.Thumbnail
 import de.dreier.mytargets.shared.models.Image
-import de.dreier.mytargets.utils.moveTo
+import de.dreier.mytargets.shared.models.Thumbnail
 import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.Utils
+import de.dreier.mytargets.utils.moveTo
 import permissions.dispatcher.NeedsPermission
 import permissions.dispatcher.RuntimePermissions
 import pl.aprilapps.easyphotopicker.DefaultCallback
@@ -46,7 +46,7 @@ import java.io.IOException
 
 @RuntimePermissions
 abstract class EditWithImageFragmentBase<T : Image> protected constructor(
-        private val defaultDrawable: Int
+    private val defaultDrawable: Int
 ) : EditFragmentBase() {
 
     protected lateinit var binding: FragmentEditImageBinding
@@ -85,7 +85,11 @@ abstract class EditWithImageFragmentBase<T : Image> protected constructor(
             Thumbnail.from(context!!, defaultDrawable)
         } else Thumbnail.from(imageFile!!)
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_edit_image, container, false)
         ToolbarUtils.setSupportActionBar(this, binding.toolbar)
         ToolbarUtils.showUpAsX(this)
@@ -111,8 +115,10 @@ abstract class EditWithImageFragmentBase<T : Image> protected constructor(
                 if (hasFocus) {
                     val params = binding.appBarLayout.layoutParams as CoordinatorLayout.LayoutParams
                     val behavior = params.behavior as AppBarLayout.Behavior?
-                    behavior?.onNestedFling(binding.coordinatorLayout, binding.appBarLayout, v, 0f,
-                            v.bottom.toFloat(), true)
+                    behavior?.onNestedFling(
+                        binding.coordinatorLayout, binding.appBarLayout, v, 0f,
+                        v.bottom.toFloat(), true
+                    )
                 }
             }
         }
@@ -148,7 +154,11 @@ abstract class EditWithImageFragmentBase<T : Image> protected constructor(
     }
 
     @SuppressLint("NeedOnRequestPermissionsResult")
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<String>,
+        grantResults: IntArray
+    ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         onRequestPermissionsResult(requestCode, grantResults)
     }
@@ -156,21 +166,26 @@ abstract class EditWithImageFragmentBase<T : Image> protected constructor(
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         EasyImage.handleActivityResult(requestCode, resultCode, data, activity,
-                object : DefaultCallback() {
-
-                    override fun onImagesPicked(imageFiles: List<File>, source: EasyImage.ImageSource, type: Int) {
-                        this@EditWithImageFragmentBase.oldImageFile = this@EditWithImageFragmentBase.imageFile
-                        loadImage(imageFiles[0])
-                    }
+            object : DefaultCallback() {
+
+                override fun onImagesPicked(
+                    imageFiles: List<File>,
+                    source: EasyImage.ImageSource,
+                    type: Int
+                ) {
+                    this@EditWithImageFragmentBase.oldImageFile =
+                            this@EditWithImageFragmentBase.imageFile
+                    loadImage(imageFiles[0])
+                }
 
-                    override fun onCanceled(source: EasyImage.ImageSource?, type: Int) {
-                        //Cancel handling, you might wanna remove taken photo if it was canceled
-                        if (source == EasyImage.ImageSource.CAMERA) {
-                            val photoFile = EasyImage.lastlyTakenButCanceledPhoto(context!!)
-                            photoFile?.delete()
-                        }
+                override fun onCanceled(source: EasyImage.ImageSource?, type: Int) {
+                    //Cancel handling, you might wanna remove taken photo if it was canceled
+                    if (source == EasyImage.ImageSource.CAMERA) {
+                        val photoFile = EasyImage.lastlyTakenButCanceledPhoto(context!!)
+                        photoFile?.delete()
                     }
-                })
+                }
+            })
     }
 
     protected fun loadImage(imageFile: File?) {
@@ -179,10 +194,10 @@ abstract class EditWithImageFragmentBase<T : Image> protected constructor(
             binding.imageView.setImageResource(defaultDrawable)
         } else {
             Picasso.with(context)
-                    .load(imageFile)
-                    .fit()
-                    .centerCrop()
-                    .into(binding.imageView)
+                .load(imageFile)
+                .fit()
+                .centerCrop()
+                .into(binding.imageView)
         }
     }
 
@@ -194,7 +209,7 @@ abstract class EditWithImageFragmentBase<T : Image> protected constructor(
             try {
                 oldImageFile = imageFile
                 imageFile = File
-                        .createTempFile("img", oldImageFile!!.name, context!!.filesDir)
+                    .createTempFile("img", oldImageFile!!.name, context!!.filesDir)
                 oldImageFile!!.moveTo(imageFile!!)
             } catch (e: IOException) {
                 e.printStackTrace()
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
index 49c1c002f..d931b76c4 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
@@ -27,7 +27,8 @@ import de.dreier.mytargets.utils.multiselector.OnItemClickListener
 import de.dreier.mytargets.utils.multiselector.OnItemLongClickListener
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 
-abstract class EditableListFragmentBase<T, U : ListAdapterBase<*, T>> : FragmentBase(), OnItemClickListener<T>, OnItemLongClickListener<T> where T : IIdSettable {
+abstract class EditableListFragmentBase<T, U : ListAdapterBase<*, T>> : FragmentBase(),
+    OnItemClickListener<T>, OnItemLongClickListener<T> where T : IIdSettable {
 
     /**
      * Adapter for the fragment's RecyclerView
@@ -48,9 +49,9 @@ abstract class EditableListFragmentBase<T, U : ListAdapterBase<*, T>> : Fragment
         super.onCreate(savedInstanceState)
 
         // Restore action mode after fragment recreation
-        if(savedInstanceState != null) {
+        if (savedInstanceState != null) {
             selector.restoreSelectionStates(savedInstanceState.getBundle(KEY_SELECTOR)!!)
-            if(selector.selectable) {
+            if (selector.selectable) {
                 actionModeCallback?.restartActionMode()
             }
         }
@@ -72,18 +73,18 @@ abstract class EditableListFragmentBase<T, U : ListAdapterBase<*, T>> : Fragment
         val message = resources.getQuantityString(itemTypeDelRes, deletedIds.size, deletedIds.size)
         val coordinatorLayout = view!!.findViewById<View>(R.id.coordinatorLayout)
         Snackbar.make(coordinatorLayout, message, Snackbar.LENGTH_LONG)
-                .setAction(R.string.undo) {
-                    undoDeletion(undoDeletions)
-                }
-                .show()
+            .setAction(R.string.undo) {
+                undoDeletion(undoDeletions)
+            }
+            .show()
     }
 
     private fun deleteItems(deletedIds: List<Long>): MutableList<() -> T> {
         val deleted = deletedIds
-                .map { id -> adapter!!.getItemById(id) }
-                .filter { item -> item != null }
-                .map { it!! }
-                .toMutableList()
+            .map { id -> adapter!!.getItemById(id) }
+            .filter { item -> item != null }
+            .map { it!! }
+            .toMutableList()
         val undoActions = mutableListOf<() -> T>()
         for (item in deleted) {
             adapter!!.removeItem(item)
@@ -98,7 +99,7 @@ abstract class EditableListFragmentBase<T, U : ListAdapterBase<*, T>> : Fragment
 
     private fun undoDeletion(deleted: MutableList<() -> T>) {
         deleted.map { it.invoke() }
-                .forEach { adapter!!.addItem(it) }
+            .forEach { adapter!!.addItem(it) }
         reloadData()
         deleted.clear()
     }
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
index 4ea3ab33d..5411c49a4 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/FragmentBase.kt
@@ -17,14 +17,12 @@ package de.dreier.mytargets.base.fragments
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.support.annotation.CallSuper
 import android.support.annotation.UiThread
 import android.support.annotation.WorkerThread
 import android.support.v4.app.Fragment
 import android.support.v4.app.LoaderManager
 import android.support.v4.content.AsyncTaskLoader
 import android.support.v4.content.Loader
-import com.evernote.android.state.StateSaver
 import de.dreier.mytargets.base.navigation.NavigationController
 
 
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/ItemActionModeCallback.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/ItemActionModeCallback.kt
index 9a6d7f70b..d15aa5443 100644
--- a/app/src/main/java/de/dreier/mytargets/base/fragments/ItemActionModeCallback.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/fragments/ItemActionModeCallback.kt
@@ -32,9 +32,9 @@ typealias DeleteCallback = (List<Long>) -> Unit
 typealias StatisticsCallback = (List<Long>) -> Unit
 
 class ItemActionModeCallback(
-        private val fragment: FragmentBase,
-        private val selector: MultiSelector,
-        @PluralsRes private val itemTitleRes: Int
+    private val fragment: FragmentBase,
+    private val selector: MultiSelector,
+    @PluralsRes private val itemTitleRes: Int
 ) : ActionMode.Callback {
 
     private var actionMode: ActionMode? = null
@@ -124,7 +124,8 @@ class ItemActionModeCallback(
         if (count == 0) {
             finish()
         } else {
-            actionMode!!.title = fragment.getResources().getQuantityString(itemTitleRes, count, count)
+            actionMode!!.title =
+                    fragment.getResources().getQuantityString(itemTitleRes, count, count)
             actionMode!!.invalidate()
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
index 4f2bd61dc..8aefe81cb 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/GalleryActivity.kt
@@ -80,7 +80,12 @@ class GalleryActivity : ChildActivityBase() {
         previewAdapter.notifyDataSetChanged()
 
         binding.pager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
-            override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
+            override fun onPageScrolled(
+                position: Int,
+                positionOffset: Float,
+                positionOffsetPixels: Int
+            ) {
+            }
 
             override fun onPageSelected(position: Int) {
                 binding.imagesHorizontalList.smoothScrollToPosition(position)
@@ -145,21 +150,21 @@ class GalleryActivity : ChildActivityBase() {
 
     private fun deleteImage(currentItem: Int) {
         MaterialDialog.Builder(this)
-                .content(R.string.delete_image)
-                .negativeText(android.R.string.cancel)
-                .negativeColorRes(R.color.md_grey_500)
-                .positiveText(R.string.delete)
-                .positiveColorRes(R.color.md_red_500)
-                .onPositive { _, _ ->
-                    imageList.remove(currentItem)
-                    updateResult()
-                    invalidateOptionsMenu()
-                    adapter!!.notifyDataSetChanged()
-                    val nextItem = Math.min(imageList.size() - 1, currentItem)
-                    previewAdapter.setSelectedItem(nextItem)
-                    binding.pager.currentItem = nextItem
-                }
-                .show()
+            .content(R.string.delete_image)
+            .negativeText(android.R.string.cancel)
+            .negativeColorRes(R.color.md_grey_500)
+            .positiveText(R.string.delete)
+            .positiveColorRes(R.color.md_red_500)
+            .onPositive { _, _ ->
+                imageList.remove(currentItem)
+                updateResult()
+                invalidateOptionsMenu()
+                adapter!!.notifyDataSetChanged()
+                val nextItem = Math.min(imageList.size() - 1, currentItem)
+                previewAdapter.setSelectedItem(nextItem)
+                binding.pager.currentItem = nextItem
+            }
+            .show()
     }
 
     private fun updateResult() {
@@ -177,7 +182,11 @@ class GalleryActivity : ChildActivityBase() {
     }
 
     @SuppressLint("NeedOnRequestPermissionsResult")
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<String>,
+        grantResults: IntArray
+    ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         onRequestPermissionsResult(requestCode, grantResults)
     }
@@ -185,21 +194,25 @@ class GalleryActivity : ChildActivityBase() {
     public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         EasyImage.handleActivityResult(requestCode, resultCode, data, this,
-                object : DefaultCallback() {
-
-                    override fun onImagesPicked(imageFiles: List<File>, source: EasyImage.ImageSource, type: Int) {
-                        loadImages(imageFiles)
-                    }
+            object : DefaultCallback() {
+
+                override fun onImagesPicked(
+                    imageFiles: List<File>,
+                    source: EasyImage.ImageSource,
+                    type: Int
+                ) {
+                    loadImages(imageFiles)
+                }
 
-                    override fun onCanceled(source: EasyImage.ImageSource?, type: Int) {
-                        //Cancel handling, you might wanna remove taken photo if it was canceled
-                        if (source == EasyImage.ImageSource.CAMERA) {
-                            val photoFile = EasyImage
-                                    .lastlyTakenButCanceledPhoto(applicationContext)
-                            photoFile?.delete()
-                        }
+                override fun onCanceled(source: EasyImage.ImageSource?, type: Int) {
+                    //Cancel handling, you might wanna remove taken photo if it was canceled
+                    if (source == EasyImage.ImageSource.CAMERA) {
+                        val photoFile = EasyImage
+                            .lastlyTakenButCanceledPhoto(applicationContext)
+                        photoFile?.delete()
                     }
-                })
+                }
+            })
     }
 
     private fun loadImages(imageFile: List<File>) {
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/HorizontalListAdapters.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/HorizontalListAdapters.kt
index 19a41a1e0..98972be2b 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/HorizontalListAdapters.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/HorizontalListAdapters.kt
@@ -28,19 +28,21 @@ import de.dreier.mytargets.base.gallery.HorizontalImageViewHolder
 import de.dreier.mytargets.utils.ImageList
 import java.io.File
 
-typealias OnItemClickListener  = (Int) -> Unit
+typealias OnItemClickListener = (Int) -> Unit
 
 class HorizontalListAdapters(
-        private val activity: Activity,
-        private val images: ImageList,
-        private val clickListener: OnItemClickListener
+    private val activity: Activity,
+    private val images: ImageList,
+    private val clickListener: OnItemClickListener
 ) : RecyclerView.Adapter<HorizontalImageViewHolder>() {
 
     private var selectedItem = -1
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): HorizontalImageViewHolder {
-        return HorizontalImageViewHolder(LayoutInflater.from(parent.context)
-                .inflate(R.layout.item_image_horizontal, parent, false))
+        return HorizontalImageViewHolder(
+            LayoutInflater.from(parent.context)
+                .inflate(R.layout.item_image_horizontal, parent, false)
+        )
     }
 
     override fun onBindViewHolder(holder: HorizontalImageViewHolder, position: Int) {
@@ -51,9 +53,9 @@ class HorizontalListAdapters(
             holder.camera.visibility = View.GONE
             holder.image.visibility = View.VISIBLE
             Picasso.with(activity)
-                    .load(File(activity.filesDir, images[position].fileName))
-                    .fit()
-                    .into(holder.image)
+                .load(File(activity.filesDir, images[position].fileName))
+                .fit()
+                .into(holder.image)
             val matrix = ColorMatrix()
             if (selectedItem != position) {
                 matrix.setSaturation(0f)
diff --git a/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/ViewPagerAdapter.kt b/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/ViewPagerAdapter.kt
index 935bb0883..23c06e950 100755
--- a/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/ViewPagerAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/gallery/adapters/ViewPagerAdapter.kt
@@ -29,11 +29,16 @@ import com.github.chrisbanes.photoview.PhotoView
 import com.squareup.picasso.Callback
 import com.squareup.picasso.Picasso
 import de.dreier.mytargets.R
-import de.dreier.mytargets.utils.Utils
 import de.dreier.mytargets.utils.ImageList
+import de.dreier.mytargets.utils.Utils
 import java.io.File
 
-class ViewPagerAdapter(private val activity: Activity, private val images: ImageList, private val toolbar: Toolbar, private val imagesHorizontalList: RecyclerView) : PagerAdapter() {
+class ViewPagerAdapter(
+    private val activity: Activity,
+    private val images: ImageList,
+    private val toolbar: Toolbar,
+    private val imagesHorizontalList: RecyclerView
+) : PagerAdapter() {
     private val layoutInflater = LayoutInflater.from(activity)
     private var isShowing = true
 
@@ -55,18 +60,18 @@ class ViewPagerAdapter(private val activity: Activity, private val images: Image
         val imageView = itemView.findViewById<PhotoView>(R.id.iv)
         val image = images[position]
         Picasso.with(activity)
-                .load(File(activity.filesDir, image.fileName))
-                .fit()
-                .centerInside()
-                .into(imageView, object : Callback {
-                    override fun onSuccess() {
-                        imageView.setOnPhotoTapListener { _, _, _ -> toggleToolbar() }
-                    }
+            .load(File(activity.filesDir, image.fileName))
+            .fit()
+            .centerInside()
+            .into(imageView, object : Callback {
+                override fun onSuccess() {
+                    imageView.setOnPhotoTapListener { _, _, _ -> toggleToolbar() }
+                }
 
-                    override fun onError() {
+                override fun onError() {
 
-                    }
-                })
+                }
+            })
 
         container.addView(itemView)
         return itemView
@@ -76,24 +81,24 @@ class ViewPagerAdapter(private val activity: Activity, private val images: Image
         if (isShowing) {
             isShowing = false
             toolbar.animate()
-                    .translationY((-toolbar.bottom).toFloat())
-                    .setInterpolator(AccelerateInterpolator())
-                    .start()
+                .translationY((-toolbar.bottom).toFloat())
+                .setInterpolator(AccelerateInterpolator())
+                .start()
             imagesHorizontalList.animate()
-                    .translationY(imagesHorizontalList.bottom.toFloat())
-                    .setInterpolator(AccelerateInterpolator())
-                    .start()
+                .translationY(imagesHorizontalList.bottom.toFloat())
+                .setInterpolator(AccelerateInterpolator())
+                .start()
             Utils.hideSystemUI(activity)
         } else {
             isShowing = true
             toolbar.animate()
-                    .translationY(0f)
-                    .setInterpolator(DecelerateInterpolator())
-                    .start()
+                .translationY(0f)
+                .setInterpolator(DecelerateInterpolator())
+                .start()
             imagesHorizontalList.animate()
-                    .translationY(0f)
-                    .setInterpolator(DecelerateInterpolator())
-                    .start()
+                .translationY(0f)
+                .setInterpolator(DecelerateInterpolator())
+                .start()
             Utils.showSystemUI(activity)
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt b/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
index 60334e61e..3ccf7759a 100644
--- a/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
@@ -70,8 +70,8 @@ import de.dreier.mytargets.utils.Utils
 import de.dreier.mytargets.views.selector.*
 
 class NavigationController(
-        private val activity: AppCompatActivity,
-        private val fragment: Fragment? = null//,
+    private val activity: AppCompatActivity,
+    private val fragment: Fragment? = null//,
 //        private val fragmentManager: FragmentManager,
 //        private val containerId: Int = R.id.container
 ) {
@@ -80,26 +80,26 @@ class NavigationController(
 
     fun navigateToHelp() {
         return IntentWrapper(activity, fragment, HelpActivity::class.java)
-                .start()
+            .start()
     }
 
     fun navigateToAbout() {
         IntentWrapper(activity, fragment, AboutActivity::class.java)
-                .start()
+            .start()
     }
 
     fun navigateToGallery(images: ImageList, title: String, requestCode: Int) {
         IntentWrapper(activity, fragment, GalleryActivity::class.java)
-                .with(GalleryActivity.EXTRA_TITLE, title)
-                .with(GalleryActivity.EXTRA_IMAGES, images)
-                .forResult(requestCode)
-                .start()
+            .with(GalleryActivity.EXTRA_TITLE, title)
+            .with(GalleryActivity.EXTRA_IMAGES, images)
+            .forResult(requestCode)
+            .start()
     }
 
     fun navigateToSettings(subScreen: ESettingsScreens) {
         IntentWrapper(activity, fragment, SettingsActivity::class.java)
-                .with(PreferenceFragmentCompat.ARG_PREFERENCE_ROOT, subScreen.key)
-                .start()
+            .with(PreferenceFragmentCompat.ARG_PREFERENCE_ROOT, subScreen.key)
+            .start()
     }
 
     fun navigateToCreateArrow(): IntentWrapper {
@@ -108,29 +108,29 @@ class NavigationController(
 
     fun navigateToEditArrow(arrowId: Long): IntentWrapper {
         return IntentWrapper(activity, fragment, EditArrowActivity::class.java)
-                .with(EditArrowFragment.ARROW_ID, arrowId)
+            .with(EditArrowFragment.ARROW_ID, arrowId)
     }
 
     fun navigateToCreateBow(bowType: EBowType): IntentWrapper {
         return IntentWrapper(activity, fragment, EditBowActivity::class.java)
-                .with(EditBowFragment.BOW_TYPE, bowType.name)
+            .with(EditBowFragment.BOW_TYPE, bowType.name)
     }
 
     fun navigateToEditBow(bowId: Long) {
         IntentWrapper(activity, fragment, EditBowActivity::class.java)
-                .with(EditBowFragment.BOW_ID, bowId)
-                .start()
+            .with(EditBowFragment.BOW_ID, bowId)
+            .start()
     }
 
     fun navigateToCreateTraining(trainingTypeAction: String): IntentWrapper {
         return IntentWrapper(activity, fragment, EditTrainingActivity::class.java)
-                .action(trainingTypeAction)
+            .action(trainingTypeAction)
     }
 
     fun navigateToEditTraining(trainingId: Long) {
         IntentWrapper(activity, fragment, EditTrainingActivity::class.java)
-                .with(EditableListFragmentBase.ITEM_ID, trainingId)
-                .start()
+            .with(EditableListFragmentBase.ITEM_ID, trainingId)
+            .start()
     }
 
     fun navigateToCreateRound(
@@ -138,7 +138,7 @@ class NavigationController(
         fab: FloatingActionButton? = null
     ) {
         val intentWrapper = IntentWrapper(activity, fragment, EditRoundActivity::class.java)
-                .with(EditableListFragmentBase.ITEM_ID, trainingId)
+            .with(EditableListFragmentBase.ITEM_ID, trainingId)
         if (fab != null) {
             intentWrapper.fromFab(fab)
         }
@@ -147,28 +147,28 @@ class NavigationController(
 
     fun navigateToEditRound(trainingId: Long, roundId: Long) {
         IntentWrapper(activity, fragment, EditRoundActivity::class.java)
-                .with(EditableListFragmentBase.ITEM_ID, trainingId)
-                .with(EditRoundFragment.ROUND_ID, roundId)
-                .start()
+            .with(EditableListFragmentBase.ITEM_ID, trainingId)
+            .with(EditRoundFragment.ROUND_ID, roundId)
+            .start()
     }
 
     fun navigateToScoreboard(trainingId: Long, roundId: Long = -1) {
         IntentWrapper(activity, fragment, ScoreboardActivity::class.java)
-                .with(ScoreboardActivity.TRAINING_ID, trainingId)
-                .with(ScoreboardActivity.ROUND_ID, roundId)
-                .start()
+            .with(ScoreboardActivity.TRAINING_ID, trainingId)
+            .with(ScoreboardActivity.ROUND_ID, roundId)
+            .start()
     }
 
     fun navigateToDispersionPattern(statistics: ArrowStatistic) {
         IntentWrapper(activity, fragment, DispersionPatternActivity::class.java)
-                .with(DispersionPatternActivity.ITEM, statistics)
-                .start()
+            .with(DispersionPatternActivity.ITEM, statistics)
+            .start()
     }
 
     fun navigateToStatistics(roundIds: List<Long>) {
         IntentWrapper(activity, fragment, StatisticsActivity::class.java)
-                .with(StatisticsActivity.ROUND_IDS, roundIds.toLongArray())
-                .start()
+            .with(StatisticsActivity.ROUND_IDS, roundIds.toLongArray())
+            .start()
     }
 
     fun navigateToStatistics(trainingId: Long) {
@@ -179,32 +179,32 @@ class NavigationController(
 
     fun navigateToTimer(exitAfterStop: Boolean) {
         IntentWrapper(activity, fragment, TimerActivity::class.java)
-                .with(TimerFragmentBase.ARG_EXIT_AFTER_STOP, exitAfterStop)
-                .with(TimerFragmentBase.ARG_TIMER_SETTINGS, SettingsManager.timerSettings)
-                .start()
+            .with(TimerFragmentBase.ARG_EXIT_AFTER_STOP, exitAfterStop)
+            .with(TimerFragmentBase.ARG_TIMER_SETTINGS, SettingsManager.timerSettings)
+            .start()
     }
 
     fun navigateToRound(round: Round): IntentWrapper {
         return IntentWrapper(activity, fragment, RoundActivity::class.java)
-                .with(RoundFragment.ROUND_ID, round.id)
-                .clearTopSingleTop()
+            .with(RoundFragment.ROUND_ID, round.id)
+            .clearTopSingleTop()
     }
 
     fun navigateToTraining(training: Training): IntentWrapper {
         return IntentWrapper(activity, fragment, TrainingActivity::class.java)
-                .with(EditableListFragmentBase.ITEM_ID, training.id)
+            .with(EditableListFragmentBase.ITEM_ID, training.id)
     }
 
     fun navigateToCreateEnd(round: Round) {
         navigateToEditEnd(round, 0)
-                .start()
+            .start()
     }
 
     fun navigateToEditEnd(round: Round, endIndex: Int): IntentWrapper {
         return IntentWrapper(activity, fragment, InputActivity::class.java)
-                .with(InputActivity.TRAINING_ID, round.trainingId!!)
-                .with(InputActivity.ROUND_ID, round.id)
-                .with(InputActivity.END_INDEX, endIndex)
+            .with(InputActivity.TRAINING_ID, round.trainingId!!)
+            .with(InputActivity.ROUND_ID, round.id)
+            .with(InputActivity.END_INDEX, endIndex)
     }
 
     fun navigateToCreateStandardRound(): IntentWrapper {
@@ -213,66 +213,90 @@ class NavigationController(
 
     fun navigateToEditStandardRound(item: AugmentedStandardRound): IntentWrapper {
         return IntentWrapper(activity, fragment, EditStandardRoundActivity::class.java)
-                .with(ITEM, item)
+            .with(ITEM, item)
     }
 
-    fun navigateToDistance(item: Dimension, index: Int, requestCode: Int = DistanceSelector.DISTANCE_REQUEST_CODE) {
+    fun navigateToDistance(
+        item: Dimension,
+        index: Int,
+        requestCode: Int = DistanceSelector.DISTANCE_REQUEST_CODE
+    ) {
         IntentWrapper(activity, fragment, DistanceActivity::class.java)
-                .with(ITEM, item)
-                .with(SelectorBase.INDEX, index)
-                .forResult(requestCode)
-                .start()
+            .with(ITEM, item)
+            .with(SelectorBase.INDEX, index)
+            .forResult(requestCode)
+            .start()
     }
 
-    fun navigateToTarget(item: Target, index: Int = -1, requestCode: Int = TargetSelector.TARGET_REQUEST_CODE, fixedType: TargetListFragment.EFixedType = TargetListFragment.EFixedType.NONE) {
+    fun navigateToTarget(
+        item: Target,
+        index: Int = -1,
+        requestCode: Int = TargetSelector.TARGET_REQUEST_CODE,
+        fixedType: TargetListFragment.EFixedType = TargetListFragment.EFixedType.NONE
+    ) {
         IntentWrapper(activity, fragment, TargetActivity::class.java)
-                .with(ITEM, item)
-                .with(SelectorBase.INDEX, index)
-                .with(TargetListFragment.FIXED_TYPE, fixedType.name)
-                .forResult(requestCode)
-                .start()
+            .with(ITEM, item)
+            .with(SelectorBase.INDEX, index)
+            .with(TargetListFragment.FIXED_TYPE, fixedType.name)
+            .forResult(requestCode)
+            .start()
     }
 
-    fun navigateToStandardRoundList(currentSelection: AugmentedStandardRound, requestCode: Int = StandardRoundSelector.STANDARD_ROUND_REQUEST_CODE) {
+    fun navigateToStandardRoundList(
+        currentSelection: AugmentedStandardRound,
+        requestCode: Int = StandardRoundSelector.STANDARD_ROUND_REQUEST_CODE
+    ) {
         IntentWrapper(activity, fragment, StandardRoundActivity::class.java)
-                .with(ITEM, currentSelection)
-                .forResult(requestCode)
-                .start()
+            .with(ITEM, currentSelection)
+            .forResult(requestCode)
+            .start()
     }
 
-    fun navigateToArrowList(currentSelection: Arrow, requestCode: Int = ArrowSelector.ARROW_REQUEST_CODE) {
+    fun navigateToArrowList(
+        currentSelection: Arrow,
+        requestCode: Int = ArrowSelector.ARROW_REQUEST_CODE
+    ) {
         IntentWrapper(activity, fragment, ArrowListActivity::class.java)
-                .with(ITEM, currentSelection)
-                .forResult(requestCode)
-                .start()
+            .with(ITEM, currentSelection)
+            .forResult(requestCode)
+            .start()
     }
 
     fun navigateToBowList(currentSelection: Bow, requestCode: Int = BowSelector.BOW_REQUEST_CODE) {
         IntentWrapper(activity, fragment, BowListActivity::class.java)
-                .with(ITEM, currentSelection)
-                .forResult(requestCode)
-                .start()
+            .with(ITEM, currentSelection)
+            .forResult(requestCode)
+            .start()
     }
 
-    fun navigateToEnvironment(item: Environment, requestCode: Int = EnvironmentSelector.ENVIRONMENT_REQUEST_CODE) {
+    fun navigateToEnvironment(
+        item: Environment,
+        requestCode: Int = EnvironmentSelector.ENVIRONMENT_REQUEST_CODE
+    ) {
         IntentWrapper(activity, fragment, EnvironmentActivity::class.java)
-                .with(ITEM, item)
-                .forResult(requestCode)
-                .start()
+            .with(ITEM, item)
+            .forResult(requestCode)
+            .start()
     }
 
-    fun navigateToWindDirection(selectedItem: WindDirection, requestCode: Int = WindDirectionSelector.WIND_DIRECTION_REQUEST_CODE) {
+    fun navigateToWindDirection(
+        selectedItem: WindDirection,
+        requestCode: Int = WindDirectionSelector.WIND_DIRECTION_REQUEST_CODE
+    ) {
         IntentWrapper(activity, fragment, WindDirectionActivity::class.java)
-                .with(ITEM, selectedItem)
-                .forResult(requestCode)
-                .start()
+            .with(ITEM, selectedItem)
+            .forResult(requestCode)
+            .start()
     }
 
-    fun navigateToWindSpeed(selectedItem: WindSpeed, requestCode: Int = WindSpeedSelector.WIND_SPEED_REQUEST_CODE) {
+    fun navigateToWindSpeed(
+        selectedItem: WindSpeed,
+        requestCode: Int = WindSpeedSelector.WIND_SPEED_REQUEST_CODE
+    ) {
         IntentWrapper(activity, fragment, WindSpeedActivity::class.java)
-                .with(ITEM, selectedItem)
-                .forResult(requestCode)
-                .start()
+            .with(ITEM, selectedItem)
+            .forResult(requestCode)
+            .start()
     }
 
     fun setResultSuccess() {
@@ -304,7 +328,7 @@ class NavigationController(
                 }
             } else {
                 activity.finish()
-                if(animate) {
+                if (animate) {
                     activity.overridePendingTransition(R.anim.left_in, R.anim.right_out)
                 }
             }
diff --git a/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt b/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt
index 3d18c3975..95e718370 100644
--- a/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/viewmodel/ViewModelFactory.kt
@@ -27,7 +27,7 @@ import de.dreier.mytargets.features.training.overview.TrainingsViewModel
 internal class ViewModelFactory : ViewModelProvider.Factory {
     @Suppress("UNCHECKED_CAST")
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return when(modelClass) {
+        return when (modelClass) {
             EditArrowViewModel::class.java -> EditArrowViewModel(ApplicationInstance.instance) as T
             TrainingViewModel::class.java -> TrainingViewModel(ApplicationInstance.instance) as T
             TrainingsViewModel::class.java -> TrainingsViewModel(ApplicationInstance.instance) as T
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListViewModel.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListViewModel.kt
index 453726638..547c632da 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListViewModel.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/ArrowListViewModel.kt
@@ -16,20 +16,13 @@
 package de.dreier.mytargets.features.arrows
 
 import android.arch.lifecycle.AndroidViewModel
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.MutableLiveData
-import android.arch.lifecycle.Transformations
 import de.dreier.mytargets.app.ApplicationInstance
-import de.dreier.mytargets.base.db.RoundRepository
 import de.dreier.mytargets.shared.models.db.Arrow
-import de.dreier.mytargets.shared.models.db.Round
-import de.dreier.mytargets.shared.models.db.Training
-import de.dreier.mytargets.utils.LiveDataUtil2
 
 class ArrowListViewModel(app: ApplicationInstance) : AndroidViewModel(app) {
 
     private val arrowDAO = ApplicationInstance.db.arrowDAO()
-    val arrows  = arrowDAO.loadArrowsLive()
+    val arrows = arrowDAO.loadArrowsLive()
 
     fun deleteArrow(item: Arrow): () -> Arrow {
         val images = arrowDAO.loadArrowImages(item.id)
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
index a294e1a8c..549792cab 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowFragment.kt
@@ -35,7 +35,11 @@ class EditArrowFragment : EditWithImageFragmentBase<ArrowImage>(R.drawable.arrow
     private lateinit var viewModel: EditArrowViewModel
     private val factory = ViewModelFactory()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         val rootView = super.onCreateView(inflater, container, savedInstanceState)
         contentBinding = FragmentEditArrowBinding.inflate(inflater, binding.content, true)
         return rootView
@@ -62,7 +66,7 @@ class EditArrowFragment : EditWithImageFragmentBase<ArrowImage>(R.drawable.arrow
             }
         })
     }
-    
+
     override fun wrapImage(imageFile: String): List<ArrowImage> {
         return listOf(ArrowImage(fileName = imageFile))
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
index 8ca51245d..bdb95494e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowListFragment.kt
@@ -24,12 +24,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import de.dreier.mytargets.R
-import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
 import de.dreier.mytargets.base.fragments.EditableListFragmentBase
 import de.dreier.mytargets.base.fragments.ItemActionModeCallback
-import de.dreier.mytargets.base.fragments.LoaderUICallback
-import de.dreier.mytargets.base.navigation.NavigationController
 import de.dreier.mytargets.base.viewmodel.ViewModelFactory
 import de.dreier.mytargets.databinding.FragmentArrowsBinding
 import de.dreier.mytargets.databinding.ItemImageDetailsBinding
@@ -56,17 +53,22 @@ class EditArrowListFragment : EditableListFragmentBase<Arrow, SimpleListAdapterB
         super.onViewCreated(view, savedInstanceState)
         binding.fab.setOnClickListener {
             navigationController.navigateToCreateArrow()
-                    .fromFab(binding.fab)
-                    .start()
+                .fromFab(binding.fab)
+                .start()
         }
     }
 
     @CallSuper
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_arrows, container, false)
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.addItemDecoration(
-                DividerItemDecoration(context!!, R.drawable.full_divider))
+            DividerItemDecoration(context!!, R.drawable.full_divider)
+        )
         adapter = ArrowAdapter()
         binding.recyclerView.itemAnimator = SlideInItemAnimator()
         binding.recyclerView.adapter = adapter
@@ -79,32 +81,39 @@ class EditArrowListFragment : EditableListFragmentBase<Arrow, SimpleListAdapterB
         viewModel.arrows.observe(this, Observer { arrows ->
             if (arrows != null) {
                 adapter!!.setList(arrows)
-                binding.emptyState!!.root.visibility = if (arrows.isEmpty()) View.VISIBLE else View.GONE
+                binding.emptyState!!.root.visibility =
+                        if (arrows.isEmpty()) View.VISIBLE else View.GONE
             }
         })
     }
 
     private fun onEdit(itemId: Long) {
         navigationController.navigateToEditArrow(itemId)
-                .start()
+            .start()
     }
 
     override fun onSelected(item: Arrow) {
         navigationController.navigateToEditArrow(item.id)
-                .start()
+            .start()
     }
 
     override fun deleteItem(item: Arrow) = viewModel.deleteArrow(item)
 
-    private inner class ArrowAdapter : SimpleListAdapterBase<Arrow>(compareBy(Arrow::name, Arrow::id)) {
+    private inner class ArrowAdapter :
+        SimpleListAdapterBase<Arrow>(compareBy(Arrow::name, Arrow::id)) {
         public override fun onCreateViewHolder(parent: ViewGroup): ViewHolder {
             val itemView = LayoutInflater.from(parent.context)
-                    .inflate(R.layout.item_image_details, parent, false)
+                .inflate(R.layout.item_image_details, parent, false)
             return ViewHolder(itemView)
         }
     }
 
-    internal inner class ViewHolder(itemView: View) : SelectableViewHolder<Arrow>(itemView, selector, this@EditArrowListFragment, this@EditArrowListFragment) {
+    internal inner class ViewHolder(itemView: View) : SelectableViewHolder<Arrow>(
+        itemView,
+        selector,
+        this@EditArrowListFragment,
+        this@EditArrowListFragment
+    ) {
         private val binding = ItemImageDetailsBinding.bind(itemView)
 
         override fun bindItem(item: Arrow) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
index 235b53942..de03cb849 100644
--- a/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/arrows/EditArrowViewModel.kt
@@ -39,7 +39,8 @@ class EditArrowViewModel(app: ApplicationInstance) : AndroidViewModel(app) {
     val arrow: LiveData<Arrow?>
     var images: LiveData<List<ArrowImage>>
 
-    var name = ObservableField<String>(getApplication<ApplicationInstance>().getString(R.string.my_arrow))
+    var name =
+        ObservableField<String>(getApplication<ApplicationInstance>().getString(R.string.my_arrow))
     var maxArrowNumber = ObservableInt(12)
     var length = ObservableField<String>("")
     var material = ObservableField<String>("")
@@ -67,8 +68,8 @@ class EditArrowViewModel(app: ApplicationInstance) : AndroidViewModel(app) {
                 arrow
             }
         }
-        images = Transformations.map(arrowId, {
-            id -> if(id == null)
+        images = Transformations.map(arrowId, { id ->
+            if (id == null)
                 mutableListOf()
             else
                 arrowDAO.loadArrowImages(id)
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
index 66dd4c18e..722fe4dff 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
@@ -31,20 +31,21 @@ import de.dreier.mytargets.utils.multiselector.OnItemLongClickListener
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 
 internal class BowAdapter(
-        private val selector: MultiSelector,
-        private val clickListener: OnItemClickListener<Bow>,
-        private val longClickListener: OnItemLongClickListener<Bow>
+    private val selector: MultiSelector,
+    private val clickListener: OnItemClickListener<Bow>,
+    private val longClickListener: OnItemLongClickListener<Bow>
 ) : SimpleListAdapterBase<Bow>(compareBy(Bow::name, Bow::id)) {
 
     val bowDAO = ApplicationInstance.db.bowDAO()
 
     public override fun onCreateViewHolder(parent: ViewGroup): ViewHolder {
         val itemView = LayoutInflater.from(parent.context)
-                .inflate(R.layout.item_image_details, parent, false)
+            .inflate(R.layout.item_image_details, parent, false)
         return ViewHolder(itemView)
     }
 
-    internal inner class ViewHolder(itemView: View) : SelectableViewHolder<Bow>(itemView, selector, clickListener, longClickListener) {
+    internal inner class ViewHolder(itemView: View) :
+        SelectableViewHolder<Bow>(itemView, selector, clickListener, longClickListener) {
 
         val binding = ItemImageDetailsBinding.bind(itemView)
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
index d5d588d0b..b5825bcae 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowFragment.kt
@@ -56,7 +56,11 @@ class EditBowFragment : EditWithImageFragmentBase<BowImage>(R.drawable.recurve_b
 
     private val bowDAO = ApplicationInstance.db.bowDAO()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         val rootView = super.onCreateView(inflater, container, savedInstanceState)
 
         contentBinding = FragmentEditBowBinding.inflate(inflater, binding.content, true)
@@ -64,7 +68,7 @@ class EditBowFragment : EditWithImageFragmentBase<BowImage>(R.drawable.recurve_b
         contentBinding.moreFields.setOnClickListener { contentBinding.showAll = true }
 
         val bowType = EBowType
-                .valueOf(arguments!!.getString(BOW_TYPE, EBowType.RECURVE_BOW.name))
+            .valueOf(arguments!!.getString(BOW_TYPE, EBowType.RECURVE_BOW.name))
 
         if (savedInstanceState == null) {
             val bundle = arguments
@@ -157,13 +161,19 @@ class EditBowFragment : EditWithImageFragmentBase<BowImage>(R.drawable.recurve_b
         return bow
     }
 
-    private inner class SightSettingHolder internal constructor(view: View) : DynamicItemHolder<SightMark>(view) {
+    private inner class SightSettingHolder internal constructor(view: View) :
+        DynamicItemHolder<SightMark>(view) {
 
         private val binding = ItemSightMarkBinding.bind(view)
 
         init {
             binding.sightSetting.addTextChangedListener(object : TextWatcher {
-                override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {
+                override fun beforeTextChanged(
+                    charSequence: CharSequence,
+                    i: Int,
+                    i1: Int,
+                    i2: Int
+                ) {
 
                 }
 
@@ -177,10 +187,19 @@ class EditBowFragment : EditWithImageFragmentBase<BowImage>(R.drawable.recurve_b
             })
         }
 
-        override fun onBind(item: SightMark, position: Int, fragment: Fragment, removeListener: View.OnClickListener) {
+        override fun onBind(
+            item: SightMark,
+            position: Int,
+            fragment: Fragment,
+            removeListener: View.OnClickListener
+        ) {
             this.item = item
             binding.distance.setOnClickListener { selectedItem, index ->
-                navigationController.navigateToDistance(selectedItem!!, index, SimpleDistanceSelector.SIMPLE_DISTANCE_REQUEST_CODE)
+                navigationController.navigateToDistance(
+                    selectedItem!!,
+                    index,
+                    SimpleDistanceSelector.SIMPLE_DISTANCE_REQUEST_CODE
+                )
             }
             binding.distance.itemIndex = position
             binding.distance.setItem(item.distance)
@@ -189,9 +208,15 @@ class EditBowFragment : EditWithImageFragmentBase<BowImage>(R.drawable.recurve_b
         }
     }
 
-    private inner class SightMarksAdapter internal constructor(fragment: Fragment, list: MutableList<SightMark>) : DynamicItemAdapter<SightMark>(fragment, list, R.string.sight_setting_removed) {
+    private inner class SightMarksAdapter internal constructor(
+        fragment: Fragment,
+        list: MutableList<SightMark>
+    ) : DynamicItemAdapter<SightMark>(fragment, list, R.string.sight_setting_removed) {
 
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DynamicItemHolder<SightMark> {
+        override fun onCreateViewHolder(
+            parent: ViewGroup,
+            viewType: Int
+        ): DynamicItemHolder<SightMark> {
             val v = inflater.inflate(R.layout.item_sight_mark, parent, false)
             return SightSettingHolder(v)
         }
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
index f9dfa2321..8dddf6c9b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/EditBowListFragment.kt
@@ -43,8 +43,10 @@ class EditBowListFragment : EditableListFragmentBase<Bow, SimpleListAdapterBase<
 
     init {
         itemTypeDelRes = R.plurals.bow_deleted
-        actionModeCallback = ItemActionModeCallback(this, selector,
-                R.plurals.bow_selected)
+        actionModeCallback = ItemActionModeCallback(
+            this, selector,
+            R.plurals.bow_selected
+        )
         actionModeCallback?.setEditCallback(this::onEdit)
         actionModeCallback?.setDeleteCallback(this::onDelete)
     }
@@ -55,11 +57,16 @@ class EditBowListFragment : EditableListFragmentBase<Bow, SimpleListAdapterBase<
     }
 
     @CallSuper
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_bows, container, false)
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.addItemDecoration(
-                DividerItemDecoration(context!!, R.drawable.full_divider))
+            DividerItemDecoration(context!!, R.drawable.full_divider)
+        )
         adapter = BowAdapter(selector, this, this)
         binding.recyclerView.itemAnimator = SlideInItemAnimator()
         binding.recyclerView.adapter = adapter
@@ -69,8 +76,8 @@ class EditBowListFragment : EditableListFragmentBase<Bow, SimpleListAdapterBase<
             val bowType = bowTypeMap.get(itemId)
             val fab = binding.fabSpeedDial.getFabFromMenuId(itemId)
             navigationController.navigateToCreateBow(bowType)
-                    .fromFab(fab, R.color.fabBow, bowType.drawable)
-                    .start()
+                .fromFab(fab, R.color.fabBow, bowType.drawable)
+                .start()
             false
         }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceFragment.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceFragment.kt
index 8d6bbd3d9..1500fdeb2 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceFragment.kt
@@ -28,9 +28,18 @@ import de.dreier.mytargets.shared.models.Dimension
 
 class DistanceFragment : Fragment() {
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         val binding = DataBindingUtil
-                .inflate<FragmentDistanceBinding>(inflater, R.layout.fragment_distance, container, false)
+            .inflate<FragmentDistanceBinding>(
+                inflater,
+                R.layout.fragment_distance,
+                container,
+                false
+            )
         val distance = arguments!!.getParcelable<Dimension>(ITEM)
         binding.viewPager.adapter = DistanceTabsFragmentPagerAdapter(activity!!, distance)
         binding.slidingTabs.setupWithViewPager(binding.viewPager)
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
index 831e26a0e..514cac8d6 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceGridFragment.kt
@@ -35,14 +35,19 @@ import de.dreier.mytargets.shared.models.Dimension.Unit
 import de.dreier.mytargets.utils.SlideInItemAnimator
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 
-class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapterBase<Dimension>>(), DistanceInputDialog.OnClickListener {
+class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapterBase<Dimension>>(),
+    DistanceInputDialog.OnClickListener {
     private lateinit var binding: FragmentListBinding
     private lateinit var unit: Dimension.Unit
 
     private lateinit var viewModel: DistancesViewModel
     private val factory = ViewModelFactory()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_list, container, false)
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = GridLayoutManager(activity, 3)
@@ -52,9 +57,9 @@ class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapter
         binding.recyclerView.adapter = adapter
         binding.fab.setOnClickListener {
             DistanceInputDialog.Builder(context!!)
-                    .setUnit(unit.toString())
-                    .setOnClickListener(this@DistanceGridFragment)
-                    .show()
+                .setUnit(unit.toString())
+                .setOnClickListener(this@DistanceGridFragment)
+                .show()
         }
         return binding.root
     }
@@ -81,15 +86,17 @@ class DistanceGridFragment : SelectItemFragmentBase<Dimension, SimpleListAdapter
         })
     }
 
-    private inner class DistanceAdapter : SimpleListAdapterBase<Dimension>(compareBy(Dimension::value)) {
+    private inner class DistanceAdapter :
+        SimpleListAdapterBase<Dimension>(compareBy(Dimension::value)) {
         public override fun onCreateViewHolder(parent: ViewGroup): ViewHolder {
             val itemView = LayoutInflater.from(parent.context)
-                    .inflate(R.layout.item_distance, parent, false)
+                .inflate(R.layout.item_distance, parent, false)
             return ViewHolder(itemView)
         }
     }
 
-    internal inner class ViewHolder(itemView: View) : SelectableViewHolder<Dimension>(itemView, selector, this@DistanceGridFragment) {
+    internal inner class ViewHolder(itemView: View) :
+        SelectableViewHolder<Dimension>(itemView, selector, this@DistanceGridFragment) {
         private val binding = ItemDistanceBinding.bind(itemView)
 
         override fun bindItem(item: Dimension) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceInputDialog.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceInputDialog.kt
index e07b4f42a..f32db53bc 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceInputDialog.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceInputDialog.kt
@@ -36,21 +36,21 @@ class DistanceInputDialog {
         fun show() {
             val inflater = LayoutInflater.from(context)
             val binding = DataBindingUtil
-                    .inflate<DialogCommentBinding>(inflater, R.layout.dialog_comment, null, false)
+                .inflate<DialogCommentBinding>(inflater, R.layout.dialog_comment, null, false)
             binding.shotComment.inputType = InputType.TYPE_CLASS_NUMBER
             binding.unit.text = unit
             val shotComment = binding.shotComment
 
             AlertDialog.Builder(context)
-                    .setTitle(R.string.distance)
-                    .setView(binding.root)
-                    .setPositiveButton(android.R.string.ok) { dialog, _ ->
-                        val s = shotComment.text.toString()
-                        clickListener?.onOkClickListener(s)
-                        dialog.dismiss()
-                    }
-                    .setNegativeButton(android.R.string.cancel) { dialog, _ -> dialog.dismiss() }
-                    .show()
+                .setTitle(R.string.distance)
+                .setView(binding.root)
+                .setPositiveButton(android.R.string.ok) { dialog, _ ->
+                    val s = shotComment.text.toString()
+                    clickListener?.onOkClickListener(s)
+                    dialog.dismiss()
+                }
+                .setNegativeButton(android.R.string.cancel) { dialog, _ -> dialog.dismiss() }
+                .show()
         }
 
         fun setOnClickListener(listener: OnClickListener): Builder {
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceItemDecorator.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceItemDecorator.kt
index 0e1e5b9e2..b44555347 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceItemDecorator.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceItemDecorator.kt
@@ -23,13 +23,19 @@ import android.view.View
 import de.dreier.mytargets.R
 
 
-class DistanceItemDecorator(context: Context, private val gridSize: Int) : RecyclerView.ItemDecoration() {
+class DistanceItemDecorator(context: Context, private val gridSize: Int) :
+    RecyclerView.ItemDecoration() {
     private val spaceHorizontal: Int = context.resources
-            .getDimension(R.dimen.card_padding_horizontal).toInt()
+        .getDimension(R.dimen.card_padding_horizontal).toInt()
     private val spaceVertical: Int = context.resources
-            .getDimension(R.dimen.card_padding_vertical).toInt()
+        .getDimension(R.dimen.card_padding_vertical).toInt()
 
-    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State?) {
+    override fun getItemOffsets(
+        outRect: Rect,
+        view: View,
+        parent: RecyclerView,
+        state: RecyclerView.State?
+    ) {
         val position = parent.getChildAdapterPosition(view)
         if (position % gridSize == 0) {
             outRect.left = spaceHorizontal
diff --git a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceTabsFragmentPagerAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceTabsFragmentPagerAdapter.kt
index a1605f991..7b6c10010 100644
--- a/app/src/main/java/de/dreier/mytargets/features/distance/DistanceTabsFragmentPagerAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/distance/DistanceTabsFragmentPagerAdapter.kt
@@ -23,13 +23,14 @@ import de.dreier.mytargets.shared.models.Dimension
 import de.dreier.mytargets.shared.models.Dimension.Unit.*
 
 class DistanceTabsFragmentPagerAdapter(
-        private val context: FragmentActivity,
-        distance: Dimension) : FragmentPagerAdapter(context.supportFragmentManager) {
+    private val context: FragmentActivity,
+    distance: Dimension
+) : FragmentPagerAdapter(context.supportFragmentManager) {
 
     private val fragments = arrayOf(
-            DistanceGridFragment.newInstance(distance, UNITS[0]),
-            DistanceGridFragment.newInstance(distance, UNITS[1]),
-            DistanceGridFragment.newInstance(distance, UNITS[2])
+        DistanceGridFragment.newInstance(distance, UNITS[0]),
+        DistanceGridFragment.newInstance(distance, UNITS[1]),
+        DistanceGridFragment.newInstance(distance, UNITS[2])
     )
 
     override fun getItem(position: Int): Fragment {
diff --git a/app/src/main/java/de/dreier/mytargets/features/help/HelpFragment.kt b/app/src/main/java/de/dreier/mytargets/features/help/HelpFragment.kt
index e65d6d8e3..5ffa08602 100644
--- a/app/src/main/java/de/dreier/mytargets/features/help/HelpFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/help/HelpFragment.kt
@@ -54,11 +54,15 @@ class HelpFragment : Fragment() {
         }
 
     @CallSuper
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_web, container, false)
         val prompt = helpHtmlPage
         binding.webView
-                .loadDataWithBaseURL("file:///android_asset/", prompt, "text/html", "utf-8", "")
+            .loadDataWithBaseURL("file:///android_asset/", prompt, "text/html", "utf-8", "")
         binding.webView.isHorizontalScrollBarEnabled = false
         return binding.root
     }
@@ -78,9 +82,9 @@ class HelpFragment : Fragment() {
         when (item.itemId) {
             R.id.action_version_info -> {
                 VersionInfoMDialog.Builder(context)
-                        .setCopyrightText(R.string.app_copyright)
-                        .setVersionPrefix(R.string.version_prefix)
-                        .show()
+                    .setCopyrightText(R.string.app_copyright)
+                    .setVersionPrefix(R.string.version_prefix)
+                    .show()
                 return true
             }
             R.id.action_open_source_licences -> {
diff --git a/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesFragment.kt b/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesFragment.kt
index 4d9a0ea42..5acc39230 100755
--- a/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/help/licences/LicencesFragment.kt
@@ -40,18 +40,25 @@ class LicencesFragment : Fragment() {
         val homage = Homage(activity!!, R.raw.licences)
 
         // Adds a custom license definition to enable matching in your JSON list
-        homage.addLicense("epl", R.string.license_epl_name, R.string.license_epl_url,
-                R.string.license_epl_description)
+        homage.addLicense(
+            "epl", R.string.license_epl_name, R.string.license_epl_url,
+            R.string.license_epl_description
+        )
 
         homage.refreshLibraries()
 
         binding.recyclerView.addItemDecoration(
-                DividerItemDecoration(context!!, R.drawable.full_divider))
+            DividerItemDecoration(context!!, R.drawable.full_divider)
+        )
         binding.fab.visibility = View.GONE
         return HomageAdapter(homage, HomageView.ExtraInfoMode.EXPANDABLE, false)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = FragmentListBinding.inflate(inflater, container, false)
         binding.recyclerView.setHasFixedSize(true)
         val adapter = createAdapter()
diff --git a/app/src/main/java/de/dreier/mytargets/features/main/IntroActivity.kt b/app/src/main/java/de/dreier/mytargets/features/main/IntroActivity.kt
index c19d4b2ca..db0226a07 100644
--- a/app/src/main/java/de/dreier/mytargets/features/main/IntroActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/main/IntroActivity.kt
@@ -28,20 +28,24 @@ class IntroActivity : MaterialIntroActivity() {
 
         enableLastSlideAlphaExitTransition(true)
 
-        addSlide(SlideFragmentBuilder()
+        addSlide(
+            SlideFragmentBuilder()
                 .backgroundColor(R.color.introBackground)
                 .buttonsColor(R.color.colorAccent)
                 .image(R.drawable.intro_screen_1)
                 .title(getString(R.string.intro_title_track_training_progress))
                 .description(getString(R.string.intro_description_track_training_progress))
-                .build())
+                .build()
+        )
 
-        addSlide(SlideFragmentBuilder()
+        addSlide(
+            SlideFragmentBuilder()
                 .backgroundColor(R.color.introBackground)
                 .buttonsColor(R.color.colorAccent)
                 .image(R.drawable.intro_screen_2)
                 .title(getString(R.string.intro_title_everything_in_one_place))
                 .description(getString(R.string.intro_description_everything_in_one_place))
-                .build())
+                .build()
+        )
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/main/MainActivity.kt b/app/src/main/java/de/dreier/mytargets/features/main/MainActivity.kt
index fa4e06071..dd2cf1f10 100644
--- a/app/src/main/java/de/dreier/mytargets/features/main/MainActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/main/MainActivity.kt
@@ -76,9 +76,9 @@ class MainActivity : AppCompatActivity() {
         setupNavigationDrawer()
         if (savedInstanceState == null) {
             supportFragmentManager
-                    .beginTransaction()
-                    .add(R.id.content_frame, TrainingsFragment())
-                    .commit()
+                .beginTransaction()
+                .add(R.id.content_frame, TrainingsFragment())
+                .commit()
         }
     }
 
@@ -114,9 +114,9 @@ class MainActivity : AppCompatActivity() {
                 else -> throw IllegalStateException("Illegal action id")
             }
             supportFragmentManager
-                    .beginTransaction()
-                    .replace(R.id.content_frame, fragment)
-                    .commit()
+                .beginTransaction()
+                .replace(R.id.content_frame, fragment)
+                .commit()
             true
         }
     }
@@ -137,11 +137,17 @@ class MainActivity : AppCompatActivity() {
             false
         }
 
-        drawerToggle = object : ActionBarDrawerToggle(this, binding.drawerLayout, binding.toolbar, R.string.drawer_open, R.string.drawer_close) {
+        drawerToggle = object : ActionBarDrawerToggle(
+            this,
+            binding.drawerLayout,
+            binding.toolbar,
+            R.string.drawer_open,
+            R.string.drawer_close
+        ) {
             override fun onDrawerClosed(drawerView: View) {
                 super.onDrawerClosed(drawerView)
                 if (onDrawerClosePendingAction != null) {
-                    when(onDrawerClosePendingAction) {
+                    when (onDrawerClosePendingAction) {
                         R.id.nav_timer -> navigationController.navigateToTimer(false)
                         R.id.nav_settings -> navigationController.navigateToSettings(MAIN)
                         R.id.nav_help_and_feedback -> navigationController.navigateToHelp()
@@ -199,6 +205,7 @@ class MainActivity : AppCompatActivity() {
 
     companion object {
         const val KEY_LANGUAGE = "language"
+
         init {
             AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
         }
diff --git a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
index f82b8d1ba..762339fcb 100644
--- a/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/rounds/EditRoundFragment.kt
@@ -42,9 +42,13 @@ class EditRoundFragment : EditFragmentBase() {
     private val trainingDAO = ApplicationInstance.db.trainingDAO()
     private val roundDAO = ApplicationInstance.db.roundDAO()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = DataBindingUtil
-                .inflate(inflater, R.layout.fragment_edit_round, container, false)
+            .inflate(inflater, R.layout.fragment_edit_round, container, false)
 
         trainingId = arguments!!.getLong(ITEM_ID)
         if (arguments!!.containsKey(ROUND_ID)) {
@@ -55,8 +59,13 @@ class EditRoundFragment : EditFragmentBase() {
         ToolbarUtils.showUpAsX(this)
         setHasOptionsMenu(true)
 
-        binding.arrows.setOnProgressChangeListener(object : DiscreteSeekBar.OnProgressChangeListener {
-            override fun onProgressChanged(seekBar: DiscreteSeekBar, value: Int, fromUser: Boolean) {
+        binding.arrows.setOnProgressChangeListener(object :
+            DiscreteSeekBar.OnProgressChangeListener {
+            override fun onProgressChanged(
+                seekBar: DiscreteSeekBar,
+                value: Int,
+                fromUser: Boolean
+            ) {
                 updateArrowsLabel()
             }
 
@@ -67,11 +76,21 @@ class EditRoundFragment : EditFragmentBase() {
             override fun onStopTrackingTouch(seekBar: DiscreteSeekBar) {}
         })
         binding.target.setOnClickListener { selectedItem, index ->
-            val fixedType = if (roundId == null) TargetListFragment.EFixedType.NONE else TargetListFragment.EFixedType.TARGET
-            navigationController.navigateToTarget(selectedItem!!, index, TargetSelector.TARGET_REQUEST_CODE, fixedType)
+            val fixedType =
+                if (roundId == null) TargetListFragment.EFixedType.NONE else TargetListFragment.EFixedType.TARGET
+            navigationController.navigateToTarget(
+                selectedItem!!,
+                index,
+                TargetSelector.TARGET_REQUEST_CODE,
+                fixedType
+            )
         }
         binding.distance.setOnClickListener { selectedItem, index ->
-            navigationController.navigateToDistance(selectedItem!!, index, DistanceSelector.DISTANCE_REQUEST_CODE)
+            navigationController.navigateToDistance(
+                selectedItem!!,
+                index,
+                DistanceSelector.DISTANCE_REQUEST_CODE
+            )
         }
 
         if (roundId == null) {
@@ -100,8 +119,8 @@ class EditRoundFragment : EditFragmentBase() {
         if (roundId == null) {
             val round = onSaveRound()
             navigationController.navigateToRound(round!!)
-                    .noAnimation()
-                    .start()
+                .noAnimation()
+                .start()
             navigationController.navigateToCreateEnd(round)
         } else {
             onSaveRound()
@@ -134,8 +153,10 @@ class EditRoundFragment : EditFragmentBase() {
 
     private fun updateArrowsLabel() {
         binding.arrowsLabel.text = resources
-                .getQuantityString(R.plurals.arrow, binding.arrows.progress,
-                        binding.arrows.progress)
+            .getQuantityString(
+                R.plurals.arrow, binding.arrows.progress,
+                binding.arrows.progress
+            )
     }
 
     private fun loadRoundDefaultValues() {
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardConfiguration.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardConfiguration.kt
index dcac5db42..8a69d7318 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardConfiguration.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardConfiguration.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.scoreboard
 
-data class ScoreboardConfiguration (
+data class ScoreboardConfiguration(
     var showTitle: Boolean = false,
     var showProperties: Boolean = false,
     var showTable: Boolean = false,
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
index 623d17a3e..e73bbcea3 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
@@ -39,7 +39,6 @@ import android.widget.LinearLayout
 import androidx.content.systemService
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
-import de.dreier.mytargets.base.db.EndRepository
 import de.dreier.mytargets.base.db.RoundRepository
 import de.dreier.mytargets.base.db.TrainingRepository
 import de.dreier.mytargets.base.fragments.FragmentBase
@@ -52,12 +51,12 @@ import de.dreier.mytargets.shared.models.db.End
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Signature
 import de.dreier.mytargets.shared.models.db.Training
-import de.dreier.mytargets.utils.toUri
 import de.dreier.mytargets.utils.MobileWearableClient
 import de.dreier.mytargets.utils.MobileWearableClient.Companion.BROADCAST_UPDATE_TRAINING_FROM_REMOTE
 import de.dreier.mytargets.utils.Utils
 import de.dreier.mytargets.utils.print.CustomPrintDocumentAdapter
 import de.dreier.mytargets.utils.print.ViewToPdfWriter
+import de.dreier.mytargets.utils.toUri
 import org.threeten.bp.format.DateTimeFormatter
 import java.io.File
 import java.io.IOException
@@ -75,7 +74,13 @@ class ScoreboardFragment : FragmentBase() {
     private val trainingDAO = database.trainingDAO()
     private val roundDAO = database.roundDAO()
     private val roundRepository = RoundRepository(database)
-    private val trainingRepository = TrainingRepository(database, trainingDAO, roundDAO,roundRepository, database.signatureDAO())
+    private val trainingRepository = TrainingRepository(
+        database,
+        trainingDAO,
+        roundDAO,
+        roundRepository,
+        database.signatureDAO()
+    )
 
     private val updateReceiver = object : MobileWearableClient.EndUpdateReceiver() {
 
@@ -86,7 +91,11 @@ class ScoreboardFragment : FragmentBase() {
         }
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = FragmentScoreboardBinding.inflate(inflater, container, false)
 
         val args = arguments
@@ -100,8 +109,10 @@ class ScoreboardFragment : FragmentBase() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        LocalBroadcastManager.getInstance(context!!).registerReceiver(updateReceiver,
-                IntentFilter(BROADCAST_UPDATE_TRAINING_FROM_REMOTE))
+        LocalBroadcastManager.getInstance(context!!).registerReceiver(
+            updateReceiver,
+            IntentFilter(BROADCAST_UPDATE_TRAINING_FROM_REMOTE)
+        )
     }
 
     override fun onDestroy() {
@@ -120,8 +131,14 @@ class ScoreboardFragment : FragmentBase() {
             listOf(roundDAO.loadRound(roundId))
         }
         val scoreboard = ScoreboardUtils
-                .getScoreboardView(context!!, ApplicationInstance.db,
-                        Utils.getCurrentLocale(context!!), training!!, rounds, SettingsManager.scoreboardConfiguration)
+            .getScoreboardView(
+                context!!,
+                ApplicationInstance.db,
+                Utils.getCurrentLocale(context!!),
+                training!!,
+                rounds,
+                SettingsManager.scoreboardConfiguration
+            )
         return {
             binding!!.progressBar.visibility = GONE
             scoreboard.layoutParams = LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)
@@ -139,12 +156,19 @@ class ScoreboardFragment : FragmentBase() {
                 val finalArcher = archer
 
                 signatures.editSignatureArcher
-                        .setOnClickListener { onSignatureClicked(archerSignature, finalArcher) }
+                    .setOnClickListener { onSignatureClicked(archerSignature, finalArcher) }
                 signatures.editSignatureWitness
-                        .setOnClickListener { onSignatureClicked(witnessSignature, getString(R.string.target_captain)) }
+                    .setOnClickListener {
+                        onSignatureClicked(
+                            witnessSignature,
+                            getString(R.string.target_captain)
+                        )
+                    }
 
-                signatures.archerSignaturePlaceholder.visibility = if (archerSignature.isSigned) GONE else VISIBLE
-                signatures.witnessSignaturePlaceholder.visibility = if (witnessSignature.isSigned) GONE else VISIBLE
+                signatures.archerSignaturePlaceholder.visibility =
+                        if (archerSignature.isSigned) GONE else VISIBLE
+                signatures.witnessSignaturePlaceholder.visibility =
+                        if (witnessSignature.isSigned) GONE else VISIBLE
             }
         }
     }
@@ -152,9 +176,11 @@ class ScoreboardFragment : FragmentBase() {
     private fun onSignatureClicked(signature: Signature, defaultName: String) {
         val fm = fragmentManager
         if (fm != null) {
-            val signatureDialogFragment = SignatureDialogFragment.newInstance(signature, defaultName)
+            val signatureDialogFragment =
+                SignatureDialogFragment.newInstance(signature, defaultName)
             signatureDialogFragment.show(fm, "signature")
-            fm.registerFragmentLifecycleCallbacks(object : FragmentManager.FragmentLifecycleCallbacks() {
+            fm.registerFragmentLifecycleCallbacks(object :
+                FragmentManager.FragmentLifecycleCallbacks() {
                 override fun onFragmentViewDestroyed(fm: FragmentManager?, f: Fragment?) {
                     fm!!.unregisterFragmentLifecycleCallbacks(this)
                     reloadData()
@@ -203,8 +229,14 @@ class ScoreboardFragment : FragmentBase() {
                 try {
                     val scoreboardFile = File(context!!.cacheDir, getDefaultFileName(fileType))
                     val content = ScoreboardUtils
-                            .getScoreboardView(context!!, ApplicationInstance.db,
-                                    Utils.getCurrentLocale(context!!), training!!, rounds, SettingsManager.scoreboardConfiguration)
+                        .getScoreboardView(
+                            context!!,
+                            ApplicationInstance.db,
+                            Utils.getCurrentLocale(context!!),
+                            training!!,
+                            rounds,
+                            SettingsManager.scoreboardConfiguration
+                        )
                     if (fileType === EFileType.PDF && Utils.isKitKat) {
                         ScoreboardUtils.generatePdf(content, scoreboardFile)
                     } else {
@@ -223,7 +255,7 @@ class ScoreboardFragment : FragmentBase() {
                 super.onPostExecute(uri)
                 if (uri == null) {
                     Snackbar.make(binding!!.root, R.string.sharing_failed, Snackbar.LENGTH_SHORT)
-                            .show()
+                        .show()
                 } else {
                     // Build and fire intent to ask for share provider
                     val shareIntent = Intent(Intent.ACTION_SEND)
@@ -240,9 +272,11 @@ class ScoreboardFragment : FragmentBase() {
     private fun print() {
         val fileName = getDefaultFileName(EFileType.PDF)
 
-        val content = ScoreboardUtils.getScoreboardView(context!!, ApplicationInstance.db, Utils
+        val content = ScoreboardUtils.getScoreboardView(
+            context!!, ApplicationInstance.db, Utils
                 .getCurrentLocale(context!!), training!!, rounds, SettingsManager
-        .scoreboardConfiguration)
+                .scoreboardConfiguration
+        )
 
         val jobName = getString(R.string.scoreboard) + " Document"
         val pda = CustomPrintDocumentAdapter(ViewToPdfWriter(content), fileName)
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
index 26bfe912d..77aa8e105 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardUtils.kt
@@ -43,9 +43,11 @@ object ScoreboardUtils {
     private const val PAGE_WIDTH = 600
     private const val MARGIN = 50
 
-    fun getScoreboardView(context: Context, database: AppDatabase, locale: Locale,
-                          training: Training, rounds: List<Round>?,
-                          configuration: ScoreboardConfiguration): LinearLayout {
+    fun getScoreboardView(
+        context: Context, database: AppDatabase, locale: Locale,
+        training: Training, rounds: List<Round>?,
+        configuration: ScoreboardConfiguration
+    ): LinearLayout {
         val scoreboardLayout = DefaultScoreboardLayout(context, database, locale, configuration)
         val viewBuilder = ViewBuilder(context)
         scoreboardLayout.generateWithBuilder(viewBuilder, training, rounds!!)
@@ -56,9 +58,11 @@ object ScoreboardUtils {
     @Throws(IOException::class)
     fun generatePdf(content: LinearLayout, file: File) {
         val writer = ViewToPdfWriter(content)
-        writer.layoutPages(CustomPrintDocumentAdapter
+        writer.layoutPages(
+            CustomPrintDocumentAdapter
                 .DEFAULT_RESOLUTION, CustomPrintDocumentAdapter
-                .DEFAULT_MEDIA_SIZE)
+                .DEFAULT_MEDIA_SIZE
+        )
 
         val fileOutputStream = FileOutputStream(file)
         writer.writePdfDocument(arrayOf(PageRange.ALL_PAGES), fileOutputStream)
@@ -77,7 +81,8 @@ object ScoreboardUtils {
         val height = content.measuredHeight
         content.layout(0, 0, width, height)
 
-        val b = Bitmap.createBitmap(width + 2 * margin, height + 2 * margin, Bitmap.Config.ARGB_8888)
+        val b =
+            Bitmap.createBitmap(width + 2 * margin, height + 2 * margin, Bitmap.Config.ARGB_8888)
 
         val canvas = Canvas(b)
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
index 503052020..dfaf98564 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/SignatureDialogFragment.kt
@@ -33,7 +33,11 @@ class SignatureDialogFragment : DialogFragment() {
 
     private val signatureDAO = ApplicationInstance.db.signatureDAO()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         val binding = FragmentSignatureBinding.inflate(inflater, container, false)
         val args = arguments
         val signature = args!!.getParcelable<Signature>(ARG_SIGNATURE)
@@ -44,15 +48,15 @@ class SignatureDialogFragment : DialogFragment() {
         }
         binding.editName.setOnClickListener {
             MaterialDialog.Builder(context!!)
-                    .title(R.string.name)
-                    .inputType(InputType.TYPE_CLASS_TEXT)
-                    .input(defaultName, signature.name) { _, input ->
-                        signature.name = input.toString()
-                        signatureDAO.updateSignature(signature)
-                        binding.signer.text = signature.name
-                    }
-                    .negativeText(android.R.string.cancel)
-                    .show()
+                .title(R.string.name)
+                .inputType(InputType.TYPE_CLASS_TEXT)
+                .input(defaultName, signature.name) { _, input ->
+                    signature.name = input.toString()
+                    signatureDAO.updateSignature(signature)
+                    binding.signer.text = signature.name
+                }
+                .negativeText(android.R.string.cancel)
+                .show()
         }
         binding.signer.text = signature.getName(defaultName!!)
         binding.save.setOnClickListener {
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/builder/ViewBuilder.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/builder/ViewBuilder.kt
index 316748dd8..645a94c83 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/builder/ViewBuilder.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/builder/ViewBuilder.kt
@@ -94,7 +94,7 @@ class ViewBuilder(private val context: Context) : ScoreboardBuilder {
         }
 
         table.rows.map { createTableRow(it) }
-                .forEach { tableLayout.addView(it) }
+            .forEach { tableLayout.addView(it) }
         return tableLayout
     }
 
@@ -118,7 +118,7 @@ class ViewBuilder(private val context: Context) : ScoreboardBuilder {
                 params.weight = 1f
                 params.span = cell.columnSpan
             }
-            if(cell is TextCell && cell.wrapText) {
+            if (cell is TextCell && cell.wrapText) {
                 params.width = WRAP_CONTENT
                 params.weight = 1f
             }
@@ -135,8 +135,12 @@ class ViewBuilder(private val context: Context) : ScoreboardBuilder {
         imageView.minimumHeight = dp(20)
         imageView.setPadding(dp(4), dp(4), dp(4), dp(4))
         imageView.scaleType = ImageView.ScaleType.FIT_CENTER
-        imageView.setImageDrawable(CircleDrawable(density, endCell.score, endCell
-                        .arrowNumber, endCell.fillColor, endCell.textColor))
+        imageView.setImageDrawable(
+            CircleDrawable(
+                density, endCell.score, endCell
+                    .arrowNumber, endCell.fillColor, endCell.textColor
+            )
+        )
         return imageView
     }
 
@@ -149,7 +153,7 @@ class ViewBuilder(private val context: Context) : ScoreboardBuilder {
         textView.setTextColor(-0x1000000)
         textView.setPadding(dp(4), dp(4), dp(4), dp(4))
         textView.text = textCell.content
-        if(textCell.wrapText) {
+        if (textCell.wrapText) {
             textView.maxLines = 8
         }
 
@@ -166,7 +170,8 @@ class ViewBuilder(private val context: Context) : ScoreboardBuilder {
         }
         val targetCaptain = context.getString(R.string.target_captain)
 
-        val v = LayoutInflater.from(context).inflate(R.layout.partial_scoreboard_signatures, container, true)
+        val v = LayoutInflater.from(context)
+            .inflate(R.layout.partial_scoreboard_signatures, container, true)
         val archerDescriptionView = v.findViewById<TextView>(R.id.archer_description)
         archerDescriptionView.text = archerSignature.getName(archer)
         val witnessDescriptionView = v.findViewById<TextView>(R.id.witness_description)
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/builder/model/Table.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/builder/model/Table.kt
index 3fbda99fa..83f3871cf 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/builder/model/Table.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/builder/model/Table.kt
@@ -21,9 +21,15 @@ sealed class Cell {
     var columnSpan = 1
 }
 
-data class TextCell(val content: String, var bold: Boolean = false, var wrapText: Boolean = false) : Cell()
-
-data class EndCell(val score: String, val fillColor: Int, val textColor: Int, val arrowNumber: String?) : Cell()
+data class TextCell(val content: String, var bold: Boolean = false, var wrapText: Boolean = false) :
+    Cell()
+
+data class EndCell(
+    val score: String,
+    val fillColor: Int,
+    val textColor: Int,
+    val arrowNumber: String?
+) : Cell()
 
 data class Table(val wrapContent: Boolean) : Cell() {
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
index b5a9cb609..d82e54bb3 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/DefaultScoreboardLayout.kt
@@ -19,7 +19,6 @@ import android.content.Context
 import android.text.TextUtils
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.db.AppDatabase
-import de.dreier.mytargets.base.db.EndRepository
 import de.dreier.mytargets.base.db.RoundRepository
 import de.dreier.mytargets.base.db.TrainingRepository
 import de.dreier.mytargets.features.scoreboard.ScoreboardBuilder
@@ -36,7 +35,12 @@ import de.dreier.mytargets.shared.targets.scoringstyle.ScoringStyle
 import de.dreier.mytargets.utils.ScoreUtils
 import java.util.*
 
-class DefaultScoreboardLayout(private val context: Context, database: AppDatabase, private val locale: Locale, private val configuration: ScoreboardConfiguration) {
+class DefaultScoreboardLayout(
+    private val context: Context,
+    database: AppDatabase,
+    private val locale: Locale,
+    private val configuration: ScoreboardConfiguration
+) {
     private lateinit var builder: ScoreboardBuilder
 
     private val trainingDAO = database.trainingDAO()
@@ -46,7 +50,13 @@ class DefaultScoreboardLayout(private val context: Context, database: AppDatabas
     private val arrowDAO = database.arrowDAO()
     private val standardRoundDAO = database.standardRoundDAO()
     private val roundRepository = RoundRepository(database)
-    private val trainingRepository = TrainingRepository(database, trainingDAO, roundDAO, roundRepository, database.signatureDAO())
+    private val trainingRepository = TrainingRepository(
+        database,
+        trainingDAO,
+        roundDAO,
+        roundRepository,
+        database.signatureDAO()
+    )
 
     fun generateWithBuilder(builder: ScoreboardBuilder, training: Training, rounds: List<Round>) {
         this.builder = builder
@@ -63,8 +73,12 @@ class DefaultScoreboardLayout(private val context: Context, database: AppDatabas
         if (configuration.showTable) {
             for (round in rounds) {
                 builder.openSection()
-                builder.subtitle(context.resources.getQuantityString(R.plurals.rounds, round
-                        .index + 1, round.index + 1))
+                builder.subtitle(
+                    context.resources.getQuantityString(
+                        R.plurals.rounds, round
+                            .index + 1, round.index + 1
+                    )
+                )
                 if (configuration.showProperties) {
                     builder.table(getRoundInfo(round, equals))
                 }
@@ -86,22 +100,32 @@ class DefaultScoreboardLayout(private val context: Context, database: AppDatabas
         }
     }
 
-    private fun getTrainingInfoTable(training: Training, rounds: List<Round>, equals: BooleanArray): Table {
+    private fun getTrainingInfoTable(
+        training: Training,
+        rounds: List<Round>,
+        equals: BooleanArray
+    ): Table {
         val info = InfoTableBuilder()
         addStaticTrainingHeaderInfo(info, training, rounds)
         addDynamicTrainingHeaderInfo(rounds, equals, info)
         return info.info
     }
 
-    private fun addStaticTrainingHeaderInfo(info: InfoTableBuilder, training: Training, rounds: List<Round>) {
+    private fun addStaticTrainingHeaderInfo(
+        info: InfoTableBuilder,
+        training: Training,
+        rounds: List<Round>
+    ) {
         getScoreboardOnlyHeaderInfo(info, training, rounds)
 
         if (training.environment.indoor) {
             info.addLine(R.string.environment, context.getString(R.string.indoor))
         } else {
             info.addLine(R.string.weather, training.environment.weather.getName())
-            info.addLine(R.string.wind,
-                    training.environment.getWindSpeed(context))
+            info.addLine(
+                R.string.wind,
+                training.environment.getWindSpeed(context)
+            )
             if (!TextUtils.isEmpty(training.environment.location)) {
                 info.addLine(R.string.location, training.environment.location)
             }
@@ -127,7 +151,11 @@ class DefaultScoreboardLayout(private val context: Context, database: AppDatabas
         }
     }
 
-    private fun addDynamicTrainingHeaderInfo(rounds: List<Round>, equals: BooleanArray, info: InfoTableBuilder) {
+    private fun addDynamicTrainingHeaderInfo(
+        rounds: List<Round>,
+        equals: BooleanArray,
+        info: InfoTableBuilder
+    ) {
         if (rounds.isNotEmpty()) {
             getEqualValues(rounds, equals)
             val round = rounds[0]
@@ -157,8 +185,12 @@ class DefaultScoreboardLayout(private val context: Context, database: AppDatabas
         } else if (rounds.size > 1) {
             for (round in rounds) {
                 builder.openSection()
-                builder.subtitle(context.resources.getQuantityString(R.plurals.rounds, round
-                        .index + 1, round.index + 1))
+                builder.subtitle(
+                    context.resources.getQuantityString(
+                        R.plurals.rounds, round
+                            .index + 1, round.index + 1
+                    )
+                )
                 builder.table(getStatisticsForRound(listOf(round)))
                 builder.closeSection()
             }
@@ -284,8 +316,8 @@ class DefaultScoreboardLayout(private val context: Context, database: AppDatabas
     private fun appendComments(rounds: List<Round>) {
         val comments = Table(false)
         comments.startRow().addBoldCell(context.getString(R.string.round))
-                .addBoldCell(context.getString(R.string.passe))
-                .addBoldCell(context.getString(R.string.comment))
+            .addBoldCell(context.getString(R.string.passe))
+            .addBoldCell(context.getString(R.string.comment))
 
         var commentsCount = 0
         for (round in rounds) {
@@ -293,9 +325,9 @@ class DefaultScoreboardLayout(private val context: Context, database: AppDatabas
             for ((_, index, _, _, _, comment) in ends) {
                 if (!TextUtils.isEmpty(comment)) {
                     comments.startRow()
-                            .addCell(round.index + 1)
-                            .addCell(index + 1)
-                            .addCell(TextCell(comment, wrapText = true))
+                        .addCell(round.index + 1)
+                        .addCell(index + 1)
+                        .addCell(TextCell(comment, wrapText = true))
                     commentsCount++
                 }
             }
@@ -307,7 +339,11 @@ class DefaultScoreboardLayout(private val context: Context, database: AppDatabas
         }
     }
 
-    private fun getScoreboardOnlyHeaderInfo(info: InfoTableBuilder, training: Training, rounds: List<Round>) {
+    private fun getScoreboardOnlyHeaderInfo(
+        info: InfoTableBuilder,
+        training: Training,
+        rounds: List<Round>
+    ) {
         val fullName = SettingsManager.profileFullName
         if (!fullName.trim { it <= ' ' }.isEmpty()) {
             info.addLine(R.string.name, fullName)
@@ -325,13 +361,18 @@ class DefaultScoreboardLayout(private val context: Context, database: AppDatabas
             info.addLine(R.string.licence_number, licenceNumber)
         }
         if (rounds.size > 1) {
-            info.addLine(R.string.points, training.score
-                    .format(locale, SettingsManager.scoreConfiguration))
+            info.addLine(
+                R.string.points, training.score
+                    .format(locale, SettingsManager.scoreConfiguration)
+            )
         }
         info.addLine(R.string.date, training.formattedDate)
     }
 
     private fun appendSignature(training: Training) {
-        builder.signature(trainingRepository.getOrCreateArcherSignature(training), trainingRepository.getOrCreateWitnessSignature(training))
+        builder.signature(
+            trainingRepository.getOrCreateArcherSignature(training),
+            trainingRepository.getOrCreateWitnessSignature(training)
+        )
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/InfoTableBuilder.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/InfoTableBuilder.kt
index 074233deb..730a85dbb 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/InfoTableBuilder.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/layout/InfoTableBuilder.kt
@@ -38,7 +38,11 @@ class InfoTableBuilder {
         row.addCell(key).addBoldCell(value.toString(), wrap)
     }
 
-    private fun getKeyValueLine(row: Table.Row, @StringRes key: Int, value: Any, wrap: Boolean = false) {
+    private fun getKeyValueLine(
+        row: Table.Row, @StringRes key: Int,
+        value: Any,
+        wrap: Boolean = false
+    ) {
         getKeyValueLine(row, SharedApplicationInstance.getStr(key), value, wrap)
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/DatePreferenceDialogFragmentCompat.kt b/app/src/main/java/de/dreier/mytargets/features/settings/DatePreferenceDialogFragmentCompat.kt
index 2f552ca06..312fb6d01 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/DatePreferenceDialogFragmentCompat.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/DatePreferenceDialogFragmentCompat.kt
@@ -26,14 +26,17 @@ import android.widget.DatePicker
 
 import org.threeten.bp.LocalDate
 
-class DatePreferenceDialogFragmentCompat : PreferenceDialogFragmentCompat(), DialogPreference.TargetFragment, DatePickerDialog.OnDateSetListener {
+class DatePreferenceDialogFragmentCompat : PreferenceDialogFragmentCompat(),
+    DialogPreference.TargetFragment, DatePickerDialog.OnDateSetListener {
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val pref = preference as DatePreference
-        return DatePickerDialog(context!!, this,
-                pref.date.year,
-                pref.date.monthValue - 1,
-                pref.date.dayOfMonth)
+        return DatePickerDialog(
+            context!!, this,
+            pref.date.year,
+            pref.date.monthValue - 1,
+            pref.date.dayOfMonth
+        )
     }
 
     override fun onDialogClosed(b: Boolean) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/ESettingsScreens.kt b/app/src/main/java/de/dreier/mytargets/features/settings/ESettingsScreens.kt
index 6a6f90830..5f719e76d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/ESettingsScreens.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/ESettingsScreens.kt
@@ -36,7 +36,7 @@ enum class ESettingsScreens {
         get() = name.toLowerCase(Locale.US)
 
     fun create(): SettingsFragmentBase {
-        return when(this) {
+        return when (this) {
             MAIN -> MainSettingsFragment()
             PROFILE -> ProfileSettingsFragment()
             OVERVIEW -> OverviewSettingsFragment()
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/InputSettingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/InputSettingsFragment.kt
index 62c6c33a5..d0e089633 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/InputSettingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/InputSettingsFragment.kt
@@ -34,17 +34,27 @@ class InputSettingsFragment : SettingsFragmentBase() {
 
     override fun updateItemSummaries() {
         setSummary(SettingsManager.KEY_INPUT_SUMMARY_AVERAGE_OF, averageOf)
-        setSummary(SettingsManager.KEY_INPUT_ARROW_DIAMETER_SCALE, String.format(Utils
-                .getCurrentLocale(context!!), "%.1fx", SettingsManager
-                .inputArrowDiameterScale))
-        setSummary(SettingsManager.KEY_INPUT_TARGET_ZOOM, String.format(Utils
-                .getCurrentLocale(context!!), "%.1fx", SettingsManager
-                .inputTargetZoom))
-        setSummary(SettingsManager.KEY_INPUT_KEYBOARD_TYPE,
-                if (SettingsManager.inputKeyboardType == LEFT)
-                    getString(R.string.left_handed)
-                else
-                    getString(R.string.right_handed))
+        setSummary(
+            SettingsManager.KEY_INPUT_ARROW_DIAMETER_SCALE, String.format(
+                Utils
+                    .getCurrentLocale(context!!), "%.1fx", SettingsManager
+                    .inputArrowDiameterScale
+            )
+        )
+        setSummary(
+            SettingsManager.KEY_INPUT_TARGET_ZOOM, String.format(
+                Utils
+                    .getCurrentLocale(context!!), "%.1fx", SettingsManager
+                    .inputTargetZoom
+            )
+        )
+        setSummary(
+            SettingsManager.KEY_INPUT_KEYBOARD_TYPE,
+            if (SettingsManager.inputKeyboardType == LEFT)
+                getString(R.string.left_handed)
+            else
+                getString(R.string.right_handed)
+        )
         setDefaultSummary(SettingsManager.KEY_AGGREGATION_STRATEGY)
         setDefaultSummary(SettingsManager.KEY_SHOW_MODE)
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/LanguagePreference.kt b/app/src/main/java/de/dreier/mytargets/features/settings/LanguagePreference.kt
index a42dd54f4..6ece49362 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/LanguagePreference.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/LanguagePreference.kt
@@ -27,8 +27,8 @@ class LanguagePreference(context: Context, attrs: AttributeSet?) : ListPreferenc
 
     init {
         val pairList = LanguageList.getHumanReadable().zip(LanguageList.getMachineReadable())
-                .filter { pair -> SUPPORTED_LOCALES.contains(pair.component2()) }
-                .toList()
+            .filter { pair -> SUPPORTED_LOCALES.contains(pair.component2()) }
+            .toList()
 
         // use the list of human-readable language names for the displayed list
         entries = pairList.map { it.component1() }.toTypedArray()
@@ -42,36 +42,36 @@ class LanguagePreference(context: Context, attrs: AttributeSet?) : ListPreferenc
 
     companion object {
         private val SUPPORTED_LOCALES = setOf(
-                "",
-                "ca",
-                "zh-CN",
-                "zh-TW",
-                "cs",
-                "da",
-                "nl",
-                "et",
-                "en",
-                "fi",
-                "fr",
-                "de",
-                "he",
-                "hu",
-                "id",
-                "in",
-                "it",
-                "ja",
-                "no",
-                "pl",
-                "pt-PT",
-                "pt-BR",
-                "ru",
-                "sr",
-                "sk",
-                "sl",
-                "es",
-                "sv",
-                "tr",
-                "uk"
+            "",
+            "ca",
+            "zh-CN",
+            "zh-TW",
+            "cs",
+            "da",
+            "nl",
+            "et",
+            "en",
+            "fi",
+            "fr",
+            "de",
+            "he",
+            "hu",
+            "id",
+            "in",
+            "it",
+            "ja",
+            "no",
+            "pl",
+            "pt-PT",
+            "pt-BR",
+            "ru",
+            "sr",
+            "sk",
+            "sl",
+            "es",
+            "sv",
+            "tr",
+            "uk"
         )
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/ProfileSettingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/ProfileSettingsFragment.kt
index b8da20628..91b5b7ed6 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/ProfileSettingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/ProfileSettingsFragment.kt
@@ -22,7 +22,10 @@ class ProfileSettingsFragment : SettingsFragmentBase() {
     public override fun updateItemSummaries() {
         setSummary(SettingsManager.KEY_PROFILE_FIRST_NAME, SettingsManager.profileFirstName)
         setSummary(SettingsManager.KEY_PROFILE_LAST_NAME, SettingsManager.profileLastName)
-        setSummary(SettingsManager.KEY_PROFILE_BIRTHDAY, SettingsManager.profileBirthDayFormatted ?: "")
+        setSummary(
+            SettingsManager.KEY_PROFILE_BIRTHDAY,
+            SettingsManager.profileBirthDayFormatted ?: ""
+        )
         setSummary(SettingsManager.KEY_PROFILE_CLUB, SettingsManager.profileClub)
         setSummary(SettingsManager.KEY_PROFILE_LICENCE_NUMBER, SettingsManager.profileLicenceNumber)
     }
@@ -38,6 +41,7 @@ class ProfileSettingsFragment : SettingsFragmentBase() {
     }
 
     companion object {
-        private const val DIALOG_FRAGMENT_TAG = "android.support.v7.preference.PreferenceFragment.DIALOG"
+        private const val DIALOG_FRAGMENT_TAG =
+            "android.support.v7.preference.PreferenceFragment.DIALOG"
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/ScoreboardSettingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/ScoreboardSettingsFragment.kt
index 35f378720..d135597a1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/ScoreboardSettingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/ScoreboardSettingsFragment.kt
@@ -23,8 +23,10 @@ class ScoreboardSettingsFragment : SettingsFragmentBase() {
         // Disable file type selection for pre-Kitkat, since they do not support PDF generation
         val shareCategory = preferenceManager.findPreference(KEY_SCOREBOARD_SHARE)
         shareCategory.isVisible = Utils.isKitKat
-        val shareFileType = preferenceManager.findPreference(SettingsManager
-                .KEY_SCOREBOARD_SHARE_FILE_TYPE)
+        val shareFileType = preferenceManager.findPreference(
+            SettingsManager
+                .KEY_SCOREBOARD_SHARE_FILE_TYPE
+        )
         shareFileType.isVisible = Utils.isKitKat
         if (Utils.isKitKat) {
             setDefaultSummary(SettingsManager.KEY_SCOREBOARD_SHARE_FILE_TYPE)
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsActivity.kt b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsActivity.kt
index ab0618038..dd7ab4b90 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsActivity.kt
@@ -24,7 +24,8 @@ import android.view.MenuItem
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase
 import de.dreier.mytargets.features.settings.ESettingsScreens.MAIN
 
-class SettingsActivity : SimpleFragmentActivityBase(), PreferenceFragmentCompat.OnPreferenceStartScreenCallback {
+class SettingsActivity : SimpleFragmentActivityBase(),
+    PreferenceFragmentCompat.OnPreferenceStartScreenCallback {
 
     public override fun instantiateFragment(): Fragment {
         val key = intent.getStringExtra(ARG_PREFERENCE_ROOT)
@@ -39,14 +40,16 @@ class SettingsActivity : SimpleFragmentActivityBase(), PreferenceFragmentCompat.
             val manager = supportFragmentManager
             if (manager != null) {
                 val currFrag = manager
-                        .findFragmentById(android.R.id.content) as SettingsFragmentBase
+                    .findFragmentById(android.R.id.content) as SettingsFragmentBase
                 currFrag.onFragmentResume()
             }
         }
     }
 
-    override fun onPreferenceStartScreen(preferenceFragmentCompat: PreferenceFragmentCompat,
-                                         preferenceScreen: PreferenceScreen): Boolean {
+    override fun onPreferenceStartScreen(
+        preferenceFragmentCompat: PreferenceFragmentCompat,
+        preferenceScreen: PreferenceScreen
+    ): Boolean {
         val ft = supportFragmentManager.beginTransaction()
         val screen = ESettingsScreens.from(preferenceScreen.key)
         val fragment = screen.create()
@@ -71,7 +74,11 @@ class SettingsActivity : SimpleFragmentActivityBase(), PreferenceFragmentCompat.
                 } else {
                     intent.putExtra(ARG_PREFERENCE_ROOT, MAIN.key)
                     val ft = supportFragmentManager.beginTransaction()
-                    ft.replace(android.R.id.content, instantiateFragment(), SimpleFragmentActivityBase.Companion.FRAGMENT_TAG)
+                    ft.replace(
+                        android.R.id.content,
+                        instantiateFragment(),
+                        SimpleFragmentActivityBase.Companion.FRAGMENT_TAG
+                    )
                     ft.commit()
                 }
                 true
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsFragmentBase.kt
index 153a667d1..f46240c09 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsFragmentBase.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsFragmentBase.kt
@@ -26,7 +26,8 @@ import de.dreier.mytargets.R
 import de.dreier.mytargets.shared.SharedApplicationInstance
 import de.dreier.mytargets.utils.ToolbarUtils
 
-abstract class SettingsFragmentBase : PreferenceFragmentCompat(), SharedPreferences.OnSharedPreferenceChangeListener {
+abstract class SettingsFragmentBase : PreferenceFragmentCompat(),
+    SharedPreferences.OnSharedPreferenceChangeListener {
 
     private var rootKey = "main"
 
@@ -46,7 +47,8 @@ abstract class SettingsFragmentBase : PreferenceFragmentCompat(), SharedPreferen
 
         // Set the default white background in the view so as to avoid transparency
         view.setBackgroundColor(
-                ContextCompat.getColor(context!!, R.color.background_material_light))
+            ContextCompat.getColor(context!!, R.color.background_material_light)
+        )
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
@@ -66,7 +68,7 @@ abstract class SettingsFragmentBase : PreferenceFragmentCompat(), SharedPreferen
         super.onResume()
         onFragmentResume()
         SharedApplicationInstance.sharedPreferences
-                .registerOnSharedPreferenceChangeListener(this)
+            .registerOnSharedPreferenceChangeListener(this)
     }
 
     protected open fun setActivityTitle() {
@@ -76,7 +78,7 @@ abstract class SettingsFragmentBase : PreferenceFragmentCompat(), SharedPreferen
     override fun onPause() {
         super.onPause()
         SharedApplicationInstance.sharedPreferences
-                .unregisterOnSharedPreferenceChangeListener(this)
+            .unregisterOnSharedPreferenceChangeListener(this)
     }
 
     protected fun setDefaultSummary(key: String) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt
index 1c34bb563..652ccf8e8 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt
@@ -32,11 +32,11 @@ import de.dreier.mytargets.shared.models.Score
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.TimerSettings
 import de.dreier.mytargets.shared.targets.scoringstyle.ArrowAwareScoringStyle
-import de.dreier.mytargets.utils.map
-import de.dreier.mytargets.utils.toSparseArray
 import de.dreier.mytargets.shared.views.TargetViewBase
 import de.dreier.mytargets.shared.views.TargetViewBase.EInputMethod.KEYBOARD
 import de.dreier.mytargets.shared.views.TargetViewBase.EInputMethod.PLOTTING
+import de.dreier.mytargets.utils.map
+import de.dreier.mytargets.utils.toSparseArray
 import org.threeten.bp.LocalDate
 import org.threeten.bp.Period
 import org.threeten.bp.format.DateTimeFormatter
@@ -44,7 +44,7 @@ import org.threeten.bp.format.FormatStyle
 
 object SettingsManager {
     private val lastUsed = ApplicationInstance
-            .lastSharedPreferences
+        .lastSharedPreferences
     private val preferences = SharedApplicationInstance.sharedPreferences
 
     const val KEY_TIMER_WARN_TIME = "timer_warn_time"
@@ -97,9 +97,12 @@ object SettingsManager {
     private const val KEY_OVERVIEW_SHOT_SORTING = "overview_shot_sorting"
     private const val KEY_OVERVIEW_SHOT_SORTING_SPOT = "overview_shot_sorting_spot"
     const val KEY_LANGUAGE = "language"
-    const val KEY_STATISTICS_DISPERSION_PATTERN_FILE_TYPE = "statistics_dispersion_pattern_file_type"
-    const val KEY_STATISTICS_DISPERSION_PATTERN_AGGREGATION_STRATEGY = "statistics_dispersion_pattern_aggregation_strategy"
-    private const val KEY_STATISTICS_DISPERSION_PATTERN_MERGE_SPOT = "statistics_dispersion_pattern_merge_spot"
+    const val KEY_STATISTICS_DISPERSION_PATTERN_FILE_TYPE =
+        "statistics_dispersion_pattern_file_type"
+    const val KEY_STATISTICS_DISPERSION_PATTERN_AGGREGATION_STRATEGY =
+        "statistics_dispersion_pattern_aggregation_strategy"
+    private const val KEY_STATISTICS_DISPERSION_PATTERN_MERGE_SPOT =
+        "statistics_dispersion_pattern_merge_spot"
 
     var standardRound: Long
         get() = lastUsed[KEY_STANDARD_ROUND, 32].toLong()
@@ -120,9 +123,9 @@ object SettingsManager {
             return Dimension.from(distance.toFloat(), unit)
         }
         set(value) = lastUsed.edit()
-                .putInt(KEY_DISTANCE_VALUE, value.value.toInt())
-                .putString(KEY_DISTANCE_UNIT, value.unit?.toString())
-                .apply()
+            .putInt(KEY_DISTANCE_VALUE, value.value.toInt())
+            .putString(KEY_DISTANCE_UNIT, value.unit?.toString())
+            .apply()
 
     var shotsPerEnd: Int
         get() = lastUsed[KEY_ARROWS_PER_END, 3]
@@ -138,11 +141,11 @@ object SettingsManager {
             return Target(targetId.toLong(), scoringStyle, diameter)
         }
         set(value) = lastUsed.edit()
-                .putInt(KEY_TARGET, value.id.toInt())
-                .putInt(KEY_SCORING_STYLE, value.scoringStyleIndex)
-                .putInt(KEY_TARGET_DIAMETER_VALUE, value.diameter.value.toInt())
-                .putString(KEY_TARGET_DIAMETER_UNIT, value.diameter.unit?.toString())
-                .apply()
+            .putInt(KEY_TARGET, value.id.toInt())
+            .putInt(KEY_SCORING_STYLE, value.scoringStyleIndex)
+            .putInt(KEY_TARGET_DIAMETER_VALUE, value.diameter.value.toInt())
+            .putString(KEY_TARGET_DIAMETER_UNIT, value.diameter.unit?.toString())
+            .apply()
 
     var timerEnabled: Boolean
         get() = lastUsed[KEY_TIMER, false]
@@ -170,13 +173,13 @@ object SettingsManager {
         set(value) {
             lastUsed[KEY_TIMER] = value.enabled
             preferences
-                    .edit()
-                    .putBoolean(KEY_TIMER_VIBRATE, value.vibrate)
-                    .putBoolean(KEY_TIMER_SOUND, value.sound)
-                    .putString(KEY_TIMER_WAIT_TIME, value.waitTime.toString())
-                    .putString(KEY_TIMER_SHOOT_TIME, value.shootTime.toString())
-                    .putString(KEY_TIMER_WARN_TIME, value.warnTime.toString())
-                    .apply()
+                .edit()
+                .putBoolean(KEY_TIMER_VIBRATE, value.vibrate)
+                .putBoolean(KEY_TIMER_SOUND, value.sound)
+                .putString(KEY_TIMER_WAIT_TIME, value.waitTime.toString())
+                .putString(KEY_TIMER_SHOOT_TIME, value.shootTime.toString())
+                .putString(KEY_TIMER_WARN_TIME, value.warnTime.toString())
+                .apply()
         }
 
     var arrowNumbersEnabled: Boolean
@@ -196,13 +199,17 @@ object SettingsManager {
         set(value) = preferences.set(KEY_INPUT_MODE, value == KEYBOARD)
 
     var showMode: ETrainingScope
-        get() = ETrainingScope.valueOf(preferences
-                .getString(KEY_SHOW_MODE, ETrainingScope.END.toString()))
+        get() = ETrainingScope.valueOf(
+            preferences
+                .getString(KEY_SHOW_MODE, ETrainingScope.END.toString())
+        )
         set(value) = preferences.set(KEY_SHOW_MODE, value.toString())
 
     var aggregationStrategy: EAggregationStrategy
-        get() = EAggregationStrategy.valueOf(preferences
-                .getString(KEY_AGGREGATION_STRATEGY, EAggregationStrategy.AVERAGE.toString()))
+        get() = EAggregationStrategy.valueOf(
+            preferences
+                .getString(KEY_AGGREGATION_STRATEGY, EAggregationStrategy.AVERAGE.toString())
+        )
         set(value) = preferences.set(KEY_AGGREGATION_STRATEGY, value.toString())
 
     var profileFirstName: String
@@ -265,7 +272,10 @@ object SettingsManager {
 
     var statisticsDispersionPatternAggregationStrategy: EAggregationStrategy
         get() = EAggregationStrategy.valueOf(preferences[KEY_STATISTICS_DISPERSION_PATTERN_AGGREGATION_STRATEGY, EAggregationStrategy.AVERAGE.toString()])
-        set(value) = preferences.set(KEY_STATISTICS_DISPERSION_PATTERN_AGGREGATION_STRATEGY, value.toString())
+        set(value) = preferences.set(
+            KEY_STATISTICS_DISPERSION_PATTERN_AGGREGATION_STRATEGY,
+            value.toString()
+        )
 
     var statisticsDispersionPatternMergeSpot: Boolean
         get() = preferences[KEY_STATISTICS_DISPERSION_PATTERN_MERGE_SPOT, false]
@@ -282,15 +292,15 @@ object SettingsManager {
     var standardRoundsLastUsed: LongSparseArray<Int>
         get() {
             return lastUsed[KEY_STANDARD_ROUNDS_LAST_USED, ""]
-                    .split(",")
-                    .filterNot { it.isEmpty() }
-                    .map { it.split(":") }
-                    .map { (a, b) -> Pair(a.toLong(), b.toInt()) }
-                    .toSparseArray()
+                .split(",")
+                .filterNot { it.isEmpty() }
+                .map { it.split(":") }
+                .map { (a, b) -> Pair(a.toLong(), b.toInt()) }
+                .toSparseArray()
         }
         set(value) = lastUsed.set(KEY_STANDARD_ROUNDS_LAST_USED, value
-                .map { (key, value) -> "$key:$value" }
-                .joinToString(","))
+            .map { (key, value) -> "$key:$value" }
+            .joinToString(","))
 
     var inputSummaryConfiguration: SummaryConfiguration
         get() {
@@ -299,17 +309,18 @@ object SettingsManager {
             config.showRound = preferences[KEY_INPUT_SUMMARY_SHOW_ROUND, true]
             config.showTraining = preferences[KEY_INPUT_SUMMARY_SHOW_TRAINING, false]
             config.showAverage = preferences[KEY_INPUT_SUMMARY_SHOW_AVERAGE, true]
-            config.averageScope = ETrainingScope.valueOf(preferences[KEY_INPUT_SUMMARY_AVERAGE_OF, "ROUND"])
+            config.averageScope =
+                    ETrainingScope.valueOf(preferences[KEY_INPUT_SUMMARY_AVERAGE_OF, "ROUND"])
             return config
         }
         set(value) {
             preferences.edit()
-                    .putBoolean(KEY_INPUT_SUMMARY_SHOW_END, value.showEnd)
-                    .putBoolean(KEY_INPUT_SUMMARY_SHOW_ROUND, value.showRound)
-                    .putBoolean(KEY_INPUT_SUMMARY_SHOW_TRAINING, value.showTraining)
-                    .putBoolean(KEY_INPUT_SUMMARY_SHOW_AVERAGE, value.showAverage)
-                    .putString(KEY_INPUT_SUMMARY_AVERAGE_OF, value.averageScope.name)
-                    .apply()
+                .putBoolean(KEY_INPUT_SUMMARY_SHOW_END, value.showEnd)
+                .putBoolean(KEY_INPUT_SUMMARY_SHOW_ROUND, value.showRound)
+                .putBoolean(KEY_INPUT_SUMMARY_SHOW_TRAINING, value.showTraining)
+                .putBoolean(KEY_INPUT_SUMMARY_SHOW_AVERAGE, value.showAverage)
+                .putString(KEY_INPUT_SUMMARY_AVERAGE_OF, value.averageScope.name)
+                .apply()
         }
 
     var scoreConfiguration: Score.Configuration
@@ -323,11 +334,11 @@ object SettingsManager {
         }
         set(value) {
             preferences.edit()
-                    .putBoolean(KEY_OVERVIEW_SHOW_REACHED_SCORE, value.showReachedScore)
-                    .putBoolean(KEY_OVERVIEW_SHOW_TOTAL_SCORE, value.showTotalScore)
-                    .putBoolean(KEY_OVERVIEW_SHOW_PERCENTAGE, value.showPercentage)
-                    .putBoolean(KEY_OVERVIEW_SHOW_ARROW_AVERAGE, value.showAverage)
-                    .apply()
+                .putBoolean(KEY_OVERVIEW_SHOW_REACHED_SCORE, value.showReachedScore)
+                .putBoolean(KEY_OVERVIEW_SHOW_TOTAL_SCORE, value.showTotalScore)
+                .putBoolean(KEY_OVERVIEW_SHOW_PERCENTAGE, value.showPercentage)
+                .putBoolean(KEY_OVERVIEW_SHOW_ARROW_AVERAGE, value.showAverage)
+                .apply()
         }
 
     val scoreboardConfiguration: ScoreboardConfiguration
@@ -361,7 +372,10 @@ object SettingsManager {
 
     fun shouldSortTarget(target: Target): Boolean {
         return preferences.getBoolean(KEY_OVERVIEW_SHOT_SORTING, true)
-                && (target.model.faceCount == 1 || preferences.getBoolean(KEY_OVERVIEW_SHOT_SORTING_SPOT, false))
+                && (target.model.faceCount == 1 || preferences.getBoolean(
+            KEY_OVERVIEW_SHOT_SORTING_SPOT,
+            false
+        ))
                 && target.getScoringStyle() !is ArrowAwareScoringStyle
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/TimerSettingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/TimerSettingsFragment.kt
index 48a09cb1b..f6c8638b7 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/TimerSettingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/TimerSettingsFragment.kt
@@ -35,8 +35,10 @@ class TimerSettingsFragment : SettingsFragmentBase() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        LocalBroadcastManager.getInstance(context!!).registerReceiver(timerReceiver,
-                IntentFilter(BROADCAST_TIMER_SETTINGS_FROM_REMOTE))
+        LocalBroadcastManager.getInstance(context!!).registerReceiver(
+            timerReceiver,
+            IntentFilter(BROADCAST_TIMER_SETTINGS_FROM_REMOTE)
+        )
     }
 
     override fun onDestroy() {
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt
index 1cbe5261e..bdea048f1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt
@@ -32,35 +32,45 @@ import mehdi.sakout.aboutpage.Element
 class AboutFragment : Fragment() {
 
     private val version: String
-        get() = getString(R.string.version,
-                BuildConfig.VERSION_NAME) + " (${BuildConfig.VERSION_CODE})"
+        get() = getString(
+            R.string.version,
+            BuildConfig.VERSION_NAME
+        ) + " (${BuildConfig.VERSION_CODE})"
 
     private val crowdinElement: Element
-        get() = WebElement(R.string.translate_crowdin, R.drawable.about_icon_crowdin,
-                URL_CROWDIN)
+        get() = WebElement(
+            R.string.translate_crowdin, R.drawable.about_icon_crowdin,
+            URL_CROWDIN
+        )
 
     private val betaTesterElement: Element
         get() = WebElement(R.string.test_beta, R.drawable.about_icon_beta_test, URL_GOOGLE_PLUS)
 
     private val googlePlusElement: Element
-        get() = WebElement(R.string.join_on_google_plus, R.drawable.about_icon_google_plus,
-                URL_GOOGLE_PLUS)
+        get() = WebElement(
+            R.string.join_on_google_plus, R.drawable.about_icon_google_plus,
+            URL_GOOGLE_PLUS
+        )
 
     private val payPalDonateElement: Element
         get() = WebElement(R.string.donate_via_paypal, R.drawable.about_icon_paypal, URL_PAYPAL)
 
     private val linkedInItem: Element
-        get() = WebElement(R.string.network_linkedin, R.drawable.about_icon_linkedin,
-                URL_LINKEDIN)
+        get() = WebElement(
+            R.string.network_linkedin, R.drawable.about_icon_linkedin,
+            URL_LINKEDIN
+        )
 
     private val shareElement: Element
         get() {
-            val shareElement = Element(getString(R.string.share_with_friends), R.drawable.about_icon_share)
+            val shareElement =
+                Element(getString(R.string.share_with_friends), R.drawable.about_icon_share)
             val sendIntent = Intent()
             sendIntent.action = Intent.ACTION_SEND
             sendIntent.putExtra(Intent.EXTRA_TEXT, URL_PLAY_STORE)
             sendIntent.type = "text/plain"
-            shareElement.intent = Intent.createChooser(sendIntent, getString(R.string.share_with_friends))
+            shareElement.intent =
+                    Intent.createChooser(sendIntent, getString(R.string.share_with_friends))
             return shareElement
         }
 
@@ -71,31 +81,42 @@ class AboutFragment : Fragment() {
             return donateElement
         }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         return AboutPage(context)
-                .isRTL(false)
-                .setImage(R.drawable.product_logo_144dp)
-                .setDescription(getString(R.string.my_targets) + "\n" + version)
-                .addGroup(getString(R.string.contribute))
-                .addItem(shareElement)
-                .addItem(crowdinElement)
-                .addItem(betaTesterElement)
-                .addItem(donateElement)
-                .addItem(payPalDonateElement)
-                .addGroup(getString(R.string.connect))
-                .addEmail("dreier.florian@gmail.com")
-                .addPlayStore("de.dreier.mytargets")
-                .addItem(googlePlusElement)
-                .addGitHub("DreierF")
-                .addItem(linkedInItem)
-                .addGroup(getString(R.string.special_thanks_to))
-                .addItem(Element(getString(R.string.all_beta_testers), null))
-                .addItem(Element(getString(R.string.all_translators)
-                        + "\n" + getString(R.string.translators), null))
-                .create()
+            .isRTL(false)
+            .setImage(R.drawable.product_logo_144dp)
+            .setDescription(getString(R.string.my_targets) + "\n" + version)
+            .addGroup(getString(R.string.contribute))
+            .addItem(shareElement)
+            .addItem(crowdinElement)
+            .addItem(betaTesterElement)
+            .addItem(donateElement)
+            .addItem(payPalDonateElement)
+            .addGroup(getString(R.string.connect))
+            .addEmail("dreier.florian@gmail.com")
+            .addPlayStore("de.dreier.mytargets")
+            .addItem(googlePlusElement)
+            .addGitHub("DreierF")
+            .addItem(linkedInItem)
+            .addGroup(getString(R.string.special_thanks_to))
+            .addItem(Element(getString(R.string.all_beta_testers), null))
+            .addItem(
+                Element(
+                    getString(R.string.all_translators)
+                            + "\n" + getString(R.string.translators), null
+                )
+            )
+            .create()
     }
 
-    private inner class WebElement internal constructor(@StringRes title: Int, icon: Int?, url: String) : Element(getString(title), icon) {
+    private inner class WebElement internal constructor(
+        @StringRes title: Int, icon: Int?,
+        url: String
+    ) : Element(getString(title), icon) {
         init {
             val intent = Intent()
             intent.action = Intent.ACTION_VIEW
@@ -106,8 +127,10 @@ class AboutFragment : Fragment() {
     }
 
     companion object {
-        private const val URL_GOOGLE_PLUS = "https://plus.google.com/u/0/communities/102686119334423317437"
-        private const val URL_PLAY_STORE = "http://play.google.com/store/apps/details?id=de.dreier.mytargets"
+        private const val URL_GOOGLE_PLUS =
+            "https://plus.google.com/u/0/communities/102686119334423317437"
+        private const val URL_PLAY_STORE =
+            "http://play.google.com/store/apps/details?id=de.dreier.mytargets"
         private const val URL_PAYPAL = "https://www.paypal.me/floriandreier"
         private const val URL_CROWDIN = "https://crowdin.com/project/mytargets"
         private const val URL_LINKEDIN = "https://de.linkedin.com/in/florian-dreier-b056a1113"
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/about/DonateActivity.kt b/app/src/main/java/de/dreier/mytargets/features/settings/about/DonateActivity.kt
index 650cfb0c5..69a727d93 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/about/DonateActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/about/DonateActivity.kt
@@ -68,13 +68,13 @@ class DonateActivity : AppCompatActivity(), BillingProcessor.IBillingHandler {
         }
 
         MaterialDialog.Builder(this)
-                .title(R.string.donate)
-                .adapter(DonationAdapter(this, this::onDonate), LinearLayoutManager(this))
-                .dismissListener {
-                    finish()
-                    overridePendingTransition(0, 0)
-                }
-                .show()
+            .title(R.string.donate)
+            .adapter(DonationAdapter(this, this::onDonate), LinearLayoutManager(this))
+            .dismissListener {
+                finish()
+                overridePendingTransition(0, 0)
+            }
+            .show()
     }
 
     fun onDonate(position: Int) {
@@ -92,11 +92,11 @@ class DonateActivity : AppCompatActivity(), BillingProcessor.IBillingHandler {
         SettingsManager.donated = true
 
         AlertDialog.Builder(this)
-                .setMessage(getString(R.string.donation_thank))
-                .setNeutralButton(android.R.string.ok, null)
-                .setCancelable(false)
-                .create()
-                .show()
+            .setMessage(getString(R.string.donation_thank))
+            .setNeutralButton(android.R.string.ok, null)
+            .setCancelable(false)
+            .create()
+            .show()
     }
 
     override fun onBillingError(errorCode: Int, error: Throwable?) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/about/DonationAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/settings/about/DonationAdapter.kt
index dd1784649..cc61e4d6f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/about/DonationAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/about/DonationAdapter.kt
@@ -23,7 +23,8 @@ import android.view.ViewGroup
 import de.dreier.mytargets.R
 import de.dreier.mytargets.databinding.ItemDonationBinding
 
-class DonationAdapter(context: Context, private val listener: (Int) -> Unit) : RecyclerView.Adapter<DonationAdapter.DonationViewHolder>() {
+class DonationAdapter(context: Context, private val listener: (Int) -> Unit) :
+    RecyclerView.Adapter<DonationAdapter.DonationViewHolder>() {
 
     private val inflater = LayoutInflater.from(context)
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupAdapter.kt
index ac413eb06..17e74ebeb 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupAdapter.kt
@@ -26,7 +26,11 @@ import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.*
 
-class BackupAdapter(context: Context, private val primaryActionListener: OnItemClickListener<BackupEntry>, private val secondaryActionListener: OnItemClickListener<BackupEntry>) : RecyclerView.Adapter<BackupAdapter.BackupViewHolder>() {
+class BackupAdapter(
+    context: Context,
+    private val primaryActionListener: OnItemClickListener<BackupEntry>,
+    private val secondaryActionListener: OnItemClickListener<BackupEntry>
+) : RecyclerView.Adapter<BackupAdapter.BackupViewHolder>() {
     private val inflater = LayoutInflater.from(context)
     private val formatDateTime = SimpleDateFormat.getDateInstance(DateFormat.LONG)
     private var backupEntries: MutableList<BackupEntry> = ArrayList()
@@ -46,9 +50,9 @@ class BackupAdapter(context: Context, private val primaryActionListener: OnItemC
         holder.binding.name.text = modified
         holder.binding.details.text = p.humanReadableSize
         holder.binding.primaryAction
-                .setOnClickListener { primaryActionListener.onItemClicked(p) }
+            .setOnClickListener { primaryActionListener.onItemClicked(p) }
         holder.binding.secondaryAction
-                .setOnClickListener { secondaryActionListener.onItemClicked(p) }
+            .setOnClickListener { secondaryActionListener.onItemClicked(p) }
     }
 
     override fun getItemId(position: Int): Long {
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupException.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupException.kt
index 808a8fe9a..c6740aac2 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupException.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupException.kt
@@ -15,4 +15,5 @@
 
 package de.dreier.mytargets.features.settings.backup
 
-class BackupException @JvmOverloads constructor(message: String?, e: Exception? = null) : Exception(message, e)
+class BackupException @JvmOverloads constructor(message: String?, e: Exception? = null) :
+    Exception(message, e)
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupSettingsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupSettingsFragment.kt
index ca75c9524..1e30dba4c 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupSettingsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/BackupSettingsFragment.kt
@@ -120,7 +120,11 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
         * but in this case we want to show our own UI. */
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_backup, container, false)
         ToolbarUtils.showHomeAsUp(this)
 
@@ -130,7 +134,7 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
 
         binding.backupIntervalPreference!!.root.setOnClickListener { onBackupIntervalClicked() }
         binding.backupIntervalPreference!!.image
-                .setImageResource(R.drawable.ic_query_builder_grey600_24dp)
+            .setImageResource(R.drawable.ic_query_builder_grey600_24dp)
         binding.backupIntervalPreference!!.name.setText(R.string.backup_interval)
         updateInterval()
 
@@ -138,7 +142,7 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
 
         binding.recentBackupsList.isNestedScrollingEnabled = false
         binding.recentBackupsList
-                .addItemDecoration(DividerItemDecoration(context!!, VERTICAL))
+            .addItemDecoration(DividerItemDecoration(context!!, VERTICAL))
 
         setHasOptionsMenu(true)
         return binding.root
@@ -166,7 +170,8 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
 
         syncStatusObserver.onStatusChanged(0)
         syncObserverHandle = ContentResolver.addStatusChangeListener(
-                SYNC_OBSERVER_TYPE_PENDING or SYNC_OBSERVER_TYPE_ACTIVE, syncStatusObserver)
+            SYNC_OBSERVER_TYPE_PENDING or SYNC_OBSERVER_TYPE_ACTIVE, syncStatusObserver
+        )
     }
 
     override fun onPause() {
@@ -203,16 +208,16 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
     private fun onBackupIntervalClicked() {
         val backupIntervals = Arrays.asList(*EBackupInterval.values())
         MaterialDialog.Builder(context!!)
-                .title(R.string.backup_interval)
-                .items(backupIntervals)
-                .itemsCallbackSingleChoice(
-                        backupIntervals.indexOf(SettingsManager.backupInterval)
-                ) { _, _, index, _ ->
-                    SettingsManager.backupInterval = EBackupInterval.values()[index]
-                    updateInterval()
-                    true
-                }
-                .show()
+            .title(R.string.backup_interval)
+            .items(backupIntervals)
+            .itemsCallbackSingleChoice(
+                backupIntervals.indexOf(SettingsManager.backupInterval)
+            ) { _, _, index, _ ->
+                SettingsManager.backupInterval = EBackupInterval.values()[index]
+                updateInterval()
+                true
+            }
+            .show()
     }
 
     private fun updateInterval() {
@@ -224,18 +229,19 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
     private fun onBackupLocationClicked() {
         val item = SettingsManager.backupLocation
         MaterialDialog.Builder(context!!)
-                .title(R.string.backup_location)
-                .items(EBackupLocation.list)
-                .itemsCallbackSingleChoice(EBackupLocation.list.indexOf(item)
-                ) { _, _, index, _ ->
-                    val location = EBackupLocation.list[index]
-                    if (backup != null) {
-                        backup!!.stop()
-                    }
-                    internalApplyBackupLocationWithPermissionCheck(location)
-                    true
+            .title(R.string.backup_location)
+            .items(EBackupLocation.list)
+            .itemsCallbackSingleChoice(
+                EBackupLocation.list.indexOf(item)
+            ) { _, _, index, _ ->
+                val location = EBackupLocation.list[index]
+                if (backup != null) {
+                    backup!!.stop()
                 }
-                .show()
+                internalApplyBackupLocationWithPermissionCheck(location)
+                true
+            }
+            .show()
     }
 
     private fun updateBackupLocation() {
@@ -297,8 +303,10 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
             val timerTask = object : TimerTask() {
                 override fun run() {
                     activity!!.runOnUiThread {
-                        binding.lastBackupLabel.text = getString(R.string.last_backup, DateUtils
-                                .getRelativeTimeSpanString(time))
+                        binding.lastBackupLabel.text = getString(
+                            R.string.last_backup, DateUtils
+                                .getRelativeTimeSpanString(time)
+                        )
                     }
                 }
             }
@@ -308,53 +316,54 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
 
     private fun showError(@StringRes title: Int, message: String) {
         MaterialDialog.Builder(context!!)
-                .title(title)
-                .content(message)
-                .positiveText(android.R.string.ok)
-                .show()
+            .title(title)
+            .content(message)
+            .positiveText(android.R.string.ok)
+            .show()
     }
 
     private fun showRestoreProgressDialog(): MaterialDialog {
         return MaterialDialog.Builder(context!!)
-                .content(R.string.restoring)
-                .progress(true, 0)
-                .show()
+            .content(R.string.restoring)
+            .progress(true, 0)
+            .show()
     }
 
     private fun showBackupDetails(item: BackupEntry) {
-        val html = String.format(Locale.US,
-                "%s<br><br><b>%s</b><br>%s<br>%s",
-                getString(R.string.restore_desc),
-                getString(R.string.backup_details),
-                SimpleDateFormat.getDateTimeInstance()
-                        .format(item.modifiedDate),
-                item.humanReadableSize
+        val html = String.format(
+            Locale.US,
+            "%s<br><br><b>%s</b><br>%s<br>%s",
+            getString(R.string.restore_desc),
+            getString(R.string.backup_details),
+            SimpleDateFormat.getDateTimeInstance()
+                .format(item.modifiedDate),
+            item.humanReadableSize
         )
         MaterialDialog.Builder(context!!)
-                .title(R.string.dialog_restore_title)
-                .content(Utils.fromHtml(html))
-                .positiveText(R.string.restore)
-                .negativeText(android.R.string.cancel)
-                .positiveColor(-0x1ac6cb)
-                .negativeColor(-0x78000000)
-                .onPositive { _, _ -> restoreBackup(item) }
-                .show()
+            .title(R.string.dialog_restore_title)
+            .content(Utils.fromHtml(html))
+            .positiveText(R.string.restore)
+            .negativeText(android.R.string.cancel)
+            .positiveColor(-0x1ac6cb)
+            .negativeColor(-0x78000000)
+            .onPositive { _, _ -> restoreBackup(item) }
+            .show()
     }
 
     private fun restoreBackup(item: BackupEntry) {
         val progress = showRestoreProgressDialog()
         backup!!.restoreBackup(item,
-                object : IAsyncBackupRestore.BackupStatusListener {
-                    override fun onFinished() {
-                        progress.dismiss()
-                        Utils.doRestart(context!!)
-                    }
+            object : IAsyncBackupRestore.BackupStatusListener {
+                override fun onFinished() {
+                    progress.dismiss()
+                    Utils.doRestart(context!!)
+                }
 
-                    override fun onError(message: String) {
-                        progress.dismiss()
-                        showError(R.string.restore_failed, message)
-                    }
-                })
+                override fun onError(message: String) {
+                    progress.dismiss()
+                    showError(R.string.restore_failed, message)
+                }
+            })
     }
 
     private fun deleteBackup(backupEntry: BackupEntry) {
@@ -383,11 +392,11 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
     fun neverAskAgainForWritePermission() {
         isLeaving = true
         MaterialDialog.Builder(context!!)
-                .title(R.string.permission_required)
-                .content(R.string.backup_permission_explanation)
-                .positiveText(android.R.string.ok)
-                .onPositive { _, _ -> leaveBackupSettings() }
-                .show()
+            .title(R.string.permission_required)
+            .content(R.string.backup_permission_explanation)
+            .positiveText(android.R.string.ok)
+            .onPositive { _, _ -> leaveBackupSettings() }
+            .show()
     }
 
     @OnPermissionDenied(Manifest.permission.WRITE_EXTERNAL_STORAGE)
@@ -402,7 +411,11 @@ class BackupSettingsFragment : SettingsFragmentBase(), IAsyncBackupRestore.OnLoa
     }
 
     @SuppressLint("NeedOnRequestPermissionsResult")
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<String>,
+        grantResults: IntArray
+    ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         onRequestPermissionsResult(requestCode, grantResults)
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/EBackupLocation.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/EBackupLocation.kt
index 5c2de5d76..256193fe8 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/EBackupLocation.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/EBackupLocation.kt
@@ -23,11 +23,12 @@ import de.dreier.mytargets.shared.models.IIdProvider
 import java.util.*
 
 enum class EBackupLocation constructor(
-        override var id: Long = 0,
-        @StringRes
-        private var nameRes: Int,
-        @DrawableRes
-        var drawableRes: Int) : IIdProvider {
+    override var id: Long = 0,
+    @StringRes
+    private var nameRes: Int,
+    @DrawableRes
+    var drawableRes: Int
+) : IIdProvider {
     INTERNAL_STORAGE(1, R.string.internal_storage, R.drawable.ic_phone_android_grey600_24dp),
     EXTERNAL_STORAGE(2, R.string.external_storage, R.drawable.ic_micro_sd_card_grey600_24dp),
     GOOGLE_DRIVE(3, R.string.google_drive, R.drawable.ic_google_drive_grey600_24dp);
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/ExternalStorageBackup.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/ExternalStorageBackup.kt
index 24d645f20..a95ab886f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/ExternalStorageBackup.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/ExternalStorageBackup.kt
@@ -30,7 +30,7 @@ import java.io.IOException
 import java.util.*
 
 object ExternalStorageBackup {
-    private const  val FOLDER_NAME = "MyTargets"
+    private const val FOLDER_NAME = "MyTargets"
 
     //If may get a full path that is not the right one, even if we don't have the SD Card there.
     //We just need the "/mnt/extSdCard/" i.e and check if it's writable
@@ -78,13 +78,15 @@ object ExternalStorageBackup {
             val backupDir = File(microSdCardPath, FOLDER_NAME)
             if (backupDir.isDirectory) {
                 val backups = backupDir.listFiles()
-                        .filter { isBackup(it) }
-                        .map {
-                            BackupEntry(it.absolutePath,
-                                    Date(it.lastModified()),
-                                    it.length())
-                        }
-                        .sortedByDescending { it.modifiedDate }
+                    .filter { isBackup(it) }
+                    .map {
+                        BackupEntry(
+                            it.absolutePath,
+                            Date(it.lastModified()),
+                            it.length()
+                        )
+                    }
+                    .sortedByDescending { it.modifiedDate }
                 listener.onLoadFinished(backups)
             }
         }
@@ -93,7 +95,10 @@ object ExternalStorageBackup {
             return file.isFile && file.name.contains("backup_") && file.name.endsWith(".zip")
         }
 
-        override fun restoreBackup(backup: BackupEntry, listener: IAsyncBackupRestore.BackupStatusListener) {
+        override fun restoreBackup(
+            backup: BackupEntry,
+            listener: IAsyncBackupRestore.BackupStatusListener
+        ) {
             val file = File(backup.fileId)
             try {
                 BackupUtils.importZip(activity!!, FileInputStream(file))
@@ -105,7 +110,10 @@ object ExternalStorageBackup {
 
         }
 
-        override fun deleteBackup(backup: BackupEntry, listener: IAsyncBackupRestore.BackupStatusListener) {
+        override fun deleteBackup(
+            backup: BackupEntry,
+            listener: IAsyncBackupRestore.BackupStatusListener
+        ) {
             if (File(backup.fileId).delete()) {
                 listener.onFinished()
             } else {
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt
index 22d193be6..a68250606 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/GoogleDriveBackup.kt
@@ -44,103 +44,115 @@ object GoogleDriveBackup {
             this.activity = activity
             if (googleApiClient == null) {
                 googleApiClient = GoogleApiClient.Builder(activity)
-                        .addApi(Drive.API)
-                        .addScope(Drive.SCOPE_APPFOLDER)
-                        .addConnectionCallbacks(object : GoogleApiClient.ConnectionCallbacks {
-                            override fun onConnected(bundle: Bundle?) {
-                                Drive.DriveApi.requestSync(googleApiClient)
-                                        .setResultCallback { listener.onConnected() }
-                            }
-
-                            override fun onConnectionSuspended(cause: Int) {
-                                listener.onConnectionSuspended()
-                            }
-                        })
-                        .addOnConnectionFailedListener { result ->
-                            Timber.i("GoogleApiClient connection failed: %s", result.toString())
-                            if (!result.hasResolution()) {
-                                GoogleApiAvailability.getInstance()
-                                        .getErrorDialog(activity, result.errorCode, 0)
-                                        .show()
-                                listener.onConnectionSuspended()
-                                return@addOnConnectionFailedListener
-                            }
-                            try {
-                                result.startResolutionForResult(activity, REQUEST_CODE_RESOLUTION)
-                            } catch (e: IntentSender.SendIntentException) {
-                                Timber.e(e, "Exception while starting resolution activity")
-                            }
+                    .addApi(Drive.API)
+                    .addScope(Drive.SCOPE_APPFOLDER)
+                    .addConnectionCallbacks(object : GoogleApiClient.ConnectionCallbacks {
+                        override fun onConnected(bundle: Bundle?) {
+                            Drive.DriveApi.requestSync(googleApiClient)
+                                .setResultCallback { listener.onConnected() }
+                        }
+
+                        override fun onConnectionSuspended(cause: Int) {
+                            listener.onConnectionSuspended()
+                        }
+                    })
+                    .addOnConnectionFailedListener { result ->
+                        Timber.i("GoogleApiClient connection failed: %s", result.toString())
+                        if (!result.hasResolution()) {
+                            GoogleApiAvailability.getInstance()
+                                .getErrorDialog(activity, result.errorCode, 0)
+                                .show()
+                            listener.onConnectionSuspended()
+                            return@addOnConnectionFailedListener
                         }
-                        .build()
+                        try {
+                            result.startResolutionForResult(activity, REQUEST_CODE_RESOLUTION)
+                        } catch (e: IntentSender.SendIntentException) {
+                            Timber.e(e, "Exception while starting resolution activity")
+                        }
+                    }
+                    .build()
             }
             googleApiClient!!.connect()
         }
 
         override fun getBackups(listener: IAsyncBackupRestore.OnLoadFinishedListener) {
             val query = Query.Builder()
-                    .addFilter(Filters.eq(SearchableField.MIME_TYPE, MYTARGETS_MIME_TYPE))
-                    .addFilter(Filters.eq(SearchableField.TRASHED, false))
-                    .setSortOrder(SortOrder.Builder()
-                            .addSortDescending(SortableField.MODIFIED_DATE).build())
-                    .build()
+                .addFilter(Filters.eq(SearchableField.MIME_TYPE, MYTARGETS_MIME_TYPE))
+                .addFilter(Filters.eq(SearchableField.TRASHED, false))
+                .setSortOrder(
+                    SortOrder.Builder()
+                        .addSortDescending(SortableField.MODIFIED_DATE).build()
+                )
+                .build()
             Drive.DriveApi.getAppFolder(googleApiClient)!!.queryChildren(googleApiClient, query)
-                    .setResultCallback(object : ResultCallback<DriveApi.MetadataBufferResult> {
-
-                        private val backupsArray = ArrayList<BackupEntry>()
-
-                        override fun onResult(result: DriveApi.MetadataBufferResult) {
-                            val buffer = result.metadataBuffer
-                            val size = buffer.count
-                            for (i in 0 until size) {
-                                val metadata = buffer.get(i)
-                                val driveId = metadata.driveId
-                                val backupSize = metadata.fileSize
-                                backupsArray.add(BackupEntry(driveId.encodeToString(),
-                                        metadata.modifiedDate, backupSize))
-                            }
-                            listener.onLoadFinished(backupsArray)
-                            buffer.release()
+                .setResultCallback(object : ResultCallback<DriveApi.MetadataBufferResult> {
+
+                    private val backupsArray = ArrayList<BackupEntry>()
+
+                    override fun onResult(result: DriveApi.MetadataBufferResult) {
+                        val buffer = result.metadataBuffer
+                        val size = buffer.count
+                        for (i in 0 until size) {
+                            val metadata = buffer.get(i)
+                            val driveId = metadata.driveId
+                            val backupSize = metadata.fileSize
+                            backupsArray.add(
+                                BackupEntry(
+                                    driveId.encodeToString(),
+                                    metadata.modifiedDate, backupSize
+                                )
+                            )
                         }
-                    })
+                        listener.onLoadFinished(backupsArray)
+                        buffer.release()
+                    }
+                })
         }
 
         /**
          * Restores the given backup and restarts the app if the restore was successful.
          */
-        override fun restoreBackup(backup: BackupEntry, listener: IAsyncBackupRestore.BackupStatusListener) {
+        override fun restoreBackup(
+            backup: BackupEntry,
+            listener: IAsyncBackupRestore.BackupStatusListener
+        ) {
             DriveId.decodeFromString(backup.fileId!!)
-                    .asDriveFile()
-                    .open(googleApiClient, DriveFile.MODE_READ_ONLY, null)
-                    .setResultCallback { result ->
-                        if (!result.status.isSuccess) {
-                            listener.onError(result.status.statusMessage!!)
-                            return@setResultCallback
-                        }
+                .asDriveFile()
+                .open(googleApiClient, DriveFile.MODE_READ_ONLY, null)
+                .setResultCallback { result ->
+                    if (!result.status.isSuccess) {
+                        listener.onError(result.status.statusMessage!!)
+                        return@setResultCallback
+                    }
 
-                        // DriveContents object contains pointers to the actual byte stream
-                        val contents = result.driveContents
-                        val input = contents.inputStream
-                        try {
-                            BackupUtils.importZip(activity!!, input)
-                            listener.onFinished()
-                        } catch (e: IOException) {
-                            e.printStackTrace()
-                            listener.onError(e.localizedMessage)
-                        }
+                    // DriveContents object contains pointers to the actual byte stream
+                    val contents = result.driveContents
+                    val input = contents.inputStream
+                    try {
+                        BackupUtils.importZip(activity!!, input)
+                        listener.onFinished()
+                    } catch (e: IOException) {
+                        e.printStackTrace()
+                        listener.onError(e.localizedMessage)
                     }
+                }
         }
 
-        override fun deleteBackup(backup: BackupEntry, listener: IAsyncBackupRestore.BackupStatusListener) {
+        override fun deleteBackup(
+            backup: BackupEntry,
+            listener: IAsyncBackupRestore.BackupStatusListener
+        ) {
             DriveId.decodeFromString(backup.fileId!!)
-                    .asDriveFile()
-                    .delete(googleApiClient)
-                    .setResultCallback { result ->
-                        if (result.status.isSuccess) {
-                            listener.onFinished()
-                        } else {
-                            listener.onError(result.status.statusMessage!!)
-                        }
+                .asDriveFile()
+                .delete(googleApiClient)
+                .setResultCallback { result ->
+                    if (result.status.isSuccess) {
+                        listener.onFinished()
+                    } else {
+                        listener.onError(result.status.statusMessage!!)
                     }
+                }
         }
 
         override fun stop() {
@@ -162,9 +174,9 @@ object GoogleDriveBackup {
         @Throws(BackupException::class)
         override fun performBackup(context: Context) {
             val googleApiClient = GoogleApiClient.Builder(context)
-                    .addApi(Drive.API)
-                    .addScope(Drive.SCOPE_APPFOLDER)
-                    .build()
+                .addApi(Drive.API)
+                .addScope(Drive.SCOPE_APPFOLDER)
+                .build()
             val connectionResult = googleApiClient.blockingConnect()
             if (!connectionResult.isSuccess) {
                 throw BackupException(connectionResult.errorMessage)
@@ -185,14 +197,14 @@ object GoogleDriveBackup {
             }
 
             val changeSet = MetadataChangeSet.Builder()
-                    .setTitle(BackupUtils.backupName)
-                    .setMimeType(MYTARGETS_MIME_TYPE)
-                    .setStarred(true)
-                    .build()
+                .setTitle(BackupUtils.backupName)
+                .setMimeType(MYTARGETS_MIME_TYPE)
+                .setStarred(true)
+                .build()
 
             // create a file in selected folder
             val result1 = Drive.DriveApi.getAppFolder(googleApiClient)!!
-                    .createFile(googleApiClient, changeSet, driveContents).await()
+                .createFile(googleApiClient, changeSet, driveContents).await()
             if (!result1.status.isSuccess) {
                 throw BackupException(result1.status.statusMessage)
             }
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/InternalStorageBackup.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/InternalStorageBackup.kt
index 5a6cffff9..b3264c749 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/InternalStorageBackup.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/provider/InternalStorageBackup.kt
@@ -54,23 +54,28 @@ object InternalStorageBackup {
             val backupDir = File(Environment.getExternalStorageDirectory(), FOLDER_NAME)
             if (backupDir.isDirectory) {
                 val backups = backupDir.listFiles()
-                        .filter { isBackup(it) }
-                        .map {
-                            BackupEntry(it.absolutePath,
-                                    Date(it.lastModified()),
-                                    it.length())
-                        }
-                        .sortedByDescending { it.modifiedDate }
+                    .filter { isBackup(it) }
+                    .map {
+                        BackupEntry(
+                            it.absolutePath,
+                            Date(it.lastModified()),
+                            it.length()
+                        )
+                    }
+                    .sortedByDescending { it.modifiedDate }
                 listener.onLoadFinished(backups)
             }
         }
 
         private fun isBackup(file: File): Boolean {
             return file.isFile && file.name.contains("backup_") && file.name
-                    .endsWith(".zip")
+                .endsWith(".zip")
         }
 
-        override fun restoreBackup(backup: BackupEntry, listener: IAsyncBackupRestore.BackupStatusListener) {
+        override fun restoreBackup(
+            backup: BackupEntry,
+            listener: IAsyncBackupRestore.BackupStatusListener
+        ) {
             val file = File(backup.fileId)
             try {
                 BackupUtils.importZip(activity!!, FileInputStream(file))
@@ -82,7 +87,10 @@ object InternalStorageBackup {
 
         }
 
-        override fun deleteBackup(backup: BackupEntry, listener: IAsyncBackupRestore.BackupStatusListener) {
+        override fun deleteBackup(
+            backup: BackupEntry,
+            listener: IAsyncBackupRestore.BackupStatusListener
+        ) {
             if (File(backup.fileId).delete()) {
                 listener.onFinished()
             } else {
@@ -100,8 +108,10 @@ object InternalStorageBackup {
         @Throws(BackupException::class)
         override fun performBackup(context: Context) {
             try {
-                val backupDir = File(Environment.getExternalStorageDirectory(),
-                        FOLDER_NAME)
+                val backupDir = File(
+                    Environment.getExternalStorageDirectory(),
+                    FOLDER_NAME
+                )
                 createDirectory(backupDir)
                 val zipFile = File(backupDir, BackupUtils.backupName)
                 BackupUtils.zip(context, ApplicationInstance.db, FileOutputStream(zipFile))
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/GenericAccountService.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/GenericAccountService.kt
index 73560a727..ad8a09342 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/GenericAccountService.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/GenericAccountService.kt
@@ -45,26 +45,34 @@ class GenericAccountService : Service() {
 
     inner class Authenticator(context: Context) : AbstractAccountAuthenticator(context) {
 
-        override fun editProperties(accountAuthenticatorResponse: AccountAuthenticatorResponse,
-                                    s: String): Bundle {
+        override fun editProperties(
+            accountAuthenticatorResponse: AccountAuthenticatorResponse,
+            s: String
+        ): Bundle {
             throw UnsupportedOperationException()
         }
 
         @Throws(NetworkErrorException::class)
-        override fun addAccount(accountAuthenticatorResponse: AccountAuthenticatorResponse,
-                                s: String, s2: String, strings: Array<String>, bundle: Bundle): Bundle? {
+        override fun addAccount(
+            accountAuthenticatorResponse: AccountAuthenticatorResponse,
+            s: String, s2: String, strings: Array<String>, bundle: Bundle
+        ): Bundle? {
             return null
         }
 
         @Throws(NetworkErrorException::class)
-        override fun confirmCredentials(accountAuthenticatorResponse: AccountAuthenticatorResponse,
-                                        account: Account, bundle: Bundle): Bundle? {
+        override fun confirmCredentials(
+            accountAuthenticatorResponse: AccountAuthenticatorResponse,
+            account: Account, bundle: Bundle
+        ): Bundle? {
             return null
         }
 
         @Throws(NetworkErrorException::class)
-        override fun getAuthToken(accountAuthenticatorResponse: AccountAuthenticatorResponse,
-                                  account: Account, s: String, bundle: Bundle): Bundle {
+        override fun getAuthToken(
+            accountAuthenticatorResponse: AccountAuthenticatorResponse,
+            account: Account, s: String, bundle: Bundle
+        ): Bundle {
             throw UnsupportedOperationException()
         }
 
@@ -73,14 +81,18 @@ class GenericAccountService : Service() {
         }
 
         @Throws(NetworkErrorException::class)
-        override fun updateCredentials(accountAuthenticatorResponse: AccountAuthenticatorResponse,
-                                       account: Account, s: String, bundle: Bundle): Bundle {
+        override fun updateCredentials(
+            accountAuthenticatorResponse: AccountAuthenticatorResponse,
+            account: Account, s: String, bundle: Bundle
+        ): Bundle {
             throw UnsupportedOperationException()
         }
 
         @Throws(NetworkErrorException::class)
-        override fun hasFeatures(accountAuthenticatorResponse: AccountAuthenticatorResponse,
-                                 account: Account, strings: Array<String>): Bundle {
+        override fun hasFeatures(
+            accountAuthenticatorResponse: AccountAuthenticatorResponse,
+            account: Account, strings: Array<String>
+        ): Bundle {
             throw UnsupportedOperationException()
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/StubProvider.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/StubProvider.kt
index 252bc3f4b..32a273b35 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/StubProvider.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/StubProvider.kt
@@ -41,11 +41,12 @@ class StubProvider : ContentProvider() {
      *
      */
     override fun query(
-            uri: Uri,
-            projection: Array<String>?,
-            selection: String?,
-            selectionArgs: Array<String>?,
-            sortOrder: String?): Cursor? = null
+        uri: Uri,
+        projection: Array<String>?,
+        selection: String?,
+        selectionArgs: Array<String>?,
+        sortOrder: String?
+    ): Cursor? = null
 
     /*
      * insert() always returns null (no URI)
@@ -60,5 +61,10 @@ class StubProvider : ContentProvider() {
     /*
      * update() always returns "no rows affected" (0)
      */
-    override fun update(uri: Uri, values: ContentValues?, selection: String?, selectionArgs: Array<String>?): Int = 0
+    override fun update(
+        uri: Uri,
+        values: ContentValues?,
+        selection: String?,
+        selectionArgs: Array<String>?
+    ): Int = 0
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncAdapter.kt
index 664d44659..365c7a5f1 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncAdapter.kt
@@ -42,7 +42,8 @@ internal class SyncAdapter
 /**
  * Constructor. Obtains handle to content resolver for later use.
  */
-(context: Context, autoInitialize: Boolean) : AbstractThreadedSyncAdapter(context, autoInitialize) {
+    (context: Context, autoInitialize: Boolean) :
+    AbstractThreadedSyncAdapter(context, autoInitialize) {
 
     /**
      * Called by the Android system in response to a request to run the sync adapter. The work
@@ -63,8 +64,10 @@ internal class SyncAdapter
      * The syncResult argument allows you to pass information back to the method that triggered
      * the sync.
      */
-    override fun onPerformSync(account: Account, extras: Bundle, authority: String,
-                               provider: ContentProviderClient, syncResult: SyncResult) {
+    override fun onPerformSync(
+        account: Account, extras: Bundle, authority: String,
+        provider: ContentProviderClient, syncResult: SyncResult
+    ) {
         Timber.e("Beginning network synchronization")
         val backup = SettingsManager.backupLocation.createBackup()
         try {
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt
index d15512c45..38dd73660 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt
@@ -40,8 +40,10 @@ object SyncUtils {
             val account = GenericAccountService.account
             ContentResolver.setSyncAutomatically(account, CONTENT_AUTHORITY, enabled)
             if (enabled) {
-                ContentResolver.addPeriodicSync(account, CONTENT_AUTHORITY,
-                        Bundle(), SettingsManager.backupInterval.days * ONE_DAY)
+                ContentResolver.addPeriodicSync(
+                    account, CONTENT_AUTHORITY,
+                    Bundle(), SettingsManager.backupInterval.days * ONE_DAY
+                )
             } else {
                 ContentResolver.removePeriodicSync(account, CONTENT_AUTHORITY, Bundle())
             }
@@ -84,8 +86,9 @@ object SyncUtils {
         b.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true)
         b.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true)
         ContentResolver.requestSync(
-                GenericAccountService.account,
-                CONTENT_AUTHORITY,
-                b)
+            GenericAccountService.account,
+            CONTENT_AUTHORITY,
+            b
+        )
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/ChipGroup.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/ChipGroup.kt
index 61c6e8d00..eee4f6202 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/ChipGroup.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/ChipGroup.kt
@@ -22,7 +22,11 @@ import android.view.View
 import android.view.ViewGroup
 import java.util.*
 
-class ChipGroup @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : ViewGroup(context, attrs, defStyleAttr) {
+class ChipGroup @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ViewGroup(context, attrs, defStyleAttr) {
     private var tagList: MutableList<Tag> = ArrayList()
 
     private val horizontalSpacing = dp2px(8.0f).toInt()
@@ -109,8 +113,10 @@ class ChipGroup @JvmOverloads constructor(context: Context, attrs: AttributeSet?
             width = widthSize
         }
 
-        setMeasuredDimension(if (widthMode == View.MeasureSpec.EXACTLY) widthSize else width,
-                if (heightMode == View.MeasureSpec.EXACTLY) heightSize else height)
+        setMeasuredDimension(
+            if (widthMode == View.MeasureSpec.EXACTLY) widthSize else width,
+            if (heightMode == View.MeasureSpec.EXACTLY) heightSize else height
+        )
     }
 
     override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
@@ -167,8 +173,10 @@ class ChipGroup @JvmOverloads constructor(context: Context, attrs: AttributeSet?
     }
 
     private fun dp2px(dp: Float): Float {
-        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp,
-                resources.displayMetrics)
+        return TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP, dp,
+            resources.displayMetrics
+        )
     }
 
     override fun generateLayoutParams(attrs: AttributeSet): ViewGroup.LayoutParams {
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
index 2f7f151e4..06c033d67 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/CsvExporter.kt
@@ -78,17 +78,23 @@ class CsvExporter(private val context: Context, database: AppDatabase) {
         // Date
         csv.add(t.date.format(DateTimeFormatter.ISO_LOCAL_DATE))
         // StandardRound
-        csv.add(standardRoundDAO.loadStandardRoundOrNull(t.standardRoundId!!)?.name
-                ?: context.getString(R.string.practice))
+        csv.add(
+            standardRoundDAO.loadStandardRoundOrNull(t.standardRoundId!!)?.name
+                    ?: context.getString(R.string.practice)
+        )
         // Indoor
-        csv.add(if (t.environment.indoor) context.getString(R.string.indoor) else context.getString(R.string.outdoor))
+        csv.add(
+            if (t.environment.indoor) context.getString(R.string.indoor) else context.getString(
+                R.string.outdoor
+            )
+        )
         // Bow
         csv.add(if (t.bowId == null) "" else bowDAO.loadBow(t.bowId!!).name)
         // Arrow
         csv.add(if (t.arrowId == null) "" else arrowDAO.loadArrow(t.arrowId!!).name)
         roundDAO.loadRounds(t.id)
-                .filter { roundIds.contains(it.id) }
-                .forEach { addRound(csv, it) }
+            .filter { roundIds.contains(it.id) }
+            .forEach { addRound(csv, it) }
         csv.exitScope()
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/CustomPieChart.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/CustomPieChart.kt
index e923e6845..f7ae9fd73 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/CustomPieChart.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/CustomPieChart.kt
@@ -21,7 +21,7 @@ import android.util.AttributeSet
 import com.github.mikephil.charting.charts.PieChart
 
 class CustomPieChart @JvmOverloads constructor(
-        context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+    context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : PieChart(context, attrs, defStyleAttr) {
     init {
         renderer = CustomPieChartRenderer(this, mAnimator, mViewPortHandler)
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/CustomPieChartRenderer.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/CustomPieChartRenderer.kt
index 551e2b25f..dae3e7ae3 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/CustomPieChartRenderer.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/CustomPieChartRenderer.kt
@@ -36,7 +36,11 @@ import de.dreier.mytargets.shared.utils.Color
  *
  * Copied to implement https://stackoverflow.com/questions/38758885/border-around-pie-chart-in-mpchart#38775142
  */
-class CustomPieChartRenderer(chart: PieChart, animator: ChartAnimator, viewPortHandler: ViewPortHandler) : PieChartRenderer(chart, animator, viewPortHandler) {
+class CustomPieChartRenderer(
+    chart: PieChart,
+    animator: ChartAnimator,
+    viewPortHandler: ViewPortHandler
+) : PieChartRenderer(chart, animator, viewPortHandler) {
 
     /**
      * paint object for the stroke around the slices
@@ -71,7 +75,8 @@ class CustomPieChartRenderer(chart: PieChart, animator: ChartAnimator, viewPortH
         else
             0f
 
-        val visibleAngleCount = (0 until entryCount).count { // draw only if the value is greater than zero
+        val visibleAngleCount = (0 until entryCount).count {
+            // draw only if the value is greater than zero
             Math.abs(dataSet.getEntryForIndex(it).y) > Utils.FLOAT_EPSILON
         }
 
@@ -97,7 +102,8 @@ class CustomPieChartRenderer(chart: PieChart, animator: ChartAnimator, viewPortH
                         0f
                     else
                         sliceSpace / (Utils.FDEG2RAD * radius)
-                    val startAngleOuter = rotationAngle + (angle + sliceSpaceAngleOuter / 2f) * phaseY
+                    val startAngleOuter =
+                        rotationAngle + (angle + sliceSpaceAngleOuter / 2f) * phaseY
                     var sweepAngleOuter = (sliceAngle - sliceSpaceAngleOuter) * phaseY
                     if (sweepAngleOuter < 0f) {
                         sweepAngleOuter = 0f
@@ -105,8 +111,10 @@ class CustomPieChartRenderer(chart: PieChart, animator: ChartAnimator, viewPortH
 
                     mPathBuffer.reset()
 
-                    val arcStartPointX = center.x + radius * Math.cos((startAngleOuter * Utils.FDEG2RAD).toDouble()).toFloat()
-                    val arcStartPointY = center.y + radius * Math.sin((startAngleOuter * Utils.FDEG2RAD).toDouble()).toFloat()
+                    val arcStartPointX =
+                        center.x + radius * Math.cos((startAngleOuter * Utils.FDEG2RAD).toDouble()).toFloat()
+                    val arcStartPointY =
+                        center.y + radius * Math.sin((startAngleOuter * Utils.FDEG2RAD).toDouble()).toFloat()
 
                     if (sweepAngleOuter >= 360f && sweepAngleOuter % 360f <= Utils.FLOAT_EPSILON) {
                         // Android is doing "mod 360"
@@ -116,28 +124,30 @@ class CustomPieChartRenderer(chart: PieChart, animator: ChartAnimator, viewPortH
                         mPathBuffer.moveTo(arcStartPointX, arcStartPointY)
 
                         mPathBuffer.arcTo(
-                                circleBox,
-                                startAngleOuter,
-                                sweepAngleOuter
+                            circleBox,
+                            startAngleOuter,
+                            sweepAngleOuter
                         )
                     }
 
                     // API < 21 does not receive floats in addArc, but a RectF
                     mInnerRectBuffer.set(
-                            center.x - innerRadius,
-                            center.y - innerRadius,
-                            center.x + innerRadius,
-                            center.y + innerRadius)
+                        center.x - innerRadius,
+                        center.y - innerRadius,
+                        center.x + innerRadius,
+                        center.y + innerRadius
+                    )
 
                     if (drawInnerArc && (innerRadius > 0f || accountForSliceSpacing)) {
 
                         if (accountForSliceSpacing) {
                             var minSpacedRadius = calculateMinimumRadiusForSpacedSlice(
-                                    center, radius,
-                                    sliceAngle * phaseY,
-                                    arcStartPointX, arcStartPointY,
-                                    startAngleOuter,
-                                    sweepAngleOuter)
+                                center, radius,
+                                sliceAngle * phaseY,
+                                arcStartPointX, arcStartPointY,
+                                startAngleOuter,
+                                sweepAngleOuter
+                            )
 
                             if (minSpacedRadius < 0f) {
                                 minSpacedRadius = -minSpacedRadius
@@ -150,7 +160,8 @@ class CustomPieChartRenderer(chart: PieChart, animator: ChartAnimator, viewPortH
                             0f
                         else
                             sliceSpace / (Utils.FDEG2RAD * innerRadius)
-                        val startAngleInner = rotationAngle + (angle + sliceSpaceAngleInner / 2f) * phaseY
+                        val startAngleInner =
+                            rotationAngle + (angle + sliceSpaceAngleInner / 2f) * phaseY
                         var sweepAngleInner = (sliceAngle - sliceSpaceAngleInner) * phaseY
                         if (sweepAngleInner < 0f) {
                             sweepAngleInner = 0f
@@ -160,17 +171,18 @@ class CustomPieChartRenderer(chart: PieChart, animator: ChartAnimator, viewPortH
                         if (sweepAngleOuter >= 360f && sweepAngleOuter % 360f <= Utils.FLOAT_EPSILON) {
                             // Android is doing "mod 360"
                             mPathBuffer
-                                    .addCircle(center.x, center.y, innerRadius, Path.Direction.CCW)
+                                .addCircle(center.x, center.y, innerRadius, Path.Direction.CCW)
                         } else {
 
                             mPathBuffer.lineTo(
-                                    center.x + innerRadius * Math.cos((endAngleInner * Utils.FDEG2RAD).toDouble()).toFloat(),
-                                    center.y + innerRadius * Math.sin((endAngleInner * Utils.FDEG2RAD).toDouble()).toFloat())
+                                center.x + innerRadius * Math.cos((endAngleInner * Utils.FDEG2RAD).toDouble()).toFloat(),
+                                center.y + innerRadius * Math.sin((endAngleInner * Utils.FDEG2RAD).toDouble()).toFloat()
+                            )
 
                             mPathBuffer.arcTo(
-                                    mInnerRectBuffer,
-                                    endAngleInner,
-                                    -sweepAngleInner
+                                mInnerRectBuffer,
+                                endAngleInner,
+                                -sweepAngleInner
                             )
                         }
                     } else {
@@ -181,25 +193,30 @@ class CustomPieChartRenderer(chart: PieChart, animator: ChartAnimator, viewPortH
                                 val angleMiddle = startAngleOuter + sweepAngleOuter / 2f
 
                                 val sliceSpaceOffset = calculateMinimumRadiusForSpacedSlice(
-                                        center,
-                                        radius,
-                                        sliceAngle * phaseY,
-                                        arcStartPointX,
-                                        arcStartPointY,
-                                        startAngleOuter,
-                                        sweepAngleOuter)
+                                    center,
+                                    radius,
+                                    sliceAngle * phaseY,
+                                    arcStartPointX,
+                                    arcStartPointY,
+                                    startAngleOuter,
+                                    sweepAngleOuter
+                                )
 
-                                val arcEndPointX = center.x + sliceSpaceOffset * Math.cos((angleMiddle * Utils.FDEG2RAD).toDouble()).toFloat()
-                                val arcEndPointY = center.y + sliceSpaceOffset * Math.sin((angleMiddle * Utils.FDEG2RAD).toDouble()).toFloat()
+                                val arcEndPointX =
+                                    center.x + sliceSpaceOffset * Math.cos((angleMiddle * Utils.FDEG2RAD).toDouble()).toFloat()
+                                val arcEndPointY =
+                                    center.y + sliceSpaceOffset * Math.sin((angleMiddle * Utils.FDEG2RAD).toDouble()).toFloat()
 
                                 mPathBuffer.lineTo(
-                                        arcEndPointX,
-                                        arcEndPointY)
+                                    arcEndPointX,
+                                    arcEndPointY
+                                )
 
                             } else {
                                 mPathBuffer.lineTo(
-                                        center.x,
-                                        center.y)
+                                    center.x,
+                                    center.y
+                                )
                             }
                         }
 
@@ -255,8 +272,10 @@ class CustomPieChartRenderer(chart: PieChart, animator: ChartAnimator, viewPortH
             }
 
             val set = mChart.data
-                    .getDataSetByIndex(indices[i]
-                            .dataSetIndex)
+                .getDataSetByIndex(
+                    indices[i]
+                        .dataSetIndex
+                )
 
             if (set == null || !set.isHighlightEnabled) {
                 continue
@@ -318,33 +337,36 @@ class CustomPieChartRenderer(chart: PieChart, animator: ChartAnimator, viewPortH
             } else {
 
                 mPathBuffer.moveTo(
-                        center.x + highlightedRadius * Math.cos((startAngleShifted * Utils.FDEG2RAD).toDouble()).toFloat(),
-                        center.y + highlightedRadius * Math.sin((startAngleShifted * Utils.FDEG2RAD).toDouble()).toFloat())
+                    center.x + highlightedRadius * Math.cos((startAngleShifted * Utils.FDEG2RAD).toDouble()).toFloat(),
+                    center.y + highlightedRadius * Math.sin((startAngleShifted * Utils.FDEG2RAD).toDouble()).toFloat()
+                )
 
                 mPathBuffer.arcTo(
-                        highlightedCircleBox,
-                        startAngleShifted,
-                        sweepAngleShifted
+                    highlightedCircleBox,
+                    startAngleShifted,
+                    sweepAngleShifted
                 )
             }
 
             var sliceSpaceRadius = 0f
             if (accountForSliceSpacing) {
                 sliceSpaceRadius = calculateMinimumRadiusForSpacedSlice(
-                        center, radius,
-                        sliceAngle * phaseY,
-                        center.x + radius * Math.cos((startAngleOuter * Utils.FDEG2RAD).toDouble()).toFloat(),
-                        center.y + radius * Math.sin((startAngleOuter * Utils.FDEG2RAD).toDouble()).toFloat(),
-                        startAngleOuter,
-                        sweepAngleOuter)
+                    center, radius,
+                    sliceAngle * phaseY,
+                    center.x + radius * Math.cos((startAngleOuter * Utils.FDEG2RAD).toDouble()).toFloat(),
+                    center.y + radius * Math.sin((startAngleOuter * Utils.FDEG2RAD).toDouble()).toFloat(),
+                    startAngleOuter,
+                    sweepAngleOuter
+                )
             }
 
             // API < 21 does not receive floats in addArc, but a RectF
             mInnerRectBuffer.set(
-                    center.x - innerRadius,
-                    center.y - innerRadius,
-                    center.x + innerRadius,
-                    center.y + innerRadius)
+                center.x - innerRadius,
+                center.y - innerRadius,
+                center.x + innerRadius,
+                center.y + innerRadius
+            )
 
             if (drawInnerArc && (innerRadius > 0f || accountForSliceSpacing)) {
 
@@ -375,13 +397,14 @@ class CustomPieChartRenderer(chart: PieChart, animator: ChartAnimator, viewPortH
                 } else {
 
                     mPathBuffer.lineTo(
-                            center.x + innerRadius * Math.cos((endAngleInner * Utils.FDEG2RAD).toDouble()).toFloat(),
-                            center.y + innerRadius * Math.sin((endAngleInner * Utils.FDEG2RAD).toDouble()).toFloat())
+                        center.x + innerRadius * Math.cos((endAngleInner * Utils.FDEG2RAD).toDouble()).toFloat(),
+                        center.y + innerRadius * Math.sin((endAngleInner * Utils.FDEG2RAD).toDouble()).toFloat()
+                    )
 
                     mPathBuffer.arcTo(
-                            mInnerRectBuffer,
-                            endAngleInner,
-                            -sweepAngleInner
+                        mInnerRectBuffer,
+                        endAngleInner,
+                        -sweepAngleInner
                     )
                 }
             } else {
@@ -391,18 +414,22 @@ class CustomPieChartRenderer(chart: PieChart, animator: ChartAnimator, viewPortH
                     if (accountForSliceSpacing) {
                         val angleMiddle = startAngleOuter + sweepAngleOuter / 2f
 
-                        val arcEndPointX = center.x + sliceSpaceRadius * Math.cos((angleMiddle * Utils.FDEG2RAD).toDouble()).toFloat()
-                        val arcEndPointY = center.y + sliceSpaceRadius * Math.sin((angleMiddle * Utils.FDEG2RAD).toDouble()).toFloat()
+                        val arcEndPointX =
+                            center.x + sliceSpaceRadius * Math.cos((angleMiddle * Utils.FDEG2RAD).toDouble()).toFloat()
+                        val arcEndPointY =
+                            center.y + sliceSpaceRadius * Math.sin((angleMiddle * Utils.FDEG2RAD).toDouble()).toFloat()
 
                         mPathBuffer.lineTo(
-                                arcEndPointX,
-                                arcEndPointY)
+                            arcEndPointX,
+                            arcEndPointY
+                        )
 
                     } else {
 
                         mPathBuffer.lineTo(
-                                center.x,
-                                center.y)
+                            center.x,
+                            center.y
+                        )
                     }
 
                 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
index fe11ae143..eb8ef6a99 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
@@ -33,11 +33,11 @@ import de.dreier.mytargets.databinding.ActivityArrowRankingDetailsBinding
 import de.dreier.mytargets.features.scoreboard.EFileType
 import de.dreier.mytargets.features.settings.ESettingsScreens
 import de.dreier.mytargets.features.settings.SettingsManager
-import de.dreier.mytargets.utils.toUri
 import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.Utils
 import de.dreier.mytargets.utils.print.CustomPrintDocumentAdapter
 import de.dreier.mytargets.utils.print.DrawableToPdfWriter
+import de.dreier.mytargets.utils.toUri
 import java.io.File
 import java.io.IOException
 
@@ -48,14 +48,18 @@ class DispersionPatternActivity : ChildActivityBase() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = DataBindingUtil
-                .setContentView(this, R.layout.activity_arrow_ranking_details)
+            .setContentView(this, R.layout.activity_arrow_ranking_details)
 
         statistic = intent.getParcelableExtra(ITEM)
 
         ToolbarUtils.showHomeAsUp(this)
         if (statistic.arrowName != null) {
-            ToolbarUtils.setTitle(this, getString(R.string.arrow_number_x, statistic
-                    .arrowNumber))
+            ToolbarUtils.setTitle(
+                this, getString(
+                    R.string.arrow_number_x, statistic
+                        .arrowNumber
+                )
+            )
             ToolbarUtils.setSubtitle(this, statistic.arrowName!!)
         } else {
             ToolbarUtils.setTitle(this, R.string.dispersion_pattern)
@@ -77,7 +81,7 @@ class DispersionPatternActivity : ChildActivityBase() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.action_share -> shareImage()
-            R.id.action_print -> if(Utils.isKitKat) print()
+            R.id.action_print -> if (Utils.isKitKat) print()
             R.id.action_settings -> navigationController.navigateToSettings(ESettingsScreens.STATISTICS)
             else -> return super.onOptionsItemSelected(item)
         }
@@ -104,7 +108,7 @@ class DispersionPatternActivity : ChildActivityBase() {
             } catch (e: IOException) {
                 e.printStackTrace()
                 Snackbar.make(binding!!.root, R.string.sharing_failed, Snackbar.LENGTH_SHORT)
-                        .show()
+                    .show()
             }
         }.start()
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternUtils.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternUtils.kt
index 427cd90aa..329eaffb5 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternUtils.kt
@@ -51,7 +51,10 @@ object DispersionPatternUtils {
         FileOutputStream(f).use { outputStream ->
             val target = targetFromArrowStatistics(statistic)
             val pdfWriter = DrawableToPdfWriter(target)
-            pdfWriter.layoutPages(CustomPrintDocumentAdapter.DEFAULT_RESOLUTION, CustomPrintDocumentAdapter.DEFAULT_MEDIA_SIZE)
+            pdfWriter.layoutPages(
+                CustomPrintDocumentAdapter.DEFAULT_RESOLUTION,
+                CustomPrintDocumentAdapter.DEFAULT_MEDIA_SIZE
+            )
             pdfWriter.writePdfDocument(arrayOf(PageRange(0, 0)), outputStream)
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
index 417a4eac6..0d74575cd 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsActivity.kt
@@ -33,7 +33,6 @@ import android.view.Menu
 import android.view.MenuItem
 import com.afollestad.materialdialogs.MaterialDialog
 import com.evernote.android.state.State
-import com.evernote.android.state.StateSaver
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.activities.ChildActivityBase
@@ -41,9 +40,9 @@ import de.dreier.mytargets.databinding.ActivityStatisticsBinding
 import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
+import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.toSparseArray
 import de.dreier.mytargets.utils.toUri
-import de.dreier.mytargets.utils.ToolbarUtils
 import java.io.File
 import java.io.IOException
 import java.text.SimpleDateFormat
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
index 2836163df..f17ccee3e 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/StatisticsFragment.kt
@@ -81,15 +81,19 @@ class StatisticsFragment : FragmentBase() {
     private val hitMissText: String
         get() {
             val shots = rounds!!
-                    .flatMap { r -> roundDAO.loadEnds(r.id) }
-                    .flatMap { endDAO.loadShots(it.id) }
-                    .filter { (_, _, _, _, _, scoringRing) -> scoringRing != Shot.NOTHING_SELECTED }
-            val missCount = shots.filter { (_, _, _, _, _, scoringRing) -> scoringRing == Shot.MISS }.count().toLong()
+                .flatMap { r -> roundDAO.loadEnds(r.id) }
+                .flatMap { endDAO.loadShots(it.id) }
+                .filter { (_, _, _, _, _, scoringRing) -> scoringRing != Shot.NOTHING_SELECTED }
+            val missCount =
+                shots.filter { (_, _, _, _, _, scoringRing) -> scoringRing == Shot.MISS }.count()
+                    .toLong()
             val hitCount = shots.size - missCount
 
-            return String.format(Locale.US, PIE_CHART_CENTER_TEXT_FORMAT,
-                    getString(R.string.hits), hitCount.toString(),
-                    getString(R.string.misses), missCount)
+            return String.format(
+                Locale.US, PIE_CHART_CENTER_TEXT_FORMAT,
+                getString(R.string.hits), hitCount.toString(),
+                getString(R.string.misses), missCount
+            )
         }
 
     private// Without regression line
@@ -118,11 +122,11 @@ class StatisticsFragment : FragmentBase() {
 
     private fun getDataPointsForLineChart(isSingleTraining: Boolean): List<Pair<Float, LocalDateTime>>? {
         val trainingsMap = rounds!!
-                .map { it.trainingId!! }
-                .distinct()
-                .map { trainingDAO.loadTraining(it) }
-                .map { Pair(it.id, it) }
-                .toMap()
+            .map { it.trainingId!! }
+            .distinct()
+            .map { trainingDAO.loadTraining(it) }
+            .map { Pair(it.id, it) }
+            .toMap()
 
         val values: List<Pair<Float, LocalDateTime>>
         if (isSingleTraining) {
@@ -135,31 +139,38 @@ class StatisticsFragment : FragmentBase() {
             var firstEndTime = firstRound[0].saveTime
             var dayShift = 0L
             values = ends.flatMap { it }
-                    .map { end ->
-                        if (end.saveTime!!.isBefore(firstEndTime)) {
-                            dayShift += 1
-                            firstEndTime = end.saveTime
-                        }
-                        val dateTime = LocalDateTime.of(trainingDate, end.saveTime).plusDays(dayShift)
-                        Pair(end.score.shotAverage, dateTime)
+                .map { end ->
+                    if (end.saveTime!!.isBefore(firstEndTime)) {
+                        dayShift += 1
+                        firstEndTime = end.saveTime
                     }
-                    .sortedBy { (_, date) -> date }
+                    val dateTime = LocalDateTime.of(trainingDate, end.saveTime).plusDays(dayShift)
+                    Pair(end.score.shotAverage, dateTime)
+                }
+                .sortedBy { (_, date) -> date }
         } else {
             values = rounds!!
-                    .map { r -> Pair(trainingsMap[r.trainingId]!!.date, r) }
-                    .flatMap { (date, round) ->
-                        roundDAO.loadEnds(round.id).map { end -> Pair(end, date) }
-                    }
-                    .map { (end, date) -> Pair(end.score.shotAverage, LocalDateTime.of(date, end.saveTime!!)) }
-                    .sortedBy { (_, date) -> date }
+                .map { r -> Pair(trainingsMap[r.trainingId]!!.date, r) }
+                .flatMap { (date, round) ->
+                    roundDAO.loadEnds(round.id).map { end -> Pair(end, date) }
+                }
+                .map { (end, date) ->
+                    Pair(
+                        end.score.shotAverage,
+                        LocalDateTime.of(date, end.saveTime!!)
+                    )
+                }
+                .sortedBy { (_, date) -> date }
         }
         return values
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        LocalBroadcastManager.getInstance(context!!).registerReceiver(updateReceiver,
-                IntentFilter(BROADCAST_UPDATE_TRAINING_FROM_REMOTE))
+        LocalBroadcastManager.getInstance(context!!).registerReceiver(
+            updateReceiver,
+            IntentFilter(BROADCAST_UPDATE_TRAINING_FROM_REMOTE)
+        )
     }
 
     override fun onDestroy() {
@@ -167,7 +178,11 @@ class StatisticsFragment : FragmentBase() {
         LocalBroadcastManager.getInstance(context!!).unregisterReceiver(updateReceiver)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_statistics, container, false)
 
         val target = arguments!!.getParcelable<Target>(ARG_TARGET)
@@ -191,7 +206,7 @@ class StatisticsFragment : FragmentBase() {
     override fun onLoad(args: Bundle?): LoaderUICallback {
         rounds = roundDAO.loadRounds(roundIds!!)
         val data = ArrowStatistic.getAll(target!!, rounds!!)
-                .sortedWith(compareByDescending { it.totalScore.shotAverage })
+            .sortedWith(compareByDescending { it.totalScore.shotAverage })
 
         return {
             showLineChart()
@@ -207,11 +222,11 @@ class StatisticsFragment : FragmentBase() {
 
     private fun showDispersionView() {
         val exactShots = rounds!!
-                .flatMap { roundDAO.loadEnds(it.id) }
-                .filter { it.exact }
-                .flatMap { endDAO.loadShots(it.id) }
-                .filter { (_, _, _, _, _, scoringRing) -> scoringRing != Shot.NOTHING_SELECTED }
-                .toList()
+            .flatMap { roundDAO.loadEnds(it.id) }
+            .filter { it.exact }
+            .flatMap { endDAO.loadShots(it.id) }
+            .filter { (_, _, _, _, _, scoringRing) -> scoringRing != Shot.NOTHING_SELECTED }
+            .toList()
         if (exactShots.isEmpty()) {
             binding.dispersionPatternLayout.visibility = View.GONE
             return
@@ -220,15 +235,15 @@ class StatisticsFragment : FragmentBase() {
         stats.arrowDiameter = Dimension(5f, Dimension.Unit.MILLIMETER)
 
         val trainingsIds = rounds!!
-                .map { it.trainingId!! }
-                .distinct()
+            .map { it.trainingId!! }
+            .distinct()
         if (trainingsIds.size == 1) {
             val training = trainingDAO.loadTraining(trainingsIds[0])
             val date = training.date.format(DateTimeFormatter.ISO_LOCAL_DATE)
             val round = if (rounds!!.size == 1) {
                 val index = rounds!![0].index + 1
                 "-" + resources.getQuantityString(R.plurals.rounds, index, index)
-                        .replace(' ', '-')
+                    .replace(' ', '-')
             } else ""
             stats.exportFileName = "$date-${training.title}$round"
         } else {
@@ -262,8 +277,10 @@ class StatisticsFragment : FragmentBase() {
         if (animate) {
             binding.chartView.animateXY(2000, 2000)
         }
-        binding.chartView.renderer = object : LineChartRenderer(binding.chartView, binding.chartView.animator,
-                binding.chartView.viewPortHandler) {
+        binding.chartView.renderer = object : LineChartRenderer(
+            binding.chartView, binding.chartView.animator,
+            binding.chartView.viewPortHandler
+        ) {
             override fun drawHighlighted(canvas: Canvas, indices: Array<Highlight>) {
                 mRenderPaint.style = Paint.Style.FILL
 
@@ -279,10 +296,11 @@ class StatisticsFragment : FragmentBase() {
                     val circleRadius = dataSet.circleRadius
 
                     canvas.drawCircle(
-                            highlight.drawX,
-                            highlight.drawY,
-                            circleRadius,
-                            mRenderPaint)
+                        highlight.drawX,
+                        highlight.drawY,
+                        circleRadius,
+                        mRenderPaint
+                    )
                     colorIndex = (colorIndex + 1) % dataSet.circleColorCount
                 }
 
@@ -295,7 +313,12 @@ class StatisticsFragment : FragmentBase() {
     private fun showPieChart() {
         // enable hole and configure
         binding.distributionChart.transparentCircleRadius = 15f
-        binding.distributionChart.setHoleColor(ContextCompat.getColor(context!!, R.color.md_grey_50))
+        binding.distributionChart.setHoleColor(
+            ContextCompat.getColor(
+                context!!,
+                R.color.md_grey_50
+            )
+        )
         binding.distributionChart.legend.isEnabled = false
         binding.distributionChart.description = EMPTY_DESCRIPTION
 
@@ -305,7 +328,12 @@ class StatisticsFragment : FragmentBase() {
 
         binding.distributionChart.setUsePercentValues(false)
         binding.distributionChart.highlightValues(null)
-        binding.distributionChart.setBackgroundColor(ContextCompat.getColor(context!!, R.color.md_grey_50))
+        binding.distributionChart.setBackgroundColor(
+            ContextCompat.getColor(
+                context!!,
+                R.color.md_grey_50
+            )
+        )
         binding.distributionChart.invalidate()
         addPieData()
     }
@@ -346,20 +374,22 @@ class StatisticsFragment : FragmentBase() {
         binding.distributionChart.centerText = Utils.fromHtml(hitMissText)
 
         binding.distributionChart
-                .setOnChartValueSelectedListener(object : OnChartValueSelectedListener {
-                    override fun onValueSelected(e: Entry, h: Highlight) {
-                        val selectableZone = e.data as SelectableZone
-                        val s = String.format(Locale.US,
-                                PIE_CHART_CENTER_TEXT_FORMAT,
-                                getString(R.string.points), selectableZone.text,
-                                getString(R.string.count), e.y.toInt())
-                        binding.distributionChart.centerText = Utils.fromHtml(s)
-                    }
+            .setOnChartValueSelectedListener(object : OnChartValueSelectedListener {
+                override fun onValueSelected(e: Entry, h: Highlight) {
+                    val selectableZone = e.data as SelectableZone
+                    val s = String.format(
+                        Locale.US,
+                        PIE_CHART_CENTER_TEXT_FORMAT,
+                        getString(R.string.points), selectableZone.text,
+                        getString(R.string.count), e.y.toInt()
+                    )
+                    binding.distributionChart.centerText = Utils.fromHtml(s)
+                }
 
-                    override fun onNothingSelected() {
-                        binding.distributionChart.centerText = Utils.fromHtml(hitMissText)
-                    }
-                })
+                override fun onNothingSelected() {
+                    binding.distributionChart.centerText = Utils.fromHtml(hitMissText)
+                }
+            })
     }
 
     override fun onResume() {
@@ -367,7 +397,10 @@ class StatisticsFragment : FragmentBase() {
         reloadData()
     }
 
-    private fun getEntryEvaluator(values: List<Pair<Float, LocalDateTime>>, singleTraining: Boolean): Evaluator {
+    private fun getEntryEvaluator(
+        values: List<Pair<Float, LocalDateTime>>,
+        singleTraining: Boolean
+    ): Evaluator {
 
         val eval: Evaluator
         if (singleTraining) {
@@ -400,8 +433,16 @@ class StatisticsFragment : FragmentBase() {
         return eval
     }
 
-    private fun convertToLineData(values: List<Pair<Float, LocalDateTime>>, evaluator: Evaluator): LineDataSet {
-        val seriesEntries = values.indices.map { Entry(evaluator.getXValue(values, it).toFloat(), values[it].first) }
+    private fun convertToLineData(
+        values: List<Pair<Float, LocalDateTime>>,
+        evaluator: Evaluator
+    ): LineDataSet {
+        val seriesEntries = values.indices.map {
+            Entry(
+                evaluator.getXValue(values, it).toFloat(),
+                values[it].first
+            )
+        }
 
         val series = LineDataSet(seriesEntries, "")
         val color = ContextCompat.getColor(context!!, R.color.colorPrimary)
@@ -422,7 +463,10 @@ class StatisticsFragment : FragmentBase() {
     /**
      * @param values Must not be empty
      */
-    private fun generateLinearRegressionLine(values: List<Pair<Float, LocalDateTime>>, eval: Evaluator): ILineDataSet {
+    private fun generateLinearRegressionLine(
+        values: List<Pair<Float, LocalDateTime>>,
+        eval: Evaluator
+    ): ILineDataSet {
         val dataSetSize = values.size
         val x = DoubleArray(dataSetSize)
         val y = DoubleArray(dataSetSize)
@@ -484,7 +528,7 @@ class StatisticsFragment : FragmentBase() {
 
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
             val itemView = LayoutInflater.from(parent.context)
-                    .inflate(R.layout.item_image_simple, parent, false)
+                .inflate(R.layout.item_image_simple, parent, false)
             return ViewHolder(itemView)
         }
 
@@ -519,8 +563,10 @@ class StatisticsFragment : FragmentBase() {
 
         fun bindItem(item: ArrowStatistic) {
             mItem = item
-            binding.name.text = getString(R.string.arrow_x_of_set_of_arrows, item.arrowNumber, item
-                    .arrowName)
+            binding.name.text = getString(
+                R.string.arrow_x_of_set_of_arrows, item.arrowNumber, item
+                    .arrowName
+            )
             binding.image.setImageDrawable(RoundedTextDrawable(item))
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/timer/TimerActivity.kt b/app/src/main/java/de/dreier/mytargets/features/timer/TimerActivity.kt
index 6bf1b195f..17b8464bf 100644
--- a/app/src/main/java/de/dreier/mytargets/features/timer/TimerActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/timer/TimerActivity.kt
@@ -37,8 +37,8 @@ class TimerActivity : ChildActivityBase() {
             }
 
             fragmentManager.beginTransaction()
-                    .replace(android.R.id.content, childFragment, FRAGMENT_TAG)
-                    .commit()
+                .replace(android.R.id.content, childFragment, FRAGMENT_TAG)
+                .commit()
         }
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/timer/TimerFragment.kt b/app/src/main/java/de/dreier/mytargets/features/timer/TimerFragment.kt
index c2b0aa57c..3af544f6f 100644
--- a/app/src/main/java/de/dreier/mytargets/features/timer/TimerFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/timer/TimerFragment.kt
@@ -38,7 +38,11 @@ class TimerFragment : TimerFragmentBase() {
 
     private lateinit var binding: FragmentTimerBinding
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_timer, container, false)
         return binding.root
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
index 1809d0bab..acb9505fd 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/RoundFragment.kt
@@ -43,7 +43,8 @@ import java.util.*
 /**
  * Shows all ends of one round
  */
-class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBase<AugmentedEnd>>() {
+class RoundFragment :
+    EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBase<AugmentedEnd>>() {
 
     private var roundId: Long = 0
     private lateinit var binding: FragmentListBinding
@@ -71,8 +72,10 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        LocalBroadcastManager.getInstance(context!!).registerReceiver(updateReceiver,
-                IntentFilter(BROADCAST_UPDATE_TRAINING_FROM_REMOTE))
+        LocalBroadcastManager.getInstance(context!!).registerReceiver(
+            updateReceiver,
+            IntentFilter(BROADCAST_UPDATE_TRAINING_FROM_REMOTE)
+        )
     }
 
     override fun onDestroy() {
@@ -80,22 +83,32 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
         LocalBroadcastManager.getInstance(context!!).unregisterReceiver(updateReceiver)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_list, container, false)
         binding.recyclerView.setHasFixedSize(true)
-        binding.recyclerView.addItemDecoration(DividerItemDecoration(context!!, R.drawable.full_divider))
+        binding.recyclerView.addItemDecoration(
+            DividerItemDecoration(
+                context!!,
+                R.drawable.full_divider
+            )
+        )
         adapter = EndAdapter()
         binding.recyclerView.itemAnimator = SlideInItemAnimator()
         binding.recyclerView.adapter = adapter
         binding.fab.visibility = View.GONE
         binding.fab.setOnClickListener {
             navigationController
-                    .navigateToEditEnd(round!!, binding.recyclerView.adapter.itemCount)
-                    .fromFab(binding.fab)
-                    .start()
+                .navigateToEditEnd(round!!, binding.recyclerView.adapter.itemCount)
+                .fromFab(binding.fab)
+                .start()
         }
 
-        roundId = arguments!!.getLongOrNull(ROUND_ID) ?: throw IllegalStateException("Missing required argument round id!")
+        roundId = arguments!!.getLongOrNull(ROUND_ID) ?:
+                throw IllegalStateException("Missing required argument round id!")
 
         setHasOptionsMenu(true)
         return binding.root
@@ -115,8 +128,10 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
             adapter!!.setList(ends)
             binding.fab.visibility = if (showFab) View.VISIBLE else View.GONE
 
-            ToolbarUtils.setTitle(this@RoundFragment,
-                    String.format(Locale.US, "%s %d", getString(R.string.round), round!!.index + 1))
+            ToolbarUtils.setTitle(
+                this@RoundFragment,
+                String.format(Locale.US, "%s %d", getString(R.string.round), round!!.index + 1)
+            )
             ToolbarUtils.setSubtitle(this@RoundFragment, round!!.score.toString())
         }
     }
@@ -133,14 +148,14 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
             }
             R.id.action_comment -> {
                 MaterialDialog.Builder(context!!)
-                        .title(R.string.comment)
-                        .inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE)
-                        .input("", round!!.comment) { _, input ->
-                            round!!.comment = input.toString()
-                            roundDAO.updateRound(round!!)
-                        }
-                        .negativeText(android.R.string.cancel)
-                        .show()
+                    .title(R.string.comment)
+                    .inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE)
+                    .input("", round!!.comment) { _, input ->
+                        round!!.comment = input.toString()
+                        roundDAO.updateRound(round!!)
+                    }
+                    .negativeText(android.R.string.cancel)
+                    .show()
                 return true
             }
             R.id.action_scoreboard -> {
@@ -153,12 +168,12 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
 
     override fun onSelected(item: AugmentedEnd) {
         navigationController.navigateToEditEnd(round!!, item.end.index)
-                .start()
+            .start()
     }
 
     private fun onEdit(itemId: Long) {
         navigationController.navigateToEditEnd(round!!, adapter!!.getItemById(itemId)!!.end.index)
-                .start()
+            .start()
     }
 
     override fun deleteItem(item: AugmentedEnd): () -> AugmentedEnd {
@@ -169,16 +184,23 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
         }
     }
 
-    private inner class EndAdapter : SimpleListAdapterBase<AugmentedEnd>(compareBy { it.end.index }) {
+    private inner class EndAdapter :
+        SimpleListAdapterBase<AugmentedEnd>(compareBy { it.end.index }) {
 
         override fun onCreateViewHolder(parent: ViewGroup): SelectableViewHolder<AugmentedEnd> {
             val itemView = LayoutInflater.from(parent.context)
-                    .inflate(R.layout.item_end, parent, false)
+                .inflate(R.layout.item_end, parent, false)
             return EndViewHolder(itemView)
         }
     }
 
-    private inner class EndViewHolder internal constructor(itemView: View) : SelectableViewHolder<AugmentedEnd>(itemView, selector, this@RoundFragment, this@RoundFragment) {
+    private inner class EndViewHolder internal constructor(itemView: View) :
+        SelectableViewHolder<AugmentedEnd>(
+            itemView,
+            selector,
+            this@RoundFragment,
+            this@RoundFragment
+        ) {
 
         private val binding = ItemEndBinding.bind(itemView)
 
@@ -188,9 +210,13 @@ class RoundFragment : EditableListFragmentBase<AugmentedEnd, SimpleListAdapterBa
                 shots.sort()
             }
             binding.shoots.setShots(round!!.target, shots)
-            binding.imageIndicator.visibility = if (item.images.isEmpty()) View.INVISIBLE else View.VISIBLE
+            binding.imageIndicator.visibility =
+                    if (item.images.isEmpty()) View.INVISIBLE else View.VISIBLE
             binding.end.text = getString(R.string.end_n, item.end.index + 1)
-            binding.endDetails.text = item.end.score.format(Utils.getCurrentLocale(context!!), SettingsManager.scoreConfiguration)
+            binding.endDetails.text = item.end.score.format(
+                Utils.getCurrentLocale(context!!),
+                SettingsManager.scoreConfiguration
+            )
         }
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/SpannedInfoBuilder.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/SpannedInfoBuilder.kt
index 0e69c88ef..20f01c0e4 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/SpannedInfoBuilder.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/SpannedInfoBuilder.kt
@@ -16,8 +16,6 @@
 package de.dreier.mytargets.features.training.details
 
 import android.graphics.Typeface.BOLD
-import android.text.Spannable
-import android.text.SpannableString
 import android.text.SpannableStringBuilder
 import android.text.Spanned
 import android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index 959de8eb0..902b90e4c 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -123,7 +123,12 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
             }
 
             val equals = BooleanArray(2)
-            binding.detailRoundInfo.text = TrainingInfoUtils.getTrainingInfo(context!!, trainingAndRounds.first, trainingAndRounds.second, equals)
+            binding.detailRoundInfo.text = TrainingInfoUtils.getTrainingInfo(
+                context!!,
+                trainingAndRounds.first,
+                trainingAndRounds.second,
+                equals
+            )
 
             adapter = RoundAdapter(equals)
             binding.recyclerView.adapter = adapter
@@ -181,7 +186,8 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
 
     override fun deleteItem(item: Round) = viewModel.deleteRound(item)
 
-    private inner class RoundAdapter(val equals: BooleanArray) : SimpleListAdapterBase<Round>(compareBy(Round::index)) {
+    private inner class RoundAdapter(val equals: BooleanArray) :
+        SimpleListAdapterBase<Round>(compareBy(Round::index)) {
         override fun onCreateViewHolder(parent: ViewGroup): SelectableViewHolder<Round> {
             val itemView = LayoutInflater.from(parent.context)
                 .inflate(R.layout.item_round, parent, false)
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingInfoUtils.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingInfoUtils.kt
index 98a226037..68f6e7a64 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingInfoUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingInfoUtils.kt
@@ -22,24 +22,34 @@ import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.shared.models.db.Round
 import de.dreier.mytargets.shared.models.db.Training
-import de.dreier.mytargets.utils.Utils
 
 object TrainingInfoUtils {
 
-    fun getTrainingInfo(context: Context, training: Training, rounds: List<Round>, equals: BooleanArray): Spanned {
+    fun getTrainingInfo(
+        context: Context,
+        training: Training,
+        rounds: List<Round>,
+        equals: BooleanArray
+    ): Spanned {
         val info = SpannedInfoBuilder()
         addStaticTrainingHeaderInfo(context, info, training)
         addDynamicTrainingHeaderInfo(rounds, equals, info)
         return info.toSpanned()
     }
 
-    private fun addStaticTrainingHeaderInfo(context: Context, info: SpannedInfoBuilder, training: Training) {
+    private fun addStaticTrainingHeaderInfo(
+        context: Context,
+        info: SpannedInfoBuilder,
+        training: Training
+    ) {
         if (training.environment.indoor) {
             info.addLine(R.string.environment, context.getString(R.string.indoor))
         } else {
             info.addLine(R.string.weather, training.environment.weather.getName())
-            info.addLine(R.string.wind,
-                    training.environment.getWindSpeed(context))
+            info.addLine(
+                R.string.wind,
+                training.environment.getWindSpeed(context)
+            )
             if (!TextUtils.isEmpty(training.environment.location)) {
                 info.addLine(R.string.location, training.environment.location)
             }
@@ -56,12 +66,17 @@ object TrainingInfoUtils {
         }
 
         if (training.standardRoundId != null) {
-            val standardRound = ApplicationInstance.db.standardRoundDAO().loadStandardRound(training.standardRoundId!!)
+            val standardRound = ApplicationInstance.db.standardRoundDAO()
+                .loadStandardRound(training.standardRoundId!!)
             info.addLine(R.string.standard_round, standardRound.name)
         }
     }
 
-    private fun addDynamicTrainingHeaderInfo(rounds: List<Round>, equals: BooleanArray, info: SpannedInfoBuilder) {
+    private fun addDynamicTrainingHeaderInfo(
+        rounds: List<Round>,
+        equals: BooleanArray,
+        info: SpannedInfoBuilder
+    ) {
         if (rounds.isNotEmpty()) {
             getEqualValues(rounds, equals)
             val round = rounds[0]
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/edit/DatePickerFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/edit/DatePickerFragment.kt
index bbd9bf3c2..cf18a68df 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/edit/DatePickerFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/edit/DatePickerFragment.kt
@@ -29,8 +29,10 @@ class DatePickerFragment : DialogFragment() {
 
         // Create a new instance of DatePickerDialog and return it
         val listener = targetFragment as DatePickerDialog.OnDateSetListener?
-        return DatePickerDialog(activity!!, listener, date.year,
-                date.monthValue - 1, date.dayOfMonth)
+        return DatePickerDialog(
+            activity!!, listener, date.year,
+            date.monthValue - 1, date.dayOfMonth
+        )
     }
 
     companion object {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt
index 0579dd4ac..d07b51e54 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt
@@ -42,7 +42,7 @@ internal object Connectivity {
     fun isConnectedMobile(context: Context): Boolean {
         val info = Connectivity.getNetworkInfo(context)
         return info != null && info.isConnected && info
-                .type == ConnectivityManager.TYPE_MOBILE
+            .type == ConnectivityManager.TYPE_MOBILE
     }
 
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt
index 4952fea3a..276f8f3a7 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/EnvironmentFragment.kt
@@ -38,9 +38,13 @@ class EnvironmentFragment : FragmentBase() {
     private lateinit var binding: FragmentEnvironmentBinding
     private var switchView: SwitchCompat? = null
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = DataBindingUtil
-                .inflate(inflater, R.layout.fragment_environment, container, false)
+            .inflate(inflater, R.layout.fragment_environment, container, false)
 
         ToolbarUtils.setSupportActionBar(this, binding.toolbar)
         ToolbarUtils.showHomeAsUp(this)
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt
index cd8ec5d87..2d07e9111 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt
@@ -51,10 +51,12 @@ class Locator(private val context: Context) : LocationListener {
         when (this.method) {
             Locator.Method.NETWORK, Locator.Method.NETWORK_THEN_GPS -> {
                 val networkLocation = locationManager
-                        .getLastKnownLocation(LocationManager.NETWORK_PROVIDER)
+                    .getLastKnownLocation(LocationManager.NETWORK_PROVIDER)
                 if (networkLocation != null) {
-                    Timber.d("Last known location found for network provider : %s", networkLocation
-                            .toString())
+                    Timber.d(
+                        "Last known location found for network provider : %s", networkLocation
+                            .toString()
+                    )
                     this.callback!!.onLocationFound(networkLocation)
                 } else {
                     Timber.d("Request updates from network provider.")
@@ -63,10 +65,12 @@ class Locator(private val context: Context) : LocationListener {
             }
             Locator.Method.GPS -> {
                 val gpsLocation = this.locationManager
-                        .getLastKnownLocation(LocationManager.GPS_PROVIDER)
+                    .getLastKnownLocation(LocationManager.GPS_PROVIDER)
                 if (gpsLocation != null) {
-                    Timber.d("Last known location found for GPS provider : %s", gpsLocation
-                            .toString())
+                    Timber.d(
+                        "Last known location found for GPS provider : %s", gpsLocation
+                            .toString()
+                    )
                     this.callback!!.onLocationFound(gpsLocation)
                 } else {
                     Timber.d("Request updates from GPS provider.")
@@ -80,14 +84,30 @@ class Locator(private val context: Context) : LocationListener {
     @RequiresPermission(anyOf = [ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION])
     private fun requestUpdates(provider: String) {
         if (locationManager.isProviderEnabled(provider)) {
-            if (provider.contentEquals(LocationManager.NETWORK_PROVIDER) && Connectivity.isConnected(this.context)) {
+            if (provider.contentEquals(LocationManager.NETWORK_PROVIDER) && Connectivity.isConnected(
+                    this.context
+                )
+            ) {
                 Timber.d("Network connected, start listening : %s", provider)
                 locationManager
-                        .requestLocationUpdates(provider, TIME_INTERVAL.toLong(), DISTANCE_INTERVAL.toFloat(), this)
-            } else if (provider.contentEquals(LocationManager.GPS_PROVIDER) && Connectivity.isConnectedMobile(this.context)) {
+                    .requestLocationUpdates(
+                        provider,
+                        TIME_INTERVAL.toLong(),
+                        DISTANCE_INTERVAL.toFloat(),
+                        this
+                    )
+            } else if (provider.contentEquals(LocationManager.GPS_PROVIDER) && Connectivity.isConnectedMobile(
+                    this.context
+                )
+            ) {
                 Timber.d("Mobile network connected, start listening : %s", provider)
                 locationManager
-                        .requestLocationUpdates(provider, TIME_INTERVAL.toLong(), DISTANCE_INTERVAL.toFloat(), this)
+                    .requestLocationUpdates(
+                        provider,
+                        TIME_INTERVAL.toLong(),
+                        DISTANCE_INTERVAL.toFloat(),
+                        this
+                    )
             } else {
                 Timber.d("Proper network not connected for provider : %s", provider)
                 onProviderDisabled(provider)
@@ -103,11 +123,13 @@ class Locator(private val context: Context) : LocationListener {
     }
 
     override fun onLocationChanged(location: Location) {
-        Timber.d("Location found : %f, %f%s", location.latitude, location
+        Timber.d(
+            "Location found : %f, %f%s", location.latitude, location
                 .longitude, if (location.hasAccuracy())
-            " : +- ${location.accuracy} meters"
-        else
-            "")
+                " : +- ${location.accuracy} meters"
+            else
+                ""
+        )
         locationManager.removeUpdates(this)
         callback!!.onLocationFound(location)
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WeatherService.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WeatherService.kt
index 5d9e26ca2..ed1a2160d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WeatherService.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WeatherService.kt
@@ -28,29 +28,31 @@ class WeatherService {
 
     private interface OpenWeatherMapWebService {
         @GET("weather?units=metric")
-        fun fetchCurrentWeather(@Query("lon") longitude: Double,
-                                @Query("lat") latitude: Double,
-                                @Query("APPID") appId: String): Call<CurrentWeather>
+        fun fetchCurrentWeather(
+            @Query("lon") longitude: Double,
+            @Query("lat") latitude: Double,
+            @Query("APPID") appId: String
+        ): Call<CurrentWeather>
     }
 
     init {
         val client = OkHttpClient.Builder()
-                .addInterceptor { chain ->
-                    val original = chain.request()
-                    val request = original.newBuilder()
-                            .header("Accept", "application/json")
-                            .method(original.method(), original.body())
-                            .build()
-                    chain.proceed(request)
-                }
-                .build()
+            .addInterceptor { chain ->
+                val original = chain.request()
+                val request = original.newBuilder()
+                    .header("Accept", "application/json")
+                    .method(original.method(), original.body())
+                    .build()
+                chain.proceed(request)
+            }
+            .build()
 
         mWebService = Retrofit.Builder()
-                .addConverterFactory(GsonConverterFactory.create())
-                .client(client)
-                .baseUrl(BASE_URL)
-                .build()
-                .create(OpenWeatherMapWebService::class.java)
+            .addConverterFactory(GsonConverterFactory.create())
+            .client(client)
+            .baseUrl(BASE_URL)
+            .build()
+            .create(OpenWeatherMapWebService::class.java)
     }
 
     fun fetchCurrentWeather(longitude: Double, latitude: Double): Call<CurrentWeather> {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
index 93145a0b4..430f0fc46 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindDirectionListFragment.kt
@@ -24,9 +24,14 @@ import de.dreier.mytargets.base.fragments.SelectPureListItemFragmentBase
 import de.dreier.mytargets.base.navigation.NavigationController.Companion.ITEM
 import de.dreier.mytargets.shared.models.WindDirection
 
-class WindDirectionListFragment : SelectPureListItemFragmentBase<WindDirection>(compareBy(WindDirection::id)) {
+class WindDirectionListFragment :
+    SelectPureListItemFragmentBase<WindDirection>(compareBy(WindDirection::id)) {
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         super.onCreateView(inflater, container, savedInstanceState)
         adapter.setList(WindDirection.getList(context!!))
         val windDirection = arguments!!.getParcelable<WindDirection>(ITEM)
@@ -36,5 +41,6 @@ class WindDirectionListFragment : SelectPureListItemFragmentBase<WindDirection>(
 
     override fun getName(item: WindDirection) = item.name
 
-    override fun getDrawable(item: WindDirection) = ContextCompat.getDrawable(context!!, item.drawable)!!
+    override fun getDrawable(item: WindDirection) =
+        ContextCompat.getDrawable(context!!, item.drawable)!!
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
index 1395eb1ba..4d1d2bc42 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/WindSpeedListFragment.kt
@@ -27,7 +27,11 @@ import de.dreier.mytargets.shared.models.WindSpeed
 
 class WindSpeedListFragment : SelectPureListItemFragmentBase<WindSpeed>(compareBy(WindSpeed::id)) {
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         super.onCreateView(inflater, container, savedInstanceState)
         adapter.setList(WindSpeed.getList(context!!))
         val windSpeed = arguments!!.getParcelable<WindSpeed>(ITEM)
@@ -37,5 +41,6 @@ class WindSpeedListFragment : SelectPureListItemFragmentBase<WindSpeed>(compareB
 
     override fun getName(item: WindSpeed) = item.name
 
-    override fun getDrawable(item: WindSpeed) = ContextCompat.getDrawable(context!!, item.drawable)!!
+    override fun getDrawable(item: WindSpeed) =
+        ContextCompat.getDrawable(context!!, item.drawable)!!
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
index 460aa60a3..d5bc3e0e3 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.kt
@@ -41,7 +41,6 @@ import com.evernote.android.state.State
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.activities.ChildActivityBase
-import de.dreier.mytargets.base.db.EndRepository
 import de.dreier.mytargets.base.db.RoundRepository
 import de.dreier.mytargets.base.db.TrainingRepository
 import de.dreier.mytargets.base.db.dao.ArrowDAO
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/SummaryConfiguration.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/SummaryConfiguration.kt
index e8afb8944..99744445a 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/SummaryConfiguration.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/SummaryConfiguration.kt
@@ -15,7 +15,7 @@
 
 package de.dreier.mytargets.features.training.input
 
-data class SummaryConfiguration (
+data class SummaryConfiguration(
     var showEnd: Boolean = false,
     var showRound: Boolean = false,
     var showTraining: Boolean = false,
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/ExpandableListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/ExpandableListFragment.kt
index d2afc5dfb..e785411ea 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/overview/ExpandableListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/ExpandableListFragment.kt
@@ -23,7 +23,8 @@ import de.dreier.mytargets.shared.models.IIdSettable
 /**
  * Shows all rounds of one training day
  */
-abstract class ExpandableListFragment<H : IIdProvider, C> : EditableListFragmentBase<C, ExpandableListAdapter<H, C>>() where C : IIdSettable {
+abstract class ExpandableListFragment<H : IIdProvider, C> :
+    EditableListFragmentBase<C, ExpandableListAdapter<H, C>>() where C : IIdSettable {
 
     private var savedInstanceState: Bundle? = null
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/overview/Header.kt b/app/src/main/java/de/dreier/mytargets/features/training/overview/Header.kt
index b2b0515e8..fbbdd33be 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/overview/Header.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/overview/Header.kt
@@ -17,8 +17,8 @@ package de.dreier.mytargets.features.training.overview
 import de.dreier.mytargets.shared.models.IIdProvider
 
 data class Header(
-        override val id: Long,
-        val title: String
+    override val id: Long,
+    val title: String
 ) : IIdProvider, Comparable<Header> {
 
     override fun toString(): String {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
index 26f293bf6..88c1c5741 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundFragment.kt
@@ -53,9 +53,13 @@ class EditStandardRoundFragment : EditFragmentBase() {
     private var adapter: RoundTemplateAdapter? = null
     private lateinit var binding: FragmentEditStandardRoundBinding
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = DataBindingUtil
-                .inflate(inflater, R.layout.fragment_edit_standard_round, container, false)
+            .inflate(inflater, R.layout.fragment_edit_standard_round, container, false)
 
         ToolbarUtils.setSupportActionBar(this, binding.toolbar)
         ToolbarUtils.showUpAsX(this)
@@ -68,7 +72,10 @@ class EditStandardRoundFragment : EditFragmentBase() {
             if (standardRound == null) {
                 ToolbarUtils.setTitle(this, R.string.new_round_template)
                 binding.name.setText(R.string.custom_round)
-                standardRound = AugmentedStandardRound(StandardRound(), mutableListOf(getDefaultRoundTemplate()))
+                standardRound = AugmentedStandardRound(
+                    StandardRound(),
+                    mutableListOf(getDefaultRoundTemplate())
+                )
             } else {
                 ToolbarUtils.setTitle(this, R.string.edit_standard_round)
                 // Load saved values
@@ -77,8 +84,11 @@ class EditStandardRoundFragment : EditFragmentBase() {
                 } else {
                     standardRound!!.standardRound.id = 0L
                     binding.name.setText(
-                            "%s %s".format(getString(R.string.custom), standardRound!!.standardRound
-                                    .name))
+                        "%s %s".format(
+                            getString(R.string.custom), standardRound!!.standardRound
+                                .name
+                        )
+                    )
                     // When copying an existing standard round make sure
                     // we don't overwrite the other rounds templates
                     for (round in standardRound!!.roundTemplates) {
@@ -136,7 +146,10 @@ class EditStandardRoundFragment : EditFragmentBase() {
     override fun onSave() {
         standardRound!!.standardRound.club = StandardRoundFactory.CUSTOM
         standardRound!!.standardRound.name = binding.name.text.toString()
-        standardRoundDAO.saveStandardRound(standardRound!!.standardRound, standardRound!!.roundTemplates)
+        standardRoundDAO.saveStandardRound(
+            standardRound!!.standardRound,
+            standardRound!!.roundTemplates
+        )
 
         val round = standardRound!!.roundTemplates[0]
         SettingsManager.shotsPerEnd = round.shotsPerEnd
@@ -161,27 +174,37 @@ class EditStandardRoundFragment : EditFragmentBase() {
                 }
                 TargetSelector.TARGET_REQUEST_CODE -> {
                     standardRound!!.roundTemplates[index]
-                            .targetTemplate = data.getParcelableExtra(ITEM)
+                        .targetTemplate = data.getParcelableExtra(ITEM)
                     adapter!!.notifyItemChanged(index)
                 }
             }
         }
     }
 
-    private inner class RoundTemplateHolder internal constructor(view: View) : DynamicItemHolder<RoundTemplate>(view) {
+    private inner class RoundTemplateHolder internal constructor(view: View) :
+        DynamicItemHolder<RoundTemplate>(view) {
 
         internal var binding = ItemRoundTemplateBinding.bind(view)
 
-        override fun onBind(item: RoundTemplate, position: Int, fragment: Fragment, removeListener: View.OnClickListener) {
+        override fun onBind(
+            item: RoundTemplate,
+            position: Int,
+            fragment: Fragment,
+            removeListener: View.OnClickListener
+        ) {
             this.item = item
 
             // Set title of round
             binding.roundNumber.text = fragment.resources
-                    .getQuantityString(R.plurals.rounds, position + 1, position + 1)
+                .getQuantityString(R.plurals.rounds, position + 1, position + 1)
             item.index = position
 
             binding.distance.setOnClickListener { selectedItem, index ->
-                navigationController.navigateToDistance(selectedItem!!, index, DistanceSelector.DISTANCE_REQUEST_CODE)
+                navigationController.navigateToDistance(
+                    selectedItem!!,
+                    index,
+                    DistanceSelector.DISTANCE_REQUEST_CODE
+                )
             }
             binding.distance.itemIndex = position
             binding.distance.setItem(item.distance)
@@ -214,9 +237,15 @@ class EditStandardRoundFragment : EditFragmentBase() {
         }
     }
 
-    private inner class RoundTemplateAdapter internal constructor(fragment: Fragment, list: MutableList<RoundTemplate>) : DynamicItemAdapter<RoundTemplate>(fragment, list, R.string.round_removed) {
+    private inner class RoundTemplateAdapter internal constructor(
+        fragment: Fragment,
+        list: MutableList<RoundTemplate>
+    ) : DynamicItemAdapter<RoundTemplate>(fragment, list, R.string.round_removed) {
 
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DynamicItemHolder<RoundTemplate> {
+        override fun onCreateViewHolder(
+            parent: ViewGroup,
+            viewType: Int
+        ): DynamicItemHolder<RoundTemplate> {
             val v = inflater.inflate(R.layout.item_round_template, parent, false)
             return RoundTemplateHolder(v)
         }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
index 7826b754e..b0cd2f758 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
@@ -44,8 +44,9 @@ import de.dreier.mytargets.utils.contains
 import de.dreier.mytargets.utils.multiselector.OnItemLongClickListener
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 
-class StandardRoundListFragment : SelectItemFragmentBase<AugmentedStandardRound, HeaderListAdapter<AugmentedStandardRound>>(),
-        SearchView.OnQueryTextListener, OnItemLongClickListener<AugmentedStandardRound> {
+class StandardRoundListFragment :
+    SelectItemFragmentBase<AugmentedStandardRound, HeaderListAdapter<AugmentedStandardRound>>(),
+    SearchView.OnQueryTextListener, OnItemLongClickListener<AugmentedStandardRound> {
 
     @State
     var currentSelection: AugmentedStandardRound? = null
@@ -62,7 +63,11 @@ class StandardRoundListFragment : SelectItemFragmentBase<AugmentedStandardRound,
         }
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_list, container, false)
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.itemAnimator = SlideInItemAnimator()
@@ -74,8 +79,8 @@ class StandardRoundListFragment : SelectItemFragmentBase<AugmentedStandardRound,
         binding.fab.visibility = View.VISIBLE
         binding.fab.setOnClickListener {
             navigationController.navigateToCreateStandardRound()
-                    .fromFab(binding.fab).forResult(NEW_STANDARD_ROUND)
-                    .start()
+                .fromFab(binding.fab).forResult(NEW_STANDARD_ROUND)
+                .start()
         }
         useDoubleClickSelection = true
         setHasOptionsMenu(true)
@@ -88,7 +93,12 @@ class StandardRoundListFragment : SelectItemFragmentBase<AugmentedStandardRound,
             standardRoundDAO.getAllSearch("%${query!!.replace(' ', '%')}%")
         } else {
             standardRoundDAO.loadStandardRounds()
-        }.map { AugmentedStandardRound(it, standardRoundDAO.loadRoundTemplates(it.id).toMutableList()) }.toMutableList()
+        }.map {
+            AugmentedStandardRound(
+                it,
+                standardRoundDAO.loadRoundTemplates(it.id).toMutableList()
+            )
+        }.toMutableList()
         return {
             adapter!!.setList(data)
             selectItem(binding.recyclerView, currentSelection!!)
@@ -106,7 +116,10 @@ class StandardRoundListFragment : SelectItemFragmentBase<AugmentedStandardRound,
         }
     }
 
-    override fun onClick(holder: SelectableViewHolder<AugmentedStandardRound>, item: AugmentedStandardRound?) {
+    override fun onClick(
+        holder: SelectableViewHolder<AugmentedStandardRound>,
+        item: AugmentedStandardRound?
+    ) {
         currentSelection = item
         super.onClick(holder, item)
     }
@@ -115,21 +128,21 @@ class StandardRoundListFragment : SelectItemFragmentBase<AugmentedStandardRound,
         val item = holder.item!!
         if (item.standardRound.club == StandardRoundFactory.CUSTOM) {
             navigationController.navigateToEditStandardRound(item)
-                    .forResult(EDIT_STANDARD_ROUND)
-                    .start()
+                .forResult(EDIT_STANDARD_ROUND)
+                .start()
         } else {
             MaterialDialog.Builder(context!!)
-                    .title(R.string.use_as_template)
-                    .content(R.string.create_copy)
-                    .positiveText(android.R.string.yes)
-                    .negativeText(android.R.string.cancel)
-                    .onPositive { _, _ ->
-                        navigationController
-                                .navigateToEditStandardRound(item)
-                                .forResult(NEW_STANDARD_ROUND)
-                                .start()
-                    }
-                    .show()
+                .title(R.string.use_as_template)
+                .content(R.string.create_copy)
+                .positiveText(android.R.string.yes)
+                .negativeText(android.R.string.cancel)
+                .onPositive { _, _ ->
+                    navigationController
+                        .navigateToEditStandardRound(item)
+                        .forResult(NEW_STANDARD_ROUND)
+                        .start()
+                }
+                .show()
         }
     }
 
@@ -195,25 +208,32 @@ class StandardRoundListFragment : SelectItemFragmentBase<AugmentedStandardRound,
     }
 
     private inner class StandardRoundListAdapter internal constructor(
-            context: Context,
-            usedIds: LongSparseArray<Int>
-    ) : HeaderListAdapter<AugmentedStandardRound>({ id ->
-        if (usedIds.contains(id.id)) {
-            HeaderListAdapter.SimpleHeader(0L, context.getString(R.string.recently_used))
-        } else {
-            HeaderListAdapter.SimpleHeader(1L, "")
-        }
-    }, compareBy({ usedIds.get(it.standardRound.id) ?: 0 }, { it.standardRound.name }, { it.standardRound.id })) {
+        context: Context,
+        usedIds: LongSparseArray<Int>
+    ) : HeaderListAdapter<AugmentedStandardRound>(
+        { id ->
+            if (usedIds.contains(id.id)) {
+                HeaderListAdapter.SimpleHeader(0L, context.getString(R.string.recently_used))
+            } else {
+                HeaderListAdapter.SimpleHeader(1L, "")
+            }
+        },
+        compareBy({ usedIds.get(it.standardRound.id) ?: 0 },
+            { it.standardRound.name },
+            { it.standardRound.id })
+    ) {
 
         override fun getSecondLevelViewHolder(parent: ViewGroup): ViewHolder {
             val itemView = LayoutInflater.from(parent.context)
-                    .inflate(R.layout.item_standard_round, parent, false)
+                .inflate(R.layout.item_standard_round, parent, false)
             return ViewHolder(itemView)
         }
     }
 
-    private inner class ViewHolder(itemView: View) : SelectableViewHolder<AugmentedStandardRound>(itemView,
-            selector, this@StandardRoundListFragment, this@StandardRoundListFragment) {
+    private inner class ViewHolder(itemView: View) : SelectableViewHolder<AugmentedStandardRound>(
+        itemView,
+        selector, this@StandardRoundListFragment, this@StandardRoundListFragment
+    ) {
 
         private val binding = ItemStandardRoundBinding.bind(itemView)
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
index a9cea702f..b1d3cb8e4 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
@@ -41,7 +41,9 @@ import de.dreier.mytargets.utils.ToolbarUtils
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
 import java.util.*
 
-class TargetListFragment : SelectItemFragmentBase<Target, ExpandableListAdapter<HeaderListAdapter.SimpleHeader, Target>>(), AdapterView.OnItemSelectedListener {
+class TargetListFragment :
+    SelectItemFragmentBase<Target, ExpandableListAdapter<HeaderListAdapter.SimpleHeader, Target>>(),
+    AdapterView.OnItemSelectedListener {
     private lateinit var binding: FragmentTargetSelectBinding
     private var scoringStyleAdapter: ArrayAdapter<String>? = null
     private var targetSizeAdapter: ArrayAdapter<String>? = null
@@ -50,15 +52,21 @@ class TargetListFragment : SelectItemFragmentBase<Target, ExpandableListAdapter<
         get() {
             val actionBar = (activity as AppCompatActivity).supportActionBar!!
             val themedContext = actionBar.themedContext
-            val spinnerAdapter = ArrayAdapter(themedContext,
-                    android.R.layout.simple_spinner_item, ArrayList<String>())
+            val spinnerAdapter = ArrayAdapter(
+                themedContext,
+                android.R.layout.simple_spinner_item, ArrayList<String>()
+            )
             spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
             return spinnerAdapter
         }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         binding = DataBindingUtil
-                .inflate(inflater, R.layout.fragment_target_select, container, false)
+            .inflate(inflater, R.layout.fragment_target_select, container, false)
         adapter = TargetAdapter()
         binding.recyclerView.itemAnimator = SlideInItemAnimator()
         binding.recyclerView.adapter = adapter
@@ -82,16 +90,16 @@ class TargetListFragment : SelectItemFragmentBase<Target, ExpandableListAdapter<
         // Process passed arguments
         val target = arguments!!.getParcelable<Target>(ITEM)!!
         val fixedType = EFixedType
-                .valueOf(arguments!!.getString(FIXED_TYPE, NONE.name))
+            .valueOf(arguments!!.getString(FIXED_TYPE, NONE.name))
         val list = when (fixedType) {
             NONE -> TargetFactory.getList()
             TARGET -> listOf(target.model)
             GROUP -> TargetFactory.getList(target)
         }
         val targets = list
-                .map { value -> Target(value.id, 0) }
-                .toMutableList()
-        adapter!!.setList(targets)
+            .map { value -> Target(value.id, 0) }
+            .toMutableList()
+        adapter.setList(targets)
         selectItem(binding.recyclerView, target)
 
         updateSettings()
@@ -134,7 +142,11 @@ class TargetListFragment : SelectItemFragmentBase<Target, ExpandableListAdapter<
         }
     }
 
-    private fun updateAdapter(spinner: Spinner, spinnerAdapter: ArrayAdapter<String>, strings: List<String>) {
+    private fun updateAdapter(
+        spinner: Spinner,
+        spinnerAdapter: ArrayAdapter<String>,
+        strings: List<String>
+    ) {
         val lastSelection = spinner.selectedItemPosition
         spinnerAdapter.clear()
         spinnerAdapter.addAll(strings)
@@ -188,19 +200,21 @@ class TargetListFragment : SelectItemFragmentBase<Target, ExpandableListAdapter<
         TARGET
     }
 
-    private inner class TargetAdapter internal constructor() : ExpandableListAdapter<HeaderListAdapter.SimpleHeader, Target>({ child ->
-        val type = child.model.type
-        HeaderListAdapter.SimpleHeader(type.ordinal.toLong(), type.toString())
-    }, compareBy { it }, TargetFactory.comparator) {
+    private inner class TargetAdapter internal constructor() :
+        ExpandableListAdapter<HeaderListAdapter.SimpleHeader, Target>({ child ->
+            val type = child.model.type
+            HeaderListAdapter.SimpleHeader(type.ordinal.toLong(), type.toString())
+        }, compareBy { it }, TargetFactory.comparator) {
 
         override fun getSecondLevelViewHolder(parent: ViewGroup): ViewHolder {
             val itemView = LayoutInflater.from(parent.context)
-                    .inflate(R.layout.item_image_simple, parent, false)
+                .inflate(R.layout.item_image_simple, parent, false)
             return ViewHolder(itemView)
         }
     }
 
-    private inner class ViewHolder(itemView: View) : SelectableViewHolder<Target>(itemView, selector, this@TargetListFragment) {
+    private inner class ViewHolder(itemView: View) :
+        SelectableViewHolder<Target>(itemView, selector, this@TargetListFragment) {
         private val binding = ItemImageSimpleBinding.bind(itemView)
 
         override fun bindItem(item: Target) {
diff --git a/app/src/main/java/de/dreier/mytargets/utils/AugmentedRoundUtils.kt b/app/src/main/java/de/dreier/mytargets/utils/AugmentedRoundUtils.kt
index 6ceaf81b0..4c86cc574 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/AugmentedRoundUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/AugmentedRoundUtils.kt
@@ -29,8 +29,10 @@ import de.dreier.mytargets.shared.models.db.Shot
 fun AugmentedRound.addEnd(): AugmentedEnd {
     val end = End(index = ends.size, roundId = round.id)
     val augmentedEnd = AugmentedEnd(end, (0 until round.shotsPerEnd)
-            .map { Shot(it) }.toMutableList(), mutableListOf())
-    ApplicationInstance.db.endDAO().saveCompleteEnd(augmentedEnd.end, augmentedEnd.images, augmentedEnd.shots)
+        .map { Shot(it) }.toMutableList(), mutableListOf()
+    )
+    ApplicationInstance.db.endDAO()
+        .saveCompleteEnd(augmentedEnd.end, augmentedEnd.images, augmentedEnd.shots)
     ends.add(augmentedEnd)
     return augmentedEnd
 }
diff --git a/app/src/main/java/de/dreier/mytargets/utils/DividerItemDecoration.kt b/app/src/main/java/de/dreier/mytargets/utils/DividerItemDecoration.kt
index e2e97ebb4..fac5373bc 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/DividerItemDecoration.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/DividerItemDecoration.kt
@@ -35,13 +35,15 @@ class DividerItemDecoration : RecyclerView.ItemDecoration {
 
     private constructor(context: Context, attrs: AttributeSet) {
         val a = context
-                .obtainStyledAttributes(attrs, intArrayOf(android.R.attr.listDivider))
+            .obtainStyledAttributes(attrs, intArrayOf(android.R.attr.listDivider))
         mDivider = a.getDrawable(0)
         a.recycle()
     }
 
-    constructor(context: Context, attrs: AttributeSet, showFirstDivider: Boolean,
-                showLastDivider: Boolean) : this(context, attrs) {
+    constructor(
+        context: Context, attrs: AttributeSet, showFirstDivider: Boolean,
+        showLastDivider: Boolean
+    ) : this(context, attrs) {
         mShowFirstDivider = showFirstDivider
         mShowLastDivider = showLastDivider
     }
@@ -50,8 +52,10 @@ class DividerItemDecoration : RecyclerView.ItemDecoration {
         mDivider = ContextCompat.getDrawable(context, resId)
     }
 
-    constructor(context: Context, resId: Int, showFirstDivider: Boolean,
-                showLastDivider: Boolean) : this(context, resId) {
+    constructor(
+        context: Context, resId: Int, showFirstDivider: Boolean,
+        showLastDivider: Boolean
+    ) : this(context, resId) {
         mShowFirstDivider = showFirstDivider
         mShowLastDivider = showLastDivider
     }
@@ -60,14 +64,18 @@ class DividerItemDecoration : RecyclerView.ItemDecoration {
         mDivider = divider
     }
 
-    constructor(divider: Drawable, showFirstDivider: Boolean,
-                showLastDivider: Boolean) : this(divider) {
+    constructor(
+        divider: Drawable, showFirstDivider: Boolean,
+        showLastDivider: Boolean
+    ) : this(divider) {
         mShowFirstDivider = showFirstDivider
         mShowLastDivider = showLastDivider
     }
 
-    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView,
-                                state: RecyclerView.State) {
+    override fun getItemOffsets(
+        outRect: Rect, view: View, parent: RecyclerView,
+        state: RecyclerView.State
+    ) {
         super.getItemOffsets(outRect, view, parent, state)
         if (mDivider == null) {
             return
@@ -140,7 +148,7 @@ class DividerItemDecoration : RecyclerView.ItemDecoration {
             val child = parent.getChildAt(childCount - 1)
             if (parent.getChildAdapterPosition(child) == state.itemCount - 1) {
                 val params = child
-                        .layoutParams as RecyclerView.LayoutParams
+                    .layoutParams as RecyclerView.LayoutParams
                 if (orientation == LinearLayoutManager.VERTICAL) {
                     top = child.bottom + params.bottomMargin
                     bottom = top + size
@@ -161,7 +169,8 @@ class DividerItemDecoration : RecyclerView.ItemDecoration {
                 mOrientation = layoutManager.orientation
             } else {
                 throw IllegalStateException(
-                        "DividerItemDecoration can only be used with a LinearLayoutManager.")
+                    "DividerItemDecoration can only be used with a LinearLayoutManager."
+                )
             }
         }
         return mOrientation
diff --git a/app/src/main/java/de/dreier/mytargets/utils/IntentWrapper.kt b/app/src/main/java/de/dreier/mytargets/utils/IntentWrapper.kt
index 23a21deb5..d3f9a4bd7 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/IntentWrapper.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/IntentWrapper.kt
@@ -29,9 +29,9 @@ import de.dreier.mytargets.R
 import de.dreier.mytargets.utils.transitions.FabTransform
 
 class IntentWrapper(
-        private var activity: Activity,
-        var fragment: Fragment? = null,
-        intentTargetClass: Class<*>
+    private var activity: Activity,
+    var fragment: Fragment? = null,
+    intentTargetClass: Class<*>
 ) {
 
     private val intent = Intent(activity, intentTargetClass)
@@ -76,13 +76,18 @@ class IntentWrapper(
 
     @SuppressLint("NewApi")
     @JvmOverloads
-    fun fromFab(fab: View, @ColorRes color: Int = R.color.colorAccent, icon: Int = R.drawable.ic_add_white_24dp): IntentWrapper {
+    fun fromFab(
+        fab: View, @ColorRes color: Int = R.color.colorAccent,
+        icon: Int = R.drawable.ic_add_white_24dp
+    ): IntentWrapper {
         if (Utils.isLollipop) {
             fab.transitionName = fab.context.getString(R.string.transition_root_view)
             FabTransform.addExtras(intent, color, icon)
             val options = ActivityOptions
-                    .makeSceneTransitionAnimation(getActivity(fab), fab,
-                            fab.context.getString(R.string.transition_root_view))
+                .makeSceneTransitionAnimation(
+                    getActivity(fab), fab,
+                    fab.context.getString(R.string.transition_root_view)
+                )
             this.options = options.toBundle()
         }
         return this
@@ -111,8 +116,10 @@ class IntentWrapper(
     }
 
     fun clearTopSingleTop(): IntentWrapper {
-        intent.addFlags(intent.flags or Intent.FLAG_ACTIVITY_CLEAR_TOP or
-                Intent.FLAG_ACTIVITY_SINGLE_TOP)
+        intent.addFlags(
+            intent.flags or Intent.FLAG_ACTIVITY_CLEAR_TOP or
+                    Intent.FLAG_ACTIVITY_SINGLE_TOP
+        )
         return this
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableClient.kt b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableClient.kt
index c0d89b5c4..86e7d2179 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableClient.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableClient.kt
@@ -41,8 +41,10 @@ class MobileWearableClient(context: Context) : WearableClientBase(context) {
     }
 
     init {
-        LocalBroadcastManager.getInstance(context).registerReceiver(updateReceiver,
-                IntentFilter(BROADCAST_UPDATE_TRAINING_FROM_LOCAL))
+        LocalBroadcastManager.getInstance(context).registerReceiver(
+            updateReceiver,
+            IntentFilter(BROADCAST_UPDATE_TRAINING_FROM_LOCAL)
+        )
     }
 
     override fun disconnect() {
@@ -76,22 +78,26 @@ class MobileWearableClient(context: Context) : WearableClientBase(context) {
             return
         }
         val round = rounds
-                .firstOrNull { it.round.maxEndCount != null && it.ends.size < it.round.maxEndCount!! }
+            .firstOrNull { it.round.maxEndCount != null && it.ends.size < it.round.maxEndCount!! }
                 ?: rounds.last()
 
         val target = round.round.target
         val roundCopy = round.copy(ends = round.ends.toMutableList()
-                .filter { (_, shots) ->
-                    shots.all { (_, _, _, _, _, scoringRing) -> scoringRing != Shot.NOTHING_SELECTED }
-                }
-                .map { end ->
-                    if (!SettingsManager.shouldSortTarget(target)) {
-                        end
-                    } else {
-                        AugmentedEnd(end.end, end.shots.toMutableList().sorted().toMutableList(), end.images)
-                    }
+            .filter { (_, shots) ->
+                shots.all { (_, _, _, _, _, scoringRing) -> scoringRing != Shot.NOTHING_SELECTED }
+            }
+            .map { end ->
+                if (!SettingsManager.shouldSortTarget(target)) {
+                    end
+                } else {
+                    AugmentedEnd(
+                        end.end,
+                        end.shots.toMutableList().sorted().toMutableList(),
+                        end.images
+                    )
                 }
-                .toMutableList())
+            }
+            .toMutableList())
         val trainingInfo = TrainingInfo(training, roundCopy)
         sendTrainingInfo(trainingInfo)
         sendTimerSettings(SettingsManager.timerSettings)
diff --git a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
index 9c8b37cc1..7510c1d3f 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/MobileWearableListener.kt
@@ -19,7 +19,6 @@ import com.google.android.gms.wearable.MessageEvent
 import com.google.android.gms.wearable.WearableListenerService
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
-import de.dreier.mytargets.base.db.EndRepository
 import de.dreier.mytargets.base.db.RoundRepository
 import de.dreier.mytargets.base.db.TrainingRepository
 import de.dreier.mytargets.features.settings.SettingsManager
@@ -47,7 +46,13 @@ class MobileWearableListener : WearableListenerService() {
     private val endDAO = database.endDAO()
     private val standardRoundDAO = database.standardRoundDAO()
     private val roundRepository = RoundRepository(database)
-    private val trainingRepository = TrainingRepository(database, trainingDAO, roundDAO,roundRepository, database.signatureDAO())
+    private val trainingRepository = TrainingRepository(
+        database,
+        trainingDAO,
+        roundDAO,
+        roundRepository,
+        database.signatureDAO()
+    )
 
     override fun onMessageReceived(messageEvent: MessageEvent) {
         super.onMessageReceived(messageEvent)
@@ -68,7 +73,8 @@ class MobileWearableListener : WearableListenerService() {
     }
 
     private fun trainingTemplate() {
-        val lastTraining = trainingDAO.loadTrainings().minWith(compareByDescending(Training::date).thenByDescending(Training::id))
+        val lastTraining = trainingDAO.loadTrainings()
+            .minWith(compareByDescending(Training::date).thenByDescending(Training::id))
         if (lastTraining != null && lastTraining.date.isEqual(LocalDate.now())) {
             val training = trainingRepository.loadAugmentedTraining(lastTraining.id)
             ApplicationInstance.wearableClient.updateTraining(training)
@@ -92,10 +98,10 @@ class MobileWearableListener : WearableListenerService() {
                 aTraining.rounds = mutableListOf(AugmentedRound(round, mutableListOf()))
             } else {
                 aTraining.rounds = standardRoundDAO
-                        .loadAugmentedStandardRound(lastTraining!!.standardRoundId!!)
-                        .createRoundsFromTemplate()
-                        .map { AugmentedRound(it, mutableListOf()) }
-                        .toMutableList()
+                    .loadAugmentedStandardRound(lastTraining!!.standardRoundId!!)
+                    .createRoundsFromTemplate()
+                    .map { AugmentedRound(it, mutableListOf()) }
+                    .toMutableList()
             }
             ApplicationInstance.wearableClient.sendTrainingTemplate(aTraining)
         }
@@ -103,7 +109,9 @@ class MobileWearableListener : WearableListenerService() {
 
     private fun createTraining(messageEvent: MessageEvent) {
         val augmentedTraining = messageEvent.data.unmarshall(AugmentedTraining.CREATOR)
-        trainingDAO.saveTraining(augmentedTraining.training, augmentedTraining.rounds.map { it.round })
+        trainingDAO.saveTraining(
+            augmentedTraining.training,
+            augmentedTraining.rounds.map { it.round })
         ApplicationInstance.wearableClient.updateTraining(augmentedTraining)
         ApplicationInstance.wearableClient.sendCreateTrainingFromRemoteBroadcast()
     }
@@ -116,9 +124,12 @@ class MobileWearableListener : WearableListenerService() {
         newEnd.shots = shots
         endDAO.saveCompleteEnd(newEnd.end, newEnd.images, newEnd.shots)
 
-        ApplicationInstance.wearableClient.sendUpdateTrainingFromRemoteBroadcast(round.round, newEnd.end)
+        ApplicationInstance.wearableClient.sendUpdateTrainingFromRemoteBroadcast(
+            round.round,
+            newEnd.end
+        )
         ApplicationInstance.wearableClient
-                .sendUpdateTrainingFromLocalBroadcast(trainingRepository.loadAugmentedTraining(round.round.trainingId!!))
+            .sendUpdateTrainingFromLocalBroadcast(trainingRepository.loadAugmentedTraining(round.round.trainingId!!))
     }
 
     private fun getLastEmptyOrCreateNewEnd(round: AugmentedRound): AugmentedEnd {
diff --git a/app/src/main/java/de/dreier/mytargets/utils/RoundedTextDrawable.kt b/app/src/main/java/de/dreier/mytargets/utils/RoundedTextDrawable.kt
index ed3779462..3d2003adb 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/RoundedTextDrawable.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/RoundedTextDrawable.kt
@@ -21,7 +21,11 @@ import android.text.TextPaint
 import de.dreier.mytargets.features.statistics.ArrowStatistic
 import java.util.*
 
-class RoundedTextDrawable private constructor(private val text: String, bgColor: Int, textColor: Int) : Drawable() {
+class RoundedTextDrawable private constructor(
+    private val text: String,
+    bgColor: Int,
+    textColor: Int
+) : Drawable() {
     private val paint = Paint()
     private val rectF = RectF()
     private val textPaint = TextPaint()
@@ -35,14 +39,18 @@ class RoundedTextDrawable private constructor(private val text: String, bgColor:
         paint.color = bgColor
     }
 
-    constructor(item: ArrowStatistic) : this(String.format(Locale.US, "%.1f", item.totalScore.shotAverage),
-            item.appropriateBgColor,
-            item.appropriateTextColor)
+    constructor(item: ArrowStatistic) : this(
+        String.format(Locale.US, "%.1f", item.totalScore.shotAverage),
+        item.appropriateBgColor,
+        item.appropriateTextColor
+    )
 
     override fun draw(canvas: Canvas) {
         canvas.drawOval(rectF, paint)
-        canvas.drawText(text, rectF.centerX() - textBounds.width() / 2,
-                rectF.centerY() + textBounds.height() / 2, textPaint)
+        canvas.drawText(
+            text, rectF.centerX() - textBounds.width() / 2,
+            rectF.centerY() + textBounds.height() / 2, textPaint
+        )
     }
 
     override fun onBoundsChange(bounds: Rect) {
diff --git a/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt b/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt
index c5f80f8d2..4e191e797 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/ScoreUtils.kt
@@ -46,29 +46,39 @@ object ScoreUtils {
     /**
      * Compound 9ers are already collapsed to one SelectableZone.
      */
-    fun getSortedScoreDistribution(roundDAO: RoundDAO, endDAO: EndDAO, rounds: List<Round>): List<Map.Entry<SelectableZone, Int>> {
+    fun getSortedScoreDistribution(
+        roundDAO: RoundDAO,
+        endDAO: EndDAO,
+        rounds: List<Round>
+    ): List<Map.Entry<SelectableZone, Int>> {
         return getRoundScores(roundDAO, endDAO, rounds).entries.sortedBy { it.key }
     }
 
-    private fun getRoundScores(roundDAO: RoundDAO, endDAO: EndDAO, rounds: List<Round>): Map<SelectableZone, Int> {
+    private fun getRoundScores(
+        roundDAO: RoundDAO,
+        endDAO: EndDAO,
+        rounds: List<Round>
+    ): Map<SelectableZone, Int> {
         val t = rounds[0].target
         val scoreCount = getAllPossibleZones(t)
         rounds.flatMap { roundDAO.loadEnds(it.id) }
-                .forEach {
-                    endDAO.loadShots(it.id).forEach { s ->
-                        if (s.scoringRing != Shot.NOTHING_SELECTED) {
-                            val tuple = SelectableZone(s.scoringRing,
-                                    t.model.getZone(s.scoringRing),
-                                    t.zoneToString(s.scoringRing, s.index),
-                                    t.getScoreByZone(s.scoringRing, s.index))
-                            val integer = scoreCount[tuple]
-                            if (integer != null) {
-                                val count = integer + 1
-                                scoreCount[tuple] = count
-                            }
+            .forEach {
+                endDAO.loadShots(it.id).forEach { s ->
+                    if (s.scoringRing != Shot.NOTHING_SELECTED) {
+                        val tuple = SelectableZone(
+                            s.scoringRing,
+                            t.model.getZone(s.scoringRing),
+                            t.zoneToString(s.scoringRing, s.index),
+                            t.getScoreByZone(s.scoringRing, s.index)
+                        )
+                        val integer = scoreCount[tuple]
+                        if (integer != null) {
+                            val count = integer + 1
+                            scoreCount[tuple] = count
                         }
                     }
                 }
+            }
         return scoreCount
     }
 
diff --git a/app/src/main/java/de/dreier/mytargets/utils/SlideInItemAnimator.kt b/app/src/main/java/de/dreier/mytargets/utils/SlideInItemAnimator.kt
index 4cc53cedd..8f87a41cc 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/SlideInItemAnimator.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/SlideInItemAnimator.kt
@@ -29,7 +29,10 @@ import java.util.*
  * A [RecyclerView.ItemAnimator] that fades & slides newly added items in from a given
  * direction.
  */
-class SlideInItemAnimator @JvmOverloads constructor(slideFromEdge: Int = Gravity.BOTTOM, layoutDirection: Int = -1) : DefaultItemAnimator() {
+class SlideInItemAnimator @JvmOverloads constructor(
+    slideFromEdge: Int = Gravity.BOTTOM,
+    layoutDirection: Int = -1
+) : DefaultItemAnimator() {
 
     private val pendingAdds = ArrayList<RecyclerView.ViewHolder>()
     private val slideFromEdge: Int = Gravity.getAbsoluteGravity(slideFromEdge, layoutDirection)
@@ -60,8 +63,9 @@ class SlideInItemAnimator @JvmOverloads constructor(slideFromEdge: Int = Gravity
         if (!pendingAdds.isEmpty()) {
             for (i in pendingAdds.indices.reversed()) {
                 val holder = pendingAdds[i]
-                Handler().postDelayed({
-                    holder.itemView.animate()
+                Handler().postDelayed(
+                    {
+                        holder.itemView.animate()
                             .alpha(1f)
                             .translationX(0f)
                             .translationY(0f)
@@ -81,8 +85,9 @@ class SlideInItemAnimator @JvmOverloads constructor(slideFromEdge: Int = Gravity
                                     clearAnimatedValues(holder.itemView)
                                 }
                             }).interpolator = LinearOutSlowInInterpolator()
-                },
-                        (holder.adapterPosition * 30).toLong())
+                    },
+                    (holder.adapterPosition * 30).toLong()
+                )
                 pendingAdds.removeAt(i)
             }
             useDefaultAnimator = true
diff --git a/app/src/main/java/de/dreier/mytargets/utils/Utils.kt b/app/src/main/java/de/dreier/mytargets/utils/Utils.kt
index 9199f2ec6..e5372b020 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/Utils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/Utils.kt
@@ -85,7 +85,12 @@ object Utils {
         }
         val exp = (Math.log(bytes.toDouble()) / Math.log(unit.toDouble())).toInt()
         val pre = (if (si) "kMGTPE" else "KMGTPE")[exp - 1] + if (si) "" else "i"
-        return String.format(Locale.US, "%.1f %sB", bytes / Math.pow(unit.toDouble(), exp.toDouble()), pre)
+        return String.format(
+            Locale.US,
+            "%.1f %sB",
+            bytes / Math.pow(unit.toDouble(), exp.toDouble()),
+            pre
+        )
     }
 
     fun hasCameraHardware(context: Context): Boolean {
diff --git a/app/src/main/java/de/dreier/mytargets/utils/backup/DbBackupHelper.kt b/app/src/main/java/de/dreier/mytargets/utils/backup/DbBackupHelper.kt
index 59a797062..a70a872ea 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/backup/DbBackupHelper.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/backup/DbBackupHelper.kt
@@ -20,4 +20,5 @@ import android.content.Context
 
 import de.dreier.mytargets.base.db.AppDatabase
 
-internal class DbBackupHelper(ctx: Context) : FileBackupHelper(ctx, ctx.getDatabasePath(AppDatabase.DATABASE_FILE_NAME).absolutePath)
+internal class DbBackupHelper(ctx: Context) :
+    FileBackupHelper(ctx, ctx.getDatabasePath(AppDatabase.DATABASE_FILE_NAME).absolutePath)
diff --git a/app/src/main/java/de/dreier/mytargets/utils/backup/MyBackupAgent.kt b/app/src/main/java/de/dreier/mytargets/utils/backup/MyBackupAgent.kt
index 173b8e91e..4c38d7a62 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/backup/MyBackupAgent.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/backup/MyBackupAgent.kt
@@ -26,8 +26,13 @@ class MyBackupAgent : BackupAgentHelper() {
     override fun onCreate() {
         addHelper(PREFS_BACKUP_KEY, SharedPreferencesBackupHelper(this, PREFS))
         addHelper(SQLITE_BACKUP_KEY, DbBackupHelper(this))
-        addHelper(IMAGES_BACKUP_KEY,
-                FileBackupHelper(this, *ApplicationInstance.db.imageDAO().loadAllFileNames().toTypedArray()))
+        addHelper(
+            IMAGES_BACKUP_KEY,
+            FileBackupHelper(
+                this,
+                *ApplicationInstance.db.imageDAO().loadAllFileNames().toTypedArray()
+            )
+        )
     }
 
     companion object {
diff --git a/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt b/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt
index 7e4b23d3c..cb957d038 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/databinding/SpinnerBindingAdapters.kt
@@ -33,9 +33,18 @@ object SpinnerBindingAdapters {
 
     @JvmStatic
     @BindingAdapter(value = ["selectedUnit", "selectedValueAttrChanged"], requireAll = false)
-    fun bindSpinnerData(pAppCompatSpinner: AppCompatSpinner, newSelectedValue: Dimension.Unit?, newTextAttrChanged: InverseBindingListener) {
+    fun bindSpinnerData(
+        pAppCompatSpinner: AppCompatSpinner,
+        newSelectedValue: Dimension.Unit?,
+        newTextAttrChanged: InverseBindingListener
+    ) {
         pAppCompatSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
+            override fun onItemSelected(
+                parent: AdapterView<*>,
+                view: View,
+                position: Int,
+                id: Long
+            ) {
                 newTextAttrChanged.onChange()
             }
 
@@ -49,9 +58,18 @@ object SpinnerBindingAdapters {
 
     @JvmStatic
     @BindingAdapter(value = ["selectedUnit", "selectedValueAttrChanged"], requireAll = false)
-    fun bindSpinnerData(pAppCompatSpinner: Spinner, newSelectedValue: Dimension.Unit?, newTextAttrChanged: InverseBindingListener) {
+    fun bindSpinnerData(
+        pAppCompatSpinner: Spinner,
+        newSelectedValue: Dimension.Unit?,
+        newTextAttrChanged: InverseBindingListener
+    ) {
         pAppCompatSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
+            override fun onItemSelected(
+                parent: AdapterView<*>,
+                view: View,
+                position: Int,
+                id: Long
+            ) {
                 newTextAttrChanged.onChange()
             }
 
diff --git a/app/src/main/java/de/dreier/mytargets/utils/multiselector/ExpandableHeaderBindingHolder.kt b/app/src/main/java/de/dreier/mytargets/utils/multiselector/ExpandableHeaderBindingHolder.kt
index b7b402008..0bf2d0295 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/multiselector/ExpandableHeaderBindingHolder.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/multiselector/ExpandableHeaderBindingHolder.kt
@@ -26,8 +26,8 @@ import android.view.animation.AccelerateDecelerateInterpolator
  * @param expand_collapse Expand/Collapse ImageView's resource id
  */
 abstract class ExpandableHeaderBindingHolder<T>(
-        itemView: View,
-        @IdRes expand_collapse: Int
+    itemView: View,
+    @IdRes expand_collapse: Int
 ) : HeaderBindingHolder<T>(itemView) {
 
     private var expandCollapseView: View
@@ -43,9 +43,9 @@ abstract class ExpandableHeaderBindingHolder<T>(
         if (expandListener != null) {
             expandListener!!.onClick(v)
             expandCollapseView.animate()
-                    .rotation(if (expanded) 0f else 180f)
-                    .setInterpolator(AccelerateDecelerateInterpolator())
-                    .start()
+                .rotation(if (expanded) 0f else 180f)
+                .setInterpolator(AccelerateDecelerateInterpolator())
+                .start()
             expanded = !expanded
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/utils/multiselector/ItemBindingHolder.kt b/app/src/main/java/de/dreier/mytargets/utils/multiselector/ItemBindingHolder.kt
index 5c8bad112..9ed54e22a 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/multiselector/ItemBindingHolder.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/multiselector/ItemBindingHolder.kt
@@ -18,7 +18,9 @@ package de.dreier.mytargets.utils.multiselector
 import android.support.v7.widget.RebindReportingHolder
 import android.view.View
 
-abstract class ItemBindingHolder<T> internal constructor(itemView: View) : RebindReportingHolder(itemView), SelectableHolder, View.OnClickListener, View.OnLongClickListener {
+abstract class ItemBindingHolder<T> internal constructor(itemView: View) :
+    RebindReportingHolder(itemView), SelectableHolder, View.OnClickListener,
+    View.OnLongClickListener {
     var item: T? = null
         protected set
 
diff --git a/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectableViewHolder.kt b/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectableViewHolder.kt
index 2d233123e..149812d72 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectableViewHolder.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/multiselector/SelectableViewHolder.kt
@@ -43,7 +43,8 @@ import android.view.View
  *
  * @see [https://github.com/kurtisnelson/](https://github.com/kurtisnelson/))
  */
-abstract class SelectableViewHolder<T> : ItemBindingHolder<T>, View.OnClickListener, View.OnLongClickListener {
+abstract class SelectableViewHolder<T> : ItemBindingHolder<T>, View.OnClickListener,
+    View.OnLongClickListener {
     private val selector: SelectorBase
     private var clickListener: OnItemClickListener<T>? = null
     private var longClickListener: OnItemLongClickListener<T>? = null
@@ -61,7 +62,9 @@ abstract class SelectableViewHolder<T> : ItemBindingHolder<T>, View.OnClickListe
      * @param itemView Item view for this ViewHolder
      * @param selector A selector set to bind this holder to
      */
-    constructor(itemView: View, selector: SingleSelector, listener: OnItemClickListener<T>) : super(itemView) {
+    constructor(itemView: View, selector: SingleSelector, listener: OnItemClickListener<T>) : super(
+        itemView
+    ) {
         this.selector = selector
         itemView.setOnClickListener(this)
         this.clickListener = listener
@@ -73,7 +76,12 @@ abstract class SelectableViewHolder<T> : ItemBindingHolder<T>, View.OnClickListe
      * @param itemView Item view for this ViewHolder
      * @param selector A selector set to bind this holder to
      */
-    constructor(itemView: View, selector: SingleSelector, listener: OnItemClickListener<T>, longClickListener: OnItemLongClickListener<T>) : super(itemView) {
+    constructor(
+        itemView: View,
+        selector: SingleSelector,
+        listener: OnItemClickListener<T>,
+        longClickListener: OnItemLongClickListener<T>
+    ) : super(itemView) {
         this.selector = selector
         itemView.isLongClickable = true
         itemView.setOnClickListener(this)
@@ -88,7 +96,12 @@ abstract class SelectableViewHolder<T> : ItemBindingHolder<T>, View.OnClickListe
      * @param itemView Item view for this ViewHolder
      * @param selector A selector set to bind this holder to
      */
-    constructor(itemView: View, selector: MultiSelector, clickListener: OnItemClickListener<T>, longClickListener: OnItemLongClickListener<T>) : super(itemView) {
+    constructor(
+        itemView: View,
+        selector: MultiSelector,
+        clickListener: OnItemClickListener<T>,
+        longClickListener: OnItemLongClickListener<T>
+    ) : super(itemView) {
         this.selector = selector
         itemView.isLongClickable = true
         itemView.setOnClickListener(this)
diff --git a/app/src/main/java/de/dreier/mytargets/utils/multiselector/WeakHolderTracker.kt b/app/src/main/java/de/dreier/mytargets/utils/multiselector/WeakHolderTracker.kt
index 11ed24959..b7bd714cb 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/multiselector/WeakHolderTracker.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/multiselector/WeakHolderTracker.kt
@@ -23,8 +23,8 @@ class WeakHolderTracker {
 
     val trackedHolders: List<SelectableHolder>
         get() = (0 until holdersById.size())
-                .map { holdersById.keyAt(it) }
-                .mapNotNull { getHolder(it) }
+            .map { holdersById.keyAt(it) }
+            .mapNotNull { getHolder(it) }
 
     /**
      * Returns the holder with a given id.
diff --git a/app/src/main/java/de/dreier/mytargets/utils/print/CustomPrintDocumentAdapter.kt b/app/src/main/java/de/dreier/mytargets/utils/print/CustomPrintDocumentAdapter.kt
index 873713fcc..7943233ab 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/print/CustomPrintDocumentAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/print/CustomPrintDocumentAdapter.kt
@@ -27,9 +27,16 @@ import android.support.annotation.RequiresApi
 import java.io.FileOutputStream
 
 @RequiresApi(api = Build.VERSION_CODES.KITKAT)
-class CustomPrintDocumentAdapter(private val pdfWriter: IPdfWriter, private val fileName: String) : PrintDocumentAdapter() {
+class CustomPrintDocumentAdapter(private val pdfWriter: IPdfWriter, private val fileName: String) :
+    PrintDocumentAdapter() {
 
-    override fun onLayout(oldAttributes: PrintAttributes, newAttributes: PrintAttributes, cancellationSignal: CancellationSignal, callback: PrintDocumentAdapter.LayoutResultCallback, extras: Bundle) {
+    override fun onLayout(
+        oldAttributes: PrintAttributes,
+        newAttributes: PrintAttributes,
+        cancellationSignal: CancellationSignal,
+        callback: PrintDocumentAdapter.LayoutResultCallback,
+        extras: Bundle
+    ) {
         if (cancellationSignal.isCanceled) {
             callback.onLayoutCancelled()
             return
@@ -40,14 +47,19 @@ class CustomPrintDocumentAdapter(private val pdfWriter: IPdfWriter, private val
         val pageCount = pdfWriter.layoutPages(resolution, mediaSize)
 
         val pdi = PrintDocumentInfo.Builder(fileName)
-                .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                .setPageCount(pageCount)
-                .build()
+            .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
+            .setPageCount(pageCount)
+            .build()
 
         callback.onLayoutFinished(pdi, true)
     }
 
-    override fun onWrite(pages: Array<PageRange>, destination: ParcelFileDescriptor, cancellationSignal: CancellationSignal, callback: PrintDocumentAdapter.WriteResultCallback) {
+    override fun onWrite(
+        pages: Array<PageRange>,
+        destination: ParcelFileDescriptor,
+        cancellationSignal: CancellationSignal,
+        callback: PrintDocumentAdapter.WriteResultCallback
+    ) {
         val outputStream = FileOutputStream(destination.fileDescriptor)
 
         try {
diff --git a/app/src/main/java/de/dreier/mytargets/utils/print/DrawableToPdfWriter.kt b/app/src/main/java/de/dreier/mytargets/utils/print/DrawableToPdfWriter.kt
index 00db896f6..de8d5cc9c 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/print/DrawableToPdfWriter.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/print/DrawableToPdfWriter.kt
@@ -45,15 +45,22 @@ class DrawableToPdfWriter(private val content: Drawable) : IPdfWriter {
      * MUST be called before [.writePdfDocument].
      */
     @SuppressLint("Range")
-    override fun layoutPages(resolution: PrintAttributes.Resolution, mediaSize: PrintAttributes.MediaSize): Int {
-        val fullPageRectF = RectF(0f, 0f,
-                mediaSize.widthMils * resolution.horizontalDpi / 1000f,
-                mediaSize.heightMils * resolution.verticalDpi / 1000f)
+    override fun layoutPages(
+        resolution: PrintAttributes.Resolution,
+        mediaSize: PrintAttributes.MediaSize
+    ): Int {
+        val fullPageRectF = RectF(
+            0f, 0f,
+            mediaSize.widthMils * resolution.horizontalDpi / 1000f,
+            mediaSize.heightMils * resolution.verticalDpi / 1000f
+        )
         fullPage = fullPageRectF.toClosestRect()
 
         val contentRectF = RectF(fullPageRectF)
-        contentRectF.inset(resolution.horizontalDpi * MARGIN_HORIZONTAL,
-                resolution.verticalDpi * MARGIN_VERTICAL)
+        contentRectF.inset(
+            resolution.horizontalDpi * MARGIN_HORIZONTAL,
+            resolution.verticalDpi * MARGIN_VERTICAL
+        )
 
         contentRect = RectUtils.fitRectWithin(Rect(0, 0, 1, 1), contentRectF.toClosestRect())
         return 1
diff --git a/app/src/main/java/de/dreier/mytargets/utils/print/IPdfWriter.kt b/app/src/main/java/de/dreier/mytargets/utils/print/IPdfWriter.kt
index c7fc9b3c2..b0f349ea2 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/print/IPdfWriter.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/print/IPdfWriter.kt
@@ -27,7 +27,10 @@ interface IPdfWriter {
      * MUST be called before [.writePdfDocument].
      */
     @SuppressLint("Range")
-    fun layoutPages(resolution: PrintAttributes.Resolution, mediaSize: PrintAttributes.MediaSize): Int
+    fun layoutPages(
+        resolution: PrintAttributes.Resolution,
+        mediaSize: PrintAttributes.MediaSize
+    ): Int
 
     /**
      * Writes the given pages as PDF to the output stream.
diff --git a/app/src/main/java/de/dreier/mytargets/utils/print/ViewToPdfWriter.kt b/app/src/main/java/de/dreier/mytargets/utils/print/ViewToPdfWriter.kt
index af5e94734..58836dbbb 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/print/ViewToPdfWriter.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/print/ViewToPdfWriter.kt
@@ -45,17 +45,26 @@ class ViewToPdfWriter(private val content: LinearLayout) : IPdfWriter {
      * MUST be called before [.writePdfDocument].
      */
     @SuppressLint("Range")
-    override fun layoutPages(resolution: PrintAttributes.Resolution, mediaSize: PrintAttributes.MediaSize): Int {
-        fullPage = RectF(0f, 0f,
-                mediaSize.widthMils * resolution.horizontalDpi / 1000f,
-                mediaSize.heightMils * resolution.verticalDpi / 1000f)
+    override fun layoutPages(
+        resolution: PrintAttributes.Resolution,
+        mediaSize: PrintAttributes.MediaSize
+    ): Int {
+        fullPage = RectF(
+            0f, 0f,
+            mediaSize.widthMils * resolution.horizontalDpi / 1000f,
+            mediaSize.heightMils * resolution.verticalDpi / 1000f
+        )
 
         contentRect = RectF(fullPage)
-        contentRect.inset(resolution.horizontalDpi * MARGIN_HORIZONTAL,
-                resolution.verticalDpi * MARGIN_VERTICAL)
-
-        content.measure(makeMeasureSpec(contentRect.width().toInt(), EXACTLY),
-                makeMeasureSpec(contentRect.height().toInt(), View.MeasureSpec.UNSPECIFIED))
+        contentRect.inset(
+            resolution.horizontalDpi * MARGIN_HORIZONTAL,
+            resolution.verticalDpi * MARGIN_VERTICAL
+        )
+
+        content.measure(
+            makeMeasureSpec(contentRect.width().toInt(), EXACTLY),
+            makeMeasureSpec(contentRect.height().toInt(), View.MeasureSpec.UNSPECIFIED)
+        )
         content.layout(0, 0, contentRect.width().toInt(), contentRect.height().toInt())
 
         var sumHeight = 0
@@ -83,8 +92,10 @@ class ViewToPdfWriter(private val content: LinearLayout) : IPdfWriter {
         var topAnchor = 0
         var page: PdfDocument.Page? = null
         if (containsPage(pages, pageNumber)) {
-            val pageInfo = PdfDocument.PageInfo.Builder(fullPage
-                    .width().toInt(), fullPage.height().toInt(), pageNumber).create()
+            val pageInfo = PdfDocument.PageInfo.Builder(
+                fullPage
+                    .width().toInt(), fullPage.height().toInt(), pageNumber
+            ).create()
             page = document.startPage(pageInfo)
         }
 
@@ -102,8 +113,10 @@ class ViewToPdfWriter(private val content: LinearLayout) : IPdfWriter {
                 }
 
                 if (containsPage(pages, pageNumber)) {
-                    val pageInfo = PdfDocument.PageInfo.Builder(fullPage
-                            .width().toInt(), fullPage.height().toInt(), pageNumber).create()
+                    val pageInfo = PdfDocument.PageInfo.Builder(
+                        fullPage
+                            .width().toInt(), fullPage.height().toInt(), pageNumber
+                    ).create()
                     page = document.startPage(pageInfo)
                 }
             }
diff --git a/app/src/main/java/de/dreier/mytargets/utils/transitions/FabTransform.kt b/app/src/main/java/de/dreier/mytargets/utils/transitions/FabTransform.kt
index 915bb54dd..563eb3f3d 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/transitions/FabTransform.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/transitions/FabTransform.kt
@@ -51,8 +51,8 @@ import java.util.*
  */
 @RequiresApi(LOLLIPOP)
 class FabTransform private constructor(
-        @ColorInt private val color: Int,
-        @DrawableRes private val icon: Int
+    @ColorInt private val color: Int,
+    @DrawableRes private val icon: Int
 ) : Transition() {
 
     init {
@@ -72,9 +72,11 @@ class FabTransform private constructor(
         captureValues(transitionValues)
     }
 
-    override fun createAnimator(sceneRoot: ViewGroup,
-                                startValues: TransitionValues?,
-                                endValues: TransitionValues?): Animator? {
+    override fun createAnimator(
+        sceneRoot: ViewGroup,
+        startValues: TransitionValues?,
+        endValues: TransitionValues?
+    ): Animator? {
         if (startValues == null || endValues == null) {
             return null
         }
@@ -94,8 +96,9 @@ class FabTransform private constructor(
         if (!fromFab) {
             // Force measure / layout the dialog back to it's original bounds
             view.measure(
-                    makeMeasureSpec(startBounds.width(), View.MeasureSpec.EXACTLY),
-                    makeMeasureSpec(startBounds.height(), View.MeasureSpec.EXACTLY))
+                makeMeasureSpec(startBounds.width(), View.MeasureSpec.EXACTLY),
+                makeMeasureSpec(startBounds.height(), View.MeasureSpec.EXACTLY)
+            )
             view.layout(startBounds.left, startBounds.top, startBounds.right, startBounds.bottom)
         }
 
@@ -118,9 +121,11 @@ class FabTransform private constructor(
         val fabIcon = ContextCompat.getDrawable(sceneRoot.context, icon)!!.mutate()
         val iconLeft = (dialogBounds.width() - fabIcon.intrinsicWidth) / 2
         val iconTop = (dialogBounds.height() - fabIcon.intrinsicHeight) / 2
-        fabIcon.setBounds(iconLeft, iconTop,
-                iconLeft + fabIcon.intrinsicWidth,
-                iconTop + fabIcon.intrinsicHeight)
+        fabIcon.setBounds(
+            iconLeft, iconTop,
+            iconLeft + fabIcon.intrinsicWidth,
+            iconTop + fabIcon.intrinsicHeight
+        )
         if (!fromFab) {
             fabIcon.alpha = 0
         }
@@ -129,18 +134,28 @@ class FabTransform private constructor(
         // Circular clip from/to the FAB size
         val circularReveal: Animator
         if (fromFab) {
-            circularReveal = ViewAnimationUtils.createCircularReveal(view,
-                    view.width / 2,
-                    view.height / 2,
-                    (startBounds.width() / 2).toFloat(),
-                    Math.hypot((endBounds.width() / 2).toDouble(), (endBounds.height() / 2).toDouble()).toFloat())
+            circularReveal = ViewAnimationUtils.createCircularReveal(
+                view,
+                view.width / 2,
+                view.height / 2,
+                (startBounds.width() / 2).toFloat(),
+                Math.hypot(
+                    (endBounds.width() / 2).toDouble(),
+                    (endBounds.height() / 2).toDouble()
+                ).toFloat()
+            )
             circularReveal.interpolator = FastOutLinearInInterpolator()
         } else {
-            circularReveal = ViewAnimationUtils.createCircularReveal(view,
-                    view.width / 2,
-                    view.height / 2,
-                    Math.hypot((startBounds.width() / 2).toDouble(), (startBounds.height() / 2).toDouble()).toFloat(),
-                    (endBounds.width() / 2).toFloat())
+            circularReveal = ViewAnimationUtils.createCircularReveal(
+                view,
+                view.width / 2,
+                view.height / 2,
+                Math.hypot(
+                    (startBounds.width() / 2).toDouble(),
+                    (startBounds.height() / 2).toDouble()
+                ).toFloat(),
+                (endBounds.width() / 2).toFloat()
+            )
             circularReveal.interpolator = LinearOutSlowInInterpolator()
 
             // Persist the end clip i.e. stay at FAB size after the reveal has run
@@ -151,7 +166,8 @@ class FabTransform private constructor(
                             val left = (view.width - fabBounds.width()) / 2
                             val top = (view.height - fabBounds.height()) / 2
                             outline.setOval(
-                                    left, top, left + fabBounds.width(), top + fabBounds.height())
+                                left, top, left + fabBounds.width(), top + fabBounds.height()
+                            )
                             view.clipToOutline = true
                         }
                     }
@@ -162,13 +178,14 @@ class FabTransform private constructor(
 
         // Translate to end position along an arc
         val translate = ObjectAnimator.ofFloat(
-                view,
-                View.TRANSLATION_X,
-                View.TRANSLATION_Y,
-                if (fromFab)
-                    pathMotion.getPath(translationX.toFloat(), translationY.toFloat(), 0f, 0f)
-                else
-                    pathMotion.getPath(0f, 0f, (-translationX).toFloat(), (-translationY).toFloat()))
+            view,
+            View.TRANSLATION_X,
+            View.TRANSLATION_Y,
+            if (fromFab)
+                pathMotion.getPath(translationX.toFloat(), translationY.toFloat(), 0f, 0f)
+            else
+                pathMotion.getPath(0f, 0f, (-translationX).toFloat(), (-translationY).toFloat())
+        )
         translate.duration = duration
         translate.interpolator = fastOutSlowInInterpolator
 
@@ -234,8 +251,12 @@ class FabTransform private constructor(
             return
         }
 
-        transitionValues.values.put(PROP_BOUNDS, Rect(view.left, view.top,
-                view.right, view.bottom))
+        transitionValues.values.put(
+            PROP_BOUNDS, Rect(
+                view.left, view.top,
+                view.right, view.bottom
+            )
+        )
     }
 
     companion object {
@@ -248,8 +269,10 @@ class FabTransform private constructor(
         /**
          * Configure `intent` with the extras needed to initialize this transition.
          */
-        fun addExtras(intent: Intent, @ColorRes fabColor: Int,
-                      @DrawableRes fabIconResId: Int) {
+        fun addExtras(
+            intent: Intent, @ColorRes fabColor: Int,
+            @DrawableRes fabIconResId: Int
+        ) {
             intent.putExtra(EXTRA_FAB_COLOR_RES, fabColor)
             intent.putExtra(EXTRA_FAB_ICON_RES_ID, fabIconResId)
         }
diff --git a/app/src/main/java/de/dreier/mytargets/utils/transitions/GravityArcMotion.kt b/app/src/main/java/de/dreier/mytargets/utils/transitions/GravityArcMotion.kt
index 55191bd28..c01d865d4 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/transitions/GravityArcMotion.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/transitions/GravityArcMotion.kt
@@ -186,7 +186,8 @@ class GravityArcMotion : ArcMotion() {
 
     companion object {
         private const val DEFAULT_MAX_ANGLE_DEGREES = 70f
-        private val DEFAULT_MAX_TANGENT = Math.tan(Math.toRadians((DEFAULT_MAX_ANGLE_DEGREES / 2).toDouble())).toFloat()
+        private val DEFAULT_MAX_TANGENT =
+            Math.tan(Math.toRadians((DEFAULT_MAX_ANGLE_DEGREES / 2).toDouble())).toFloat()
 
         private fun toTangent(arcInDegrees: Float): Float {
             if (arcInDegrees < 0 || arcInDegrees > 90) {
diff --git a/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt b/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt
index 2d414eb2b..09b8b94ce 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt
@@ -127,7 +127,10 @@ class NoPauseAnimator(private val animator: Animator) : Animator() {
         animator.start()
     }
 
-    private class AnimatorListenerWrapper(private val mAnimator: Animator, private val mListener: Animator.AnimatorListener) : Animator.AnimatorListener {
+    private class AnimatorListenerWrapper(
+        private val mAnimator: Animator,
+        private val mListener: Animator.AnimatorListener
+    ) : Animator.AnimatorListener {
 
         override fun onAnimationStart(animator: Animator) {
             mListener.onAnimationStart(mAnimator)
diff --git a/app/src/main/java/de/dreier/mytargets/views/NumberPicker.kt b/app/src/main/java/de/dreier/mytargets/views/NumberPicker.kt
index 706d0c3ff..fa5c0831a 100644
--- a/app/src/main/java/de/dreier/mytargets/views/NumberPicker.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/NumberPicker.kt
@@ -35,7 +35,8 @@ import de.dreier.mytargets.databinding.LayoutNumberPickerBinding
  * @author Jeffrey F. Cole
  */
 
-class NumberPicker(context: Context, attributeSet: AttributeSet) : LinearLayout(context, attributeSet) {
+class NumberPicker(context: Context, attributeSet: AttributeSet) :
+    LinearLayout(context, attributeSet) {
 
     var minimum = 1
     var maximum = 30
diff --git a/app/src/main/java/de/dreier/mytargets/views/TextInputEditText.kt b/app/src/main/java/de/dreier/mytargets/views/TextInputEditText.kt
index b2fc65aba..ec09f6bed 100644
--- a/app/src/main/java/de/dreier/mytargets/views/TextInputEditText.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/TextInputEditText.kt
@@ -22,14 +22,17 @@ import android.util.AttributeSet
 import android.view.View
 
 
-
 class TextInputEditText : android.support.design.widget.TextInputEditText {
 
     constructor(context: Context) : super(context)
 
     constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
 
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    )
 
     // Workaround for https://issuetracker.google.com/issues/67675432
     @RequiresApi(Build.VERSION_CODES.O)
diff --git a/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDial.kt b/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDial.kt
index 907729c53..5bcc0ee59 100755
--- a/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDial.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDial.kt
@@ -94,13 +94,17 @@ class FabSpeedDial : LinearLayout, View.OnClickListener, CoordinatorLayout.Attac
         init(context, attrs)
     }
 
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    ) {
         init(context, attrs)
     }
 
     private fun init(context: Context, attrs: AttributeSet) {
         val typedArray = context.theme
-                .obtainStyledAttributes(attrs, R.styleable.FabSpeedDial, 0, 0)
+            .obtainStyledAttributes(attrs, R.styleable.FabSpeedDial, 0, 0)
         resolveCompulsoryAttributes(typedArray)
         resolveOptionalAttributes(typedArray)
         typedArray.recycle()
@@ -144,20 +148,20 @@ class FabSpeedDial : LinearLayout, View.OnClickListener, CoordinatorLayout.Attac
 
         if (typedArray.hasValue(R.styleable.FabSpeedDial_fabBackgroundTint)) {
             fabBackgroundTint = typedArray
-                    .getColorStateList(R.styleable.FabSpeedDial_fabBackgroundTint)
+                .getColorStateList(R.styleable.FabSpeedDial_fabBackgroundTint)
         }
 
         miniFabBackgroundTint = typedArray
-                .getColorStateList(R.styleable.FabSpeedDial_miniFabBackgroundTint)
+            .getColorStateList(R.styleable.FabSpeedDial_miniFabBackgroundTint)
         if (miniFabBackgroundTint == null) {
             miniFabBackgroundTint = getColorStateList(R.color.fab_background_tint)
         }
 
         if (typedArray.hasValue(R.styleable.FabSpeedDial_miniFabBackgroundTintList)) {
             val miniFabBackgroundTintListId = typedArray
-                    .getResourceId(R.styleable.FabSpeedDial_miniFabBackgroundTintList, 0)
+                .getResourceId(R.styleable.FabSpeedDial_miniFabBackgroundTintList, 0)
             val miniFabBackgroundTintRes = resources
-                    .obtainTypedArray(miniFabBackgroundTintListId)
+                .obtainTypedArray(miniFabBackgroundTintListId)
             miniFabBackgroundTintArray = IntArray(miniFabBackgroundTintRes.length())
             for (i in 0 until miniFabBackgroundTintRes.length()) {
                 miniFabBackgroundTintArray!![i] = miniFabBackgroundTintRes.getResourceId(i, 0)
@@ -166,29 +170,31 @@ class FabSpeedDial : LinearLayout, View.OnClickListener, CoordinatorLayout.Attac
         }
 
         miniFabDrawableTint = typedArray
-                .getColorStateList(R.styleable.FabSpeedDial_miniFabDrawableTint)
+            .getColorStateList(R.styleable.FabSpeedDial_miniFabDrawableTint)
         if (miniFabDrawableTint == null) {
             miniFabDrawableTint = getColorStateList(R.color.mini_fab_drawable_tint)
         }
 
         miniFabTitleBackgroundTint = typedArray
-                .getColorStateList(R.styleable.FabSpeedDial_miniFabTitleBackgroundTint)
+            .getColorStateList(R.styleable.FabSpeedDial_miniFabTitleBackgroundTint)
         if (miniFabTitleBackgroundTint == null) {
             miniFabTitleBackgroundTint = getColorStateList(R.color.mini_fab_title_background_tint)
         }
 
         miniFabTitlesEnabled = typedArray
-                .getBoolean(R.styleable.FabSpeedDial_miniFabTitlesEnabled, true)
+            .getBoolean(R.styleable.FabSpeedDial_miniFabTitlesEnabled, true)
 
 
-        miniFabTitleTextColor = typedArray.getColor(R.styleable.FabSpeedDial_miniFabTitleTextColor,
-                ContextCompat.getColor(context, R.color.title_text_color))
+        miniFabTitleTextColor = typedArray.getColor(
+            R.styleable.FabSpeedDial_miniFabTitleTextColor,
+            ContextCompat.getColor(context, R.color.title_text_color)
+        )
 
         if (typedArray.hasValue(R.styleable.FabSpeedDial_miniFabTitleTextColorList)) {
             val miniFabTitleTextColorListId = typedArray
-                    .getResourceId(R.styleable.FabSpeedDial_miniFabTitleTextColorList, 0)
+                .getResourceId(R.styleable.FabSpeedDial_miniFabTitleTextColorList, 0)
             val miniFabTitleTextColorTa = resources
-                    .obtainTypedArray(miniFabTitleTextColorListId)
+                .obtainTypedArray(miniFabTitleTextColorListId)
             miniFabTitleTextColorArray = IntArray(miniFabTitleTextColorTa.length())
             for (i in 0 until miniFabTitleTextColorTa.length()) {
                 miniFabTitleTextColorArray!![i] = miniFabTitleTextColorTa.getResourceId(i, 0)
@@ -204,9 +210,12 @@ class FabSpeedDial : LinearLayout, View.OnClickListener, CoordinatorLayout.Attac
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
 
-        val layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        val layoutParams = LinearLayout.LayoutParams(
+            ViewGroup.LayoutParams.WRAP_CONTENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT
+        )
         val coordinatorLayoutOffset = resources
-                .getDimensionPixelSize(R.dimen.coordinator_layout_offset)
+            .getDimensionPixelSize(R.dimen.coordinator_layout_offset)
         layoutParams.setMargins(0, 0, coordinatorLayoutOffset, 0)
         menuItemsLayout!!.layoutParams = layoutParams
 
@@ -254,9 +263,13 @@ class FabSpeedDial : LinearLayout, View.OnClickListener, CoordinatorLayout.Attac
                 parent.addView(touchGuard)
                 bringToFront()
             } else if (parent is RelativeLayout) {
-                parent.addView(touchGuard,
-                        RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                                ViewGroup.LayoutParams.MATCH_PARENT))
+                parent.addView(
+                    touchGuard,
+                    RelativeLayout.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.MATCH_PARENT
+                    )
+                )
                 bringToFront()
             } else {
                 Timber.d("touchGuard requires that the parent of this FabSpeedDialer be a FrameLayout or RelativeLayout")
@@ -272,9 +285,9 @@ class FabSpeedDial : LinearLayout, View.OnClickListener, CoordinatorLayout.Attac
 
     fun getFabFromMenuId(@IdRes id: Int): FloatingActionButton {
         return fabMenuItemMap!!.entries
-                .filter { entry -> entry.value.itemId == id }
-                .map { it.key }
-                .first()
+            .filter { entry -> entry.value.itemId == id }
+            .map { it.key }
+            .first()
     }
 
     private fun newNavigationMenu() {
@@ -403,7 +416,7 @@ class FabSpeedDial : LinearLayout, View.OnClickListener, CoordinatorLayout.Attac
 
     private fun createFabMenuItem(menuItem: MenuItem): View {
         val fabMenuItem = LayoutInflater.from(context)
-                .inflate(R.layout.fab_menu_item_end, this, false) as ViewGroup
+            .inflate(R.layout.fab_menu_item_end, this, false) as ViewGroup
 
         val miniFab = fabMenuItem.findViewById<FloatingActionButton>(R.id.mini_fab)
         val cardView = fabMenuItem.findViewById<CardView>(R.id.card_view)
@@ -427,8 +440,12 @@ class FabSpeedDial : LinearLayout, View.OnClickListener, CoordinatorLayout.Attac
             titleView.setTextColor(miniFabTitleTextColor)
 
             if (miniFabTitleTextColorArray != null) {
-                titleView.setTextColor(ContextCompat.getColorStateList(context,
-                        miniFabTitleTextColorArray!![menuItem.order]))
+                titleView.setTextColor(
+                    ContextCompat.getColorStateList(
+                        context,
+                        miniFabTitleTextColorArray!![menuItem.order]
+                    )
+                )
             }
         } else {
             fabMenuItem.removeView(cardView)
@@ -437,8 +454,10 @@ class FabSpeedDial : LinearLayout, View.OnClickListener, CoordinatorLayout.Attac
         miniFab.backgroundTintList = miniFabBackgroundTint
 
         if (miniFabBackgroundTintArray != null) {
-            miniFab.backgroundTintList = ContextCompat.getColorStateList(context,
-                    miniFabBackgroundTintArray!![menuItem.order])
+            miniFab.backgroundTintList = ContextCompat.getColorStateList(
+                context,
+                miniFabBackgroundTintArray!![menuItem.order]
+            )
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -454,22 +473,22 @@ class FabSpeedDial : LinearLayout, View.OnClickListener, CoordinatorLayout.Attac
         }
 
         ViewCompat.animate(menuItemsLayout)
-                .setDuration(resources.getInteger(android.R.integer.config_shortAnimTime).toLong())
-                .alpha(0f)
-                .setInterpolator(FastOutLinearInInterpolator())
-                .setListener(object : ViewPropertyAnimatorListenerAdapter() {
-                    override fun onAnimationStart(view: View?) {
-                        super.onAnimationStart(view)
-                        isAnimating = true
-                    }
-
-                    override fun onAnimationEnd(view: View?) {
-                        super.onAnimationEnd(view)
-                        menuItemsLayout!!.removeAllViews()
-                        isAnimating = false
-                    }
-                })
-                .start()
+            .setDuration(resources.getInteger(android.R.integer.config_shortAnimTime).toLong())
+            .alpha(0f)
+            .setInterpolator(FastOutLinearInInterpolator())
+            .setListener(object : ViewPropertyAnimatorListenerAdapter() {
+                override fun onAnimationStart(view: View?) {
+                    super.onAnimationStart(view)
+                    isAnimating = true
+                }
+
+                override fun onAnimationEnd(view: View?) {
+                    super.onAnimationEnd(view)
+                    menuItemsLayout!!.removeAllViews()
+                    isAnimating = false
+                }
+            })
+            .start()
     }
 
     private fun animateFabMenuItemsIn() {
@@ -497,32 +516,33 @@ class FabSpeedDial : LinearLayout, View.OnClickListener, CoordinatorLayout.Attac
         view.y = view.y + offsetY
 
         ViewCompat.animate(view)
-                .setDuration(resources.getInteger(android.R.integer.config_shortAnimTime).toLong())
-                .scaleX(1f)
-                .scaleY(1f)
-                .translationYBy(-offsetY)
-                .alpha(1f)
-                .setStartDelay((4 * position * VSYNC_RHYTHM).toLong())
-                .setInterpolator(FastOutSlowInInterpolator())
-                .setListener(object : ViewPropertyAnimatorListenerAdapter() {
-                    override fun onAnimationStart(view: View?) {
-                        super.onAnimationStart(view)
-                        isAnimating = true
-                    }
-
-                    override fun onAnimationEnd(view: View?) {
-                        super.onAnimationEnd(view)
-                        isAnimating = false
-                    }
-                })
-                .start()
+            .setDuration(resources.getInteger(android.R.integer.config_shortAnimTime).toLong())
+            .scaleX(1f)
+            .scaleY(1f)
+            .translationYBy(-offsetY)
+            .alpha(1f)
+            .setStartDelay((4 * position * VSYNC_RHYTHM).toLong())
+            .setInterpolator(FastOutSlowInInterpolator())
+            .setListener(object : ViewPropertyAnimatorListenerAdapter() {
+                override fun onAnimationStart(view: View?) {
+                    super.onAnimationStart(view)
+                    isAnimating = true
+                }
+
+                override fun onAnimationEnd(view: View?) {
+                    super.onAnimationEnd(view)
+                    isAnimating = false
+                }
+            })
+            .start()
     }
 
     private fun getColorStateList(colorRes: Int): ColorStateList {
-        val states = arrayOf(intArrayOf(android.R.attr.state_enabled), // enabled
-                intArrayOf(-android.R.attr.state_enabled), // disabled
-                intArrayOf(-android.R.attr.state_checked), // unchecked
-                intArrayOf(android.R.attr.state_pressed)  // pressed
+        val states = arrayOf(
+            intArrayOf(android.R.attr.state_enabled), // enabled
+            intArrayOf(-android.R.attr.state_enabled), // disabled
+            intArrayOf(-android.R.attr.state_checked), // unchecked
+            intArrayOf(android.R.attr.state_pressed)  // pressed
         )
 
         val color = ContextCompat.getColor(context, colorRes)
@@ -533,9 +553,10 @@ class FabSpeedDial : LinearLayout, View.OnClickListener, CoordinatorLayout.Attac
 
     override fun dispatchKeyEventPreIme(event: KeyEvent): Boolean {
         if (isMenuOpen
-                && event.keyCode == KeyEvent.KEYCODE_BACK
-                && event.action == KeyEvent.ACTION_UP
-                && event.repeatCount == 0) {
+            && event.keyCode == KeyEvent.KEYCODE_BACK
+            && event.action == KeyEvent.ACTION_UP
+            && event.repeatCount == 0
+        ) {
             closeMenu()
             return true
         }
diff --git a/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt b/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt
index 2121f1075..bd1bf34da 100755
--- a/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt
+++ b/app/src/main/java/de/dreier/mytargets/views/speeddial/FabSpeedDialBehaviour.kt
@@ -81,8 +81,8 @@ object FabSpeedDialBehaviour : CoordinatorLayout.Behavior<FabSpeedDial>() {
 
         if (Math.abs(currentTransY - targetTransY) > fab.height * 0.667f) {
             fabTranslationYAnimator = fab.animate()
-                    .setInterpolator(FAST_OUT_SLOW_IN_INTERPOLATOR)
-                    .translationY(targetTransY)
+                .setInterpolator(FAST_OUT_SLOW_IN_INTERPOLATOR)
+                .translationY(targetTransY)
             fabTranslationYAnimator!!.start()
         } else {
             fab.translationY = targetTransY
@@ -97,8 +97,10 @@ object FabSpeedDialBehaviour : CoordinatorLayout.Behavior<FabSpeedDial>() {
         for (i in dependencies.indices) {
             val view = dependencies[i]
             if (view is Snackbar.SnackbarLayout && parent.doViewsOverlap(fab, view)) {
-                minOffset = Math.min(minOffset,
-                        view.getTranslationY() - view.getHeight())
+                minOffset = Math.min(
+                    minOffset,
+                    view.getTranslationY() - view.getHeight()
+                )
             }
         }
         return minOffset

From fa5496e970b5d9a18e055fe62da086cdb7535441 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Tue, 19 Jun 2018 22:06:06 +0200
Subject: [PATCH 087/102] Fixed build

---
 Screengrabfile                                |   4 +-
 app/build.gradle                              |   1 +
 .../mytargets/screengrab/ScreenshotTest.java  | 105 -----------------
 .../mytargets/screengrab/ScreenshotTest.kt    | 105 +++++++++++++++++
 .../mytargets/features/bows/BowAdapter.kt     |   3 +-
 .../features/scoreboard/ScoreboardFragment.kt |   3 +-
 .../settings/SharedPreferencesUtils.kt        |   2 +-
 .../features/settings/about/AboutFragment.kt  |   3 +-
 .../backup/synchronization/SyncUtils.kt       |   2 +-
 .../statistics/DispersionPatternActivity.kt   |   2 +-
 .../training/environment/Connectivity.kt      |   2 +-
 .../features/training/environment/Locator.kt  |   2 +-
 .../java/de/dreier/mytargets/utils/Utils.kt   |   2 +-
 build.gradle                                  |   2 +-
 dependencies.gradle                           |   4 +-
 make_screenshots.sh                           | 111 ++++++++++--------
 16 files changed, 181 insertions(+), 172 deletions(-)
 delete mode 100644 app/src/androidTestScreengrab/java/de/dreier/mytargets/screengrab/ScreenshotTest.java
 create mode 100644 app/src/androidTestScreengrab/java/de/dreier/mytargets/screengrab/ScreenshotTest.kt

diff --git a/Screengrabfile b/Screengrabfile
index c778328ad..5fed7bb0a 100644
--- a/Screengrabfile
+++ b/Screengrabfile
@@ -3,8 +3,8 @@ use_tests_in_packages ['de.dreier.mytargets.screengrab']
 
 output_directory 'build/screengrab'
 
-app_apk_path 'app/build/outputs/apk/app-screengrab-debug.apk'
-tests_apk_path 'app/build/outputs/apk/app-screengrab-debug-androidTest.apk'
+app_apk_path 'app/build/outputs/apk/screengrab/debug/app-screengrab-debug.apk'
+tests_apk_path 'app/build/outputs/apk/androidTest/screengrab/debug/app-screengrab-debug-androidTest.apk'
 
 locales ['ca-ES', 'cs-CZ', 'da-DK', 'de-DE', 'en-US', 'es-ES', 'fr-FR', 'hu-HU', 'id-ID', 'it-IT', 'iw-IL', 'ja-JP', 'nl-NL', 'no-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sk-SK', 'sl-SI', 'sv-SE', 'tr-TR', 'zh-CN', 'zh-TW']
 
diff --git a/app/build.gradle b/app/build.gradle
index d52caf6d5..4928119e2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -102,6 +102,7 @@ android {
         }
         screengrab {
             dimension "mode"
+            multiDexEnabled true
         }
     }
 }
diff --git a/app/src/androidTestScreengrab/java/de/dreier/mytargets/screengrab/ScreenshotTest.java b/app/src/androidTestScreengrab/java/de/dreier/mytargets/screengrab/ScreenshotTest.java
deleted file mode 100644
index 196cb2e9a..000000000
--- a/app/src/androidTestScreengrab/java/de/dreier/mytargets/screengrab/ScreenshotTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package de.dreier.mytargets.screengrab;
-
-import android.os.SystemClock;
-import android.support.test.espresso.contrib.RecyclerViewActions;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.hamcrest.Matchers;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TestRule;
-import org.junit.runner.RunWith;
-
-import de.dreier.mytargets.R;
-import de.dreier.mytargets.features.main.MainActivity;
-import de.dreier.mytargets.features.settings.SettingsManager;
-import de.dreier.mytargets.shared.models.Dimension;
-import de.dreier.mytargets.shared.models.Target;
-import de.dreier.mytargets.shared.targets.models.WAFull;
-import de.dreier.mytargets.test.base.UITestBase;
-import de.dreier.mytargets.test.utils.rules.SimpleDbTestRule;
-import tools.fastlane.screengrab.Screengrab;
-import tools.fastlane.screengrab.UiAutomatorScreenshotStrategy;
-import tools.fastlane.screengrab.locale.LocaleTestRule;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.Espresso.pressBack;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.isRoot;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withParent;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static de.dreier.mytargets.test.utils.actions.TargetViewActions.clickTarget;
-import static de.dreier.mytargets.test.utils.actions.TargetViewActions.holdTapTarget;
-import static de.dreier.mytargets.test.utils.actions.TargetViewActions.releaseTapTarget;
-import static de.dreier.mytargets.test.utils.matchers.ViewMatcher.matchFabMenu;
-import static org.hamcrest.core.AllOf.allOf;
-
-@SdkSuppress(minSdkVersion = 18)
-@LargeTest
-@RunWith(AndroidJUnit4.class)
-public class ScreenshotTest extends UITestBase {
-    @ClassRule
-    public static final TestRule classRule = new LocaleTestRule();
-
-    private ActivityTestRule activityTestRule = new ActivityTestRule<>(MainActivity.class);
-
-    @Rule
-    public final RuleChain rule = RuleChain.outerRule(new SimpleDbTestRule())
-            .around(activityTestRule);
-
-    @Before
-    public void setUp() {
-        Screengrab.setDefaultScreenshotStrategy(new UiAutomatorScreenshotStrategy());
-        SettingsManager.INSTANCE.setArrowNumbersEnabled(false);
-        SettingsManager.INSTANCE.setShotsPerEnd(6);
-        SettingsManager.INSTANCE.setTarget(new Target(WAFull.ID, 2,
-                new Dimension(60, Dimension.Unit.CENTIMETER)));
-        SettingsManager.INSTANCE.setTimerEnabled(true);
-    }
-
-    @Test
-    public void takeScreenshots() {
-        onView(Matchers.allOf(withId(R.id.recyclerView), isDisplayed())).perform(
-                RecyclerViewActions.actionOnItemAtPosition(2, click()));
-        Screengrab.screenshot("3_trainings_overview");
-        onView(withText(R.string.bow)).perform(click());
-        onView(withText("PSE Fever")).perform(click());
-        Screengrab.screenshot("7_bow");
-        navigateUp();
-        onView(allOf(withText(R.string.training),
-                withParent(withParent(withParent(withId(R.id.slidingTabs)))))).perform(click());
-        onView(withText("631/720")).perform(click());
-        Screengrab.screenshot("4_training_overview");
-        clickActionBarItem(R.id.action_scoreboard, R.string.scoreboard);
-        Screengrab.screenshot("5_scoreboard");
-        navigateUp();
-        clickActionBarItem(R.id.action_statistics, R.string.statistic);
-        SystemClock.sleep(100);
-        Screengrab.screenshot("6_statistics");
-        navigateUp();
-        navigateUp();
-        onView(matchFabMenu()).perform(click());
-        onView(withId(R.id.fab1)).perform(click());
-        Screengrab.screenshot("2_enter_training");
-        save();
-        onView(isRoot()).perform(click());
-        onView(isRoot()).perform(click());
-        Screengrab.screenshot("8_timer");
-        pressBack();
-        onView(withId(R.id.targetViewContainer)).perform(
-                clickTarget(0.1f, 0.05f),
-                clickTarget(-0.15f, 0.3f),
-                clickTarget(-0.24f, -0.06f),
-                holdTapTarget(0.0f, 0.0f));
-        Screengrab.screenshot("1_enter_end");
-        onView(withId(R.id.targetViewContainer)).perform(releaseTapTarget(0.0f, 0.0f));
-    }
-}
diff --git a/app/src/androidTestScreengrab/java/de/dreier/mytargets/screengrab/ScreenshotTest.kt b/app/src/androidTestScreengrab/java/de/dreier/mytargets/screengrab/ScreenshotTest.kt
new file mode 100644
index 000000000..4dd1a98fc
--- /dev/null
+++ b/app/src/androidTestScreengrab/java/de/dreier/mytargets/screengrab/ScreenshotTest.kt
@@ -0,0 +1,105 @@
+package de.dreier.mytargets.screengrab
+
+import android.os.SystemClock
+import android.support.test.espresso.Espresso.onView
+import android.support.test.espresso.Espresso.pressBack
+import android.support.test.espresso.action.ViewActions.click
+import android.support.test.espresso.contrib.RecyclerViewActions
+import android.support.test.espresso.matcher.ViewMatchers.*
+import android.support.test.filters.LargeTest
+import android.support.test.filters.SdkSuppress
+import android.support.test.rule.ActivityTestRule
+import android.support.test.runner.AndroidJUnit4
+import android.support.v7.widget.RecyclerView
+import android.view.View
+import de.dreier.mytargets.R
+import de.dreier.mytargets.features.main.MainActivity
+import de.dreier.mytargets.features.settings.SettingsManager
+import de.dreier.mytargets.shared.models.Dimension
+import de.dreier.mytargets.shared.models.Target
+import de.dreier.mytargets.shared.targets.models.WAFull
+import de.dreier.mytargets.test.base.UITestBase
+import de.dreier.mytargets.test.utils.actions.TargetViewActions
+import de.dreier.mytargets.test.utils.matchers.ViewMatcher
+import de.dreier.mytargets.test.utils.rules.SimpleDbTestRule
+import org.hamcrest.Matchers
+import org.junit.Before
+import org.junit.ClassRule
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.rules.TestRule
+import org.junit.runner.RunWith
+import tools.fastlane.screengrab.Screengrab
+import tools.fastlane.screengrab.UiAutomatorScreenshotStrategy
+import tools.fastlane.screengrab.locale.LocaleTestRule
+
+@SdkSuppress(minSdkVersion = 18)
+@LargeTest
+@RunWith(AndroidJUnit4::class)
+class ScreenshotTest : UITestBase() {
+
+    private val activityTestRule = ActivityTestRule(MainActivity::class.java)
+
+    @Rule
+    @JvmField
+    val rule = RuleChain.outerRule(SimpleDbTestRule()).around(activityTestRule)
+
+    @Before
+    fun setUp() {
+        Screengrab.setDefaultScreenshotStrategy(UiAutomatorScreenshotStrategy())
+        SettingsManager.arrowNumbersEnabled = false
+        SettingsManager.shotsPerEnd = 6
+        SettingsManager.target = Target(
+            WAFull.ID, 2,
+            Dimension(60f, Dimension.Unit.CENTIMETER)
+        )
+        SettingsManager.timerEnabled = true
+    }
+
+    @Test
+    fun takeScreenshots() {
+        onView(Matchers.allOf<View>(withId(R.id.recyclerView), isDisplayed())).perform(
+            RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(2, click())
+        )
+        Screengrab.screenshot("3_trainings_overview")
+        onView(withId(R.id.action_bows)).perform(click())
+        onView(withText("PSE Fever")).perform(click())
+        Screengrab.screenshot("7_bow")
+        navigateUp()
+        onView(withId(R.id.action_trainings)).perform(click())
+        onView(withText("631/720")).perform(click())
+        Screengrab.screenshot("4_training_overview")
+        clickActionBarItem(R.id.action_scoreboard, R.string.scoreboard)
+        Screengrab.screenshot("5_scoreboard")
+        navigateUp()
+        clickActionBarItem(R.id.action_statistics, R.string.statistic)
+        SystemClock.sleep(100)
+        Screengrab.screenshot("6_statistics")
+        navigateUp()
+        navigateUp()
+        onView(ViewMatcher.supportFab()).perform(click())
+        onView(withId(R.id.fab1)).perform(click())
+        Screengrab.screenshot("2_enter_training")
+        save()
+        onView(isRoot()).perform(click())
+        onView(isRoot()).perform(click())
+        Screengrab.screenshot("8_timer")
+        pressBack()
+        onView(withId(R.id.targetViewContainer)).perform(
+            TargetViewActions.clickTarget(0.1f, 0.05f),
+            TargetViewActions.clickTarget(-0.15f, 0.3f),
+            TargetViewActions.clickTarget(-0.24f, -0.06f),
+            TargetViewActions.holdTapTarget(0.0f, 0.0f)
+        )
+        Screengrab.screenshot("1_enter_end")
+        onView(withId(R.id.targetViewContainer))
+            .perform(TargetViewActions.releaseTapTarget(0.0f, 0.0f))
+    }
+
+    companion object {
+        @ClassRule
+        @JvmField
+        public val classRule: TestRule = LocaleTestRule()
+    }
+}
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
index 722fe4dff..d2ab8f950 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
@@ -24,7 +24,6 @@ import de.dreier.mytargets.base.adapters.SimpleListAdapterBase
 import de.dreier.mytargets.databinding.ItemImageDetailsBinding
 import de.dreier.mytargets.features.training.details.SpannedInfoBuilder
 import de.dreier.mytargets.shared.models.db.Bow
-import de.dreier.mytargets.utils.Utils
 import de.dreier.mytargets.utils.multiselector.MultiSelector
 import de.dreier.mytargets.utils.multiselector.OnItemClickListener
 import de.dreier.mytargets.utils.multiselector.OnItemLongClickListener
@@ -66,7 +65,7 @@ internal class BowAdapter(
             for ((_, _, distance, value) in sightMarks) {
                 info.addLine(distance.toString(), value!!)
             }
-            binding.details.text = Utils.fromHtml(info.toString())
+            binding.details.text = info.toSpanned()
         }
     }
 }
diff --git a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
index e73bbcea3..16805eb6d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/scoreboard/ScoreboardFragment.kt
@@ -16,7 +16,6 @@
 package de.dreier.mytargets.features.scoreboard
 
 import android.annotation.SuppressLint
-import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.net.Uri
@@ -36,7 +35,7 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.LinearLayout
-import androidx.content.systemService
+import androidx.core.content.systemService
 import de.dreier.mytargets.R
 import de.dreier.mytargets.app.ApplicationInstance
 import de.dreier.mytargets.base.db.RoundRepository
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/SharedPreferencesUtils.kt b/app/src/main/java/de/dreier/mytargets/features/settings/SharedPreferencesUtils.kt
index 7cf06c20b..204f67955 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/SharedPreferencesUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/SharedPreferencesUtils.kt
@@ -15,7 +15,7 @@
 package de.dreier.mytargets.features.settings
 
 import android.content.SharedPreferences
-import androidx.content.edit
+import androidx.core.content.edit
 
 operator fun SharedPreferences.set(key: String, value: Any?) {
     when (value) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt b/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt
index bdea048f1..f8a3d8621 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/about/AboutFragment.kt
@@ -16,14 +16,13 @@
 package de.dreier.mytargets.features.settings.about
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.support.annotation.StringRes
 import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.net.toUri
+import androidx.core.net.toUri
 import de.dreier.mytargets.BuildConfig
 import de.dreier.mytargets.R
 import mehdi.sakout.aboutpage.AboutPage
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt
index 38dd73660..ccda0c214 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/backup/synchronization/SyncUtils.kt
@@ -19,7 +19,7 @@ import android.accounts.AccountManager
 import android.content.ContentResolver
 import android.content.Context
 import android.os.Bundle
-import androidx.content.systemService
+import androidx.core.content.systemService
 import de.dreier.mytargets.BuildConfig
 import de.dreier.mytargets.features.settings.SettingsManager
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
index eb8ef6a99..72d6bb0bb 100644
--- a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt
@@ -26,7 +26,7 @@ import android.support.annotation.RequiresApi
 import android.support.design.widget.Snackbar
 import android.view.Menu
 import android.view.MenuItem
-import androidx.content.systemService
+import androidx.core.content.systemService
 import de.dreier.mytargets.R
 import de.dreier.mytargets.base.activities.ChildActivityBase
 import de.dreier.mytargets.databinding.ActivityArrowRankingDetailsBinding
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt
index d07b51e54..6b8988474 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/Connectivity.kt
@@ -18,7 +18,7 @@ package de.dreier.mytargets.features.training.environment
 import android.content.Context
 import android.net.ConnectivityManager
 import android.net.NetworkInfo
-import androidx.content.systemService
+import androidx.core.content.systemService
 
 internal object Connectivity {
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt b/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt
index 2d07e9111..6f5d7a25b 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/environment/Locator.kt
@@ -24,7 +24,7 @@ import android.location.LocationListener
 import android.location.LocationManager
 import android.os.Bundle
 import android.support.annotation.RequiresPermission
-import androidx.content.systemService
+import androidx.core.content.systemService
 import timber.log.Timber
 
 /**
diff --git a/app/src/main/java/de/dreier/mytargets/utils/Utils.kt b/app/src/main/java/de/dreier/mytargets/utils/Utils.kt
index e5372b020..a4a4e7745 100644
--- a/app/src/main/java/de/dreier/mytargets/utils/Utils.kt
+++ b/app/src/main/java/de/dreier/mytargets/utils/Utils.kt
@@ -31,7 +31,7 @@ import android.text.Html
 import android.text.Spanned
 import android.view.View
 import android.view.WindowManager
-import androidx.content.systemService
+import androidx.core.content.systemService
 import androidx.core.content.systemService
 import de.dreier.mytargets.features.main.MainActivity
 import de.dreier.mytargets.features.training.overview.Header
diff --git a/build.gradle b/build.gradle
index 518b6ea03..b81d956d1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:$androidPluginVersion"
+        classpath 'com.android.tools.build:gradle:3.1.3'
         classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
         classpath 'com.google.gms:google-services:3.2.1'
diff --git a/dependencies.gradle b/dependencies.gradle
index 9c89732eb..52ad1d776 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -43,11 +43,11 @@ ext {
             photoView                 : '2.1.3',
             picasso                   : '2.5.2',
             playService               : '15.0.0',
-            screengrab                : '1.2.0',
             retrofit                  : '2.4.0',
             roundedImageView          : '2.3.0',
+            screengrab                : '1.2.0',
             signaturePad              : '1.2.1',
-            support                   : '27.1.0',
+            support                   : '27.1.1',
             supportWearable           : '2.2.0',
             testSupport               : '1.0.2',
             threeTenABP               : '1.1.0',
diff --git a/make_screenshots.sh b/make_screenshots.sh
index 3d95139f3..605108d4f 100755
--- a/make_screenshots.sh
+++ b/make_screenshots.sh
@@ -1,63 +1,74 @@
 #!/bin/bash
-#sudo gem install fastlane
-#sudo gem install screengrab
 
-#echo no | android create avd -f -n "Nexus_5_API_23_x86" -t android-23 --abi armeabi-v7a -s 1080x1920
-#echo no | android create avd -f -n "Nexus_7_API_23" -t android-23 --abi armeabi-v7a -s 1200x1920
-#echo no | android create avd -f -n "Nexus_10_API_23" -t android-23 --abi armeabi-v7a -s 2560x1600
+# Configuration
+ABI="google_apis/x86"
+IMAGE="system-images;android-28;google_apis;x86"
 
-# Workaround for https://code.google.com/p/android/issues/detail?id=235461
-function emulator { cd "$(dirname "$(which emulator)")" && ./emulator "$@"; }
+# Names of AVD images for phone, 7-inch, 10-inch devices
+AVD_IMAGES=( "Pixel_API_28" "Nexus_7_API_28" "Pixel_C_API_28" )
+DEVICE_TYPES=( "phone" "sevenInch" "tenInch" )
+DEVICE_DEFINITIONS=( "pixel" "Nexus 7 2013" "pixel_c" )
 
-# Disable emulator authentication
-touch '~/.emulator_console_auth_token'
-echo '' > '~/.emulator_console_auth_token'
+# Install prerequisites
+sudo gem install fastlane
+sudo gem install screengrab
+sdkmanager "emulator" "system-images;android-28;google_apis;x86"
 
-# Names of AVD images for phone, 7-inch, 10-inch devices
-avd_images=( "Nexus_5_API_23_x86" "Nexus_7_API_23" "Nexus_10_API_23" )
-device_types=( "phone" "sevenInch" "tenInch" )
+# Compile app
+./gradlew assembleScreengrabDebug assembleScreengrabDebugAndroidTest
+
+# <android sdk>/tools/bin must be on the PATH
+for i in "${!AVD_IMAGES[@]}"
+do
+	echo no | avdmanager create avd -f -n ${AVD_IMAGES[$i]} -b $ABI -k $IMAGE -d ${DEVICE_DEFINITIONS[$i]}
+done
+
+# Disable emulator authentication
+touch "~/.emulator_console_auth_token"
+echo "" > "~/.emulator_console_auth_token"
+export DYLD_LIBRARY_PATH="$ANDROID_HOME/emulator/lib64:$ANDROID_HOME/emulator/lib64/qt/lib:$DYLD_LIBRARY_PATH"
 
 echo Killing all emulators first!
 { echo "kill"; echo "exit"; sleep 1; } | telnet localhost 5554
 
-for i in "${!avd_images[@]}"
+for i in "${!AVD_IMAGES[@]}"
 do
-  # start emulator
-  emulator -netdelay none -netspeed full -avd ${avd_images[$i]} &
-  echo Emulator started, waiting for boot
-  # wait until adb is connected to device, so that we can issue adb shell commands
-  adb wait-for-device
-
-  # wait until boot is completed (see http://ncona.com/2014/01/detect-when-android-emulator-is-ready/ )
-  output=''
-  while [[ ${output:0:7} != 'stopped' ]]; do
-    output=`adb shell getprop init.svc.bootanim`
-    sleep 1
-    echo ...waiting
-  done
-
-  sleep 1
-  # unlock lockscreen
-  adb shell input keyevent 82
-
-  # Disable system animations
-  adb shell settings put global window_animation_scale 0
-  adb shell settings put global transition_animation_scale 0
-  adb shell settings put global animator_duration_scale 0
-
-  # Hide all system notification icons
-  adb shell service call notification 1
-
-  # Display battery as fully charged
-  { echo "power capacity 100"; echo "power ac off"; echo "exit"; sleep 1; } | telnet localhost 5554
-
-  echo Device online, initiating screengrabs
-
-  # now let the screengrab script run
-  fastlane screengrab --device_type ${device_types[$i]}
-
-  echo Done, killing this emulator now!
-  { echo "kill"; echo "exit"; sleep 1; } | telnet localhost 5554
+	# start emulator
+	emulator -netdelay none -netspeed full -avd ${AVD_IMAGES[$i]} &
+	echo Emulator started, waiting for boot
+	# wait until adb is connected to device, so that we can issue adb shell commands
+	adb wait-for-device
+
+	# wait until boot is completed (see http://ncona.com/2014/01/detect-when-android-emulator-is-ready/ )
+	output=""
+	while [[ ${output:0:7} != "stopped" ]]; do
+		output=`adb shell getprop init.svc.bootanim`
+		sleep 1
+		echo waiting...
+	done
+
+	sleep 1
+	# unlock lockscreen
+	adb shell input keyevent 82
+
+	# Disable system animations
+	adb shell settings put global window_animation_scale 0
+	adb shell settings put global transition_animation_scale 0
+	adb shell settings put global animator_duration_scale 0
+
+	# Hide all system notification icons
+	adb shell service call notification 1
+
+	# Display battery as fully charged
+	{ echo "power capacity 100"; echo "power ac off"; echo "exit"; sleep 1; } | telnet localhost 5554
+
+	echo Device online, initiating screengrabs
+
+	# Now let the screengrab script run
+	fastlane screengrab --device_type ${DEVICE_TYPES[$i]}
+
+	echo Done, killing this emulator now!
+	{ echo "kill"; echo "exit"; sleep 1; } | telnet localhost 5554
 done
 
 cp -r build/screengrab/ app/src/main/play/

From fa2650b266bbb4b6c55060216f434fca61e965be Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Sun, 1 Jul 2018 15:52:30 +0200
Subject: [PATCH 088/102] Simplification

---
 make_screenshots.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/make_screenshots.sh b/make_screenshots.sh
index 605108d4f..e97982c8b 100755
--- a/make_screenshots.sh
+++ b/make_screenshots.sh
@@ -1,10 +1,7 @@
 #!/bin/bash
 
 # Configuration
-ABI="google_apis/x86"
 IMAGE="system-images;android-28;google_apis;x86"
-
-# Names of AVD images for phone, 7-inch, 10-inch devices
 AVD_IMAGES=( "Pixel_API_28" "Nexus_7_API_28" "Pixel_C_API_28" )
 DEVICE_TYPES=( "phone" "sevenInch" "tenInch" )
 DEVICE_DEFINITIONS=( "pixel" "Nexus 7 2013" "pixel_c" )
@@ -20,7 +17,7 @@ sdkmanager "emulator" "system-images;android-28;google_apis;x86"
 # <android sdk>/tools/bin must be on the PATH
 for i in "${!AVD_IMAGES[@]}"
 do
-	echo no | avdmanager create avd -f -n ${AVD_IMAGES[$i]} -b $ABI -k $IMAGE -d ${DEVICE_DEFINITIONS[$i]}
+	echo no | avdmanager create avd -f -n ${AVD_IMAGES[$i]} -k $IMAGE -d ${DEVICE_DEFINITIONS[$i]}
 done
 
 # Disable emulator authentication

From 147167fada3259a014c5001ffe370fff6453abc2 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Sun, 1 Jul 2018 18:15:16 +0200
Subject: [PATCH 089/102] Fixes screengrab script

---
 .../mytargets/screengrab/ScreenshotTest.kt    |  5 ++---
 make_screenshots.sh                           | 22 ++++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/src/androidTestScreengrab/java/de/dreier/mytargets/screengrab/ScreenshotTest.kt b/app/src/androidTestScreengrab/java/de/dreier/mytargets/screengrab/ScreenshotTest.kt
index 4dd1a98fc..bf61b9bcd 100644
--- a/app/src/androidTestScreengrab/java/de/dreier/mytargets/screengrab/ScreenshotTest.kt
+++ b/app/src/androidTestScreengrab/java/de/dreier/mytargets/screengrab/ScreenshotTest.kt
@@ -20,7 +20,7 @@ import de.dreier.mytargets.shared.models.Target
 import de.dreier.mytargets.shared.targets.models.WAFull
 import de.dreier.mytargets.test.base.UITestBase
 import de.dreier.mytargets.test.utils.actions.TargetViewActions
-import de.dreier.mytargets.test.utils.matchers.ViewMatcher
+import de.dreier.mytargets.test.utils.matchers.ViewMatcher.clickFabSpeedDialItem
 import de.dreier.mytargets.test.utils.rules.SimpleDbTestRule
 import org.hamcrest.Matchers
 import org.junit.Before
@@ -78,8 +78,7 @@ class ScreenshotTest : UITestBase() {
         Screengrab.screenshot("6_statistics")
         navigateUp()
         navigateUp()
-        onView(ViewMatcher.supportFab()).perform(click())
-        onView(withId(R.id.fab1)).perform(click())
+        clickFabSpeedDialItem(R.id.fab1)
         Screengrab.screenshot("2_enter_training")
         save()
         onView(isRoot()).perform(click())
diff --git a/make_screenshots.sh b/make_screenshots.sh
index e97982c8b..39e838ef7 100755
--- a/make_screenshots.sh
+++ b/make_screenshots.sh
@@ -5,6 +5,7 @@ IMAGE="system-images;android-28;google_apis;x86"
 AVD_IMAGES=( "Pixel_API_28" "Nexus_7_API_28" "Pixel_C_API_28" )
 DEVICE_TYPES=( "phone" "sevenInch" "tenInch" )
 DEVICE_DEFINITIONS=( "pixel" "Nexus 7 2013" "pixel_c" )
+RESOLUTIONS=( "1080x1920" "1200x1920" "2560x1600" )
 
 # Install prerequisites
 sudo gem install fastlane
@@ -14,29 +15,30 @@ sdkmanager "emulator" "system-images;android-28;google_apis;x86"
 # Compile app
 ./gradlew assembleScreengrabDebug assembleScreengrabDebugAndroidTest
 
-# <android sdk>/tools/bin must be on the PATH
-for i in "${!AVD_IMAGES[@]}"
-do
-	echo no | avdmanager create avd -f -n ${AVD_IMAGES[$i]} -k $IMAGE -d ${DEVICE_DEFINITIONS[$i]}
-done
-
 # Disable emulator authentication
 touch "~/.emulator_console_auth_token"
 echo "" > "~/.emulator_console_auth_token"
 export DYLD_LIBRARY_PATH="$ANDROID_HOME/emulator/lib64:$ANDROID_HOME/emulator/lib64/qt/lib:$DYLD_LIBRARY_PATH"
+export PATH=$PATH:$ANDROID_HOME/emulator
+export PATH=$PATH:$ANDROID_HOME/platform-tools
+export PATH=$PATH:$ANDROID_HOME/tools
+export PATH=$PATH:$ANDROID_HOME/tools/bin
 
 echo Killing all emulators first!
 { echo "kill"; echo "exit"; sleep 1; } | telnet localhost 5554
 
 for i in "${!AVD_IMAGES[@]}"
 do
-	# start emulator
-	emulator -netdelay none -netspeed full -avd ${AVD_IMAGES[$i]} &
+	# Create Emulator
+	echo no | avdmanager create avd -force --name ${AVD_IMAGES[$i]} --package $IMAGE --device ${DEVICE_DEFINITIONS[$i]}
+
+	# Start emulator
+	emulator -netdelay none -netspeed full -skin ${RESOLUTIONS[$i]} -avd ${AVD_IMAGES[$i]} &
 	echo Emulator started, waiting for boot
 	# wait until adb is connected to device, so that we can issue adb shell commands
 	adb wait-for-device
 
-	# wait until boot is completed (see http://ncona.com/2014/01/detect-when-android-emulator-is-ready/ )
+	# Wait until boot is completed (see http://ncona.com/2014/01/detect-when-android-emulator-is-ready/ )
 	output=""
 	while [[ ${output:0:7} != "stopped" ]]; do
 		output=`adb shell getprop init.svc.bootanim`
@@ -45,7 +47,7 @@ do
 	done
 
 	sleep 1
-	# unlock lockscreen
+	# Unlock lockscreen
 	adb shell input keyevent 82
 
 	# Disable system animations

From 8eed1d0d25d67aa40d95b32e10e48104015d1ac4 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Sun, 1 Jul 2018 18:16:01 +0200
Subject: [PATCH 090/102] Fixed trigger insert/delete logic

---
 .../base/db/migrations/Migration26.kt         | 65 ++++++++++++++-
 .../db/migrations/RoomCreationCallback.kt     | 83 ++++++++++++++-----
 2 files changed, 124 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
index 67b4c1ff7..098cef76e 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/Migration26.kt
@@ -38,7 +38,7 @@ object Migration26 : Migration(25, 26) {
 
         recreateTablesWithNonNull(database)
 
-        RoomCreationCallback.createScoreTriggers(database)
+        createScoreTriggers(database)
 
         createIndices(database)
 
@@ -79,6 +79,69 @@ object Migration26 : Migration(25, 26) {
         }
     }
 
+    private fun createScoreTriggers(database: SupportSQLiteDatabase) {
+        // Insert Triggers
+        database.execSQL(getInsertTrigger("Round", "End", "roundId"))
+        database.execSQL(getInsertTrigger("Training", "Round", "trainingId"))
+
+        // Update Triggers
+        database.execSQL(getUpdateTrigger("Round", "End", "roundId"))
+        database.execSQL(getUpdateTrigger("Training", "Round", "trainingId"))
+
+        // Delete Triggers
+        database.execSQL(getDeleteTrigger("Round", "End", "roundId"))
+        database.execSQL(getDeleteTrigger("Training", "Round", "trainingId"))
+    }
+
+    private fun getInsertTrigger(
+        parentTable: String,
+        childTable: String,
+        joinColumn: String
+    ): String {
+        return "CREATE TRIGGER insert_${parentTable.toLowerCase()}_sum_score " +
+                "AFTER INSERT ON `$childTable` " +
+                "BEGIN " +
+                getUpdateQuery(parentTable, childTable, joinColumn, "NEW") +
+                "END;"
+    }
+
+    private fun getUpdateTrigger(
+        parentTable: String,
+        childTable: String,
+        joinColumn: String
+    ): String {
+        return "CREATE TRIGGER update_${parentTable.toLowerCase()}_sum_score " +
+                "AFTER UPDATE OF reachedPoints, totalPoints, shotCount ON `$childTable` " +
+                "BEGIN " +
+                getUpdateQuery(parentTable, childTable, joinColumn, "NEW") +
+                "END;"
+    }
+
+    private fun getDeleteTrigger(
+        parentTable: String,
+        childTable: String,
+        joinColumn: String
+    ): String {
+        return "CREATE TRIGGER delete_${parentTable.toLowerCase()}_sum_score " +
+                "AFTER DELETE ON `$childTable` " +
+                "BEGIN " +
+                getUpdateQuery(parentTable, childTable, joinColumn, "OLD") +
+                "END;"
+    }
+
+    private fun getUpdateQuery(
+        parentTable: String,
+        childTable: String,
+        joinColumn: String,
+        reference: String
+    ): String {
+        return "UPDATE `$parentTable` SET " +
+                "reachedPoints = (SELECT IFNULL(SUM(reachedPoints), 0) FROM `$childTable` WHERE $joinColumn = $reference.$joinColumn), " +
+                "totalPoints = (SELECT IFNULL(SUM(totalPoints), 0) FROM `$childTable` WHERE $joinColumn = $reference.$joinColumn), " +
+                "shotCount = (SELECT IFNULL(SUM(shotCount), 0) FROM `$childTable` WHERE $joinColumn = $reference.$joinColumn) " +
+                "WHERE id = $reference.$joinColumn;"
+    }
+
     private fun createIndices(database: SupportSQLiteDatabase) {
         database.execSQL("CREATE  INDEX `index_ArrowImage_arrowId` ON `ArrowImage` (`arrowId`)")
         database.execSQL("CREATE  INDEX `index_BowImage_bowId` ON `BowImage` (`bowId`)")
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt b/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
index d027cf5da..c2c8b298d 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/migrations/RoomCreationCallback.kt
@@ -102,29 +102,66 @@ object RoomCreationCallback : RoomDatabase.Callback() {
         )
     }
 
-    fun createScoreTriggers(database: SupportSQLiteDatabase) {
-        database.execSQL(
-            "CREATE TRIGGER round_sum_score " +
-                    "AFTER UPDATE ON `End` " +
-                    "BEGIN " +
-                    "UPDATE `Round` SET " +
-                    "reachedPoints = (SELECT SUM(reachedPoints) FROM `End` WHERE roundId = NEW.roundId), " +
-                    "totalPoints = (SELECT SUM(totalPoints) FROM `End` WHERE roundId = NEW.roundId), " +
-                    "shotCount = (SELECT SUM(shotCount) FROM `End` WHERE roundId = NEW.roundId) " +
-                    "WHERE id = NEW.roundId;" +
-                    "END;"
-        )
+    private fun createScoreTriggers(database: SupportSQLiteDatabase) {
+        // Insert Triggers
+        database.execSQL(getInsertTrigger("Round", "End", "roundId"))
+        database.execSQL(getInsertTrigger("Training", "Round", "trainingId"))
 
-        database.execSQL(
-            "CREATE TRIGGER training_sum_score " +
-                    "AFTER UPDATE ON `Round` " +
-                    "BEGIN " +
-                    "UPDATE `Training` SET " +
-                    "reachedPoints = (SELECT SUM(reachedPoints) FROM `Round` WHERE trainingId = NEW.trainingId), " +
-                    "totalPoints = (SELECT SUM(totalPoints) FROM `Round` WHERE trainingId = NEW.trainingId), " +
-                    "shotCount = (SELECT SUM(shotCount) FROM `Round` WHERE trainingId = NEW.trainingId) " +
-                    "WHERE id = NEW.trainingId;" +
-                    "END;"
-        )
+        // Update Triggers
+        database.execSQL(getUpdateTrigger("Round", "End", "roundId"))
+        database.execSQL(getUpdateTrigger("Training", "Round", "trainingId"))
+
+        // Delete Triggers
+        database.execSQL(getDeleteTrigger("Round", "End", "roundId"))
+        database.execSQL(getDeleteTrigger("Training", "Round", "trainingId"))
+    }
+
+    private fun getInsertTrigger(
+        parentTable: String,
+        childTable: String,
+        joinColumn: String
+    ): String {
+        return "CREATE TRIGGER insert_${parentTable.toLowerCase()}_sum_score " +
+                "AFTER INSERT ON `$childTable` " +
+                "BEGIN " +
+                getUpdateQuery(parentTable, childTable, joinColumn, "NEW") +
+                "END;"
+    }
+
+    private fun getUpdateTrigger(
+        parentTable: String,
+        childTable: String,
+        joinColumn: String
+    ): String {
+        return "CREATE TRIGGER update_${parentTable.toLowerCase()}_sum_score " +
+                "AFTER UPDATE OF reachedPoints, totalPoints, shotCount ON `$childTable` " +
+                "BEGIN " +
+                getUpdateQuery(parentTable, childTable, joinColumn, "NEW") +
+                "END;"
+    }
+
+    private fun getDeleteTrigger(
+        parentTable: String,
+        childTable: String,
+        joinColumn: String
+    ): String {
+        return "CREATE TRIGGER delete_${parentTable.toLowerCase()}_sum_score " +
+                "AFTER DELETE ON `$childTable` " +
+                "BEGIN " +
+                getUpdateQuery(parentTable, childTable, joinColumn, "OLD") +
+                "END;"
+    }
+
+    private fun getUpdateQuery(
+        parentTable: String,
+        childTable: String,
+        joinColumn: String,
+        reference: String
+    ): String {
+        return "UPDATE `$parentTable` SET " +
+                "reachedPoints = (SELECT IFNULL(SUM(reachedPoints), 0) FROM `$childTable` WHERE $joinColumn = $reference.$joinColumn), " +
+                "totalPoints = (SELECT IFNULL(SUM(totalPoints), 0) FROM `$childTable` WHERE $joinColumn = $reference.$joinColumn), " +
+                "shotCount = (SELECT IFNULL(SUM(shotCount), 0) FROM `$childTable` WHERE $joinColumn = $reference.$joinColumn) " +
+                "WHERE id = $reference.$joinColumn;"
     }
 }

From d256f1fc70c1db19cb552cfee57cbd515fad2f33 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Sun, 1 Jul 2018 19:14:18 +0200
Subject: [PATCH 091/102] Removed useless install

---
 make_screenshots.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/make_screenshots.sh b/make_screenshots.sh
index 39e838ef7..999314d6a 100755
--- a/make_screenshots.sh
+++ b/make_screenshots.sh
@@ -9,7 +9,6 @@ RESOLUTIONS=( "1080x1920" "1200x1920" "2560x1600" )
 
 # Install prerequisites
 sudo gem install fastlane
-sudo gem install screengrab
 sdkmanager "emulator" "system-images;android-28;google_apis;x86"
 
 # Compile app

From 27fcd0466455d0dee8bfeaa6b2f47325e11c175c Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Sat, 28 Jul 2018 15:11:36 +0200
Subject: [PATCH 092/102] Rework

---
 .gitignore                                    |  3 +-
 .idea/misc.xml                                | 11 +++---
 .travis.yml                                   |  2 +-
 app/build.gradle                              |  1 -
 .../base/navigation/NavigationController.kt   | 29 +---------------
 tools/script-codacy.gradle                    | 34 -------------------
 6 files changed, 7 insertions(+), 73 deletions(-)
 delete mode 100644 tools/script-codacy.gradle

diff --git a/.gitignore b/.gitignore
index e16ed0aef..c34106093 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ wearable/wearable.iml
 # User-specific stuff:
 .idea/**/workspace.xml
 .idea/**/tasks.xml
+.idea/caches/**
 
 # Gradle:
 .idea/**/gradle.xml
@@ -59,5 +60,3 @@ googlePlayAndroidDeveloper.json
 google-services.json
 firebase-crashreporting.json
 services.tar
-
-\.idea/caches/build_file_checksums\.ser
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 26a936db9..ee870c771 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,14 +4,11 @@
     <option name="CORE_LIBRARY" value="true" />
   </component>
   <component name="EntryPointsManager">
-    <list size="7">
+    <list size="4">
       <item index="0" class="java.lang.String" itemvalue="android.arch.persistence.room.Query" />
-      <item index="1" class="java.lang.String" itemvalue="android.arch.persistence.room.Query" />
-      <item index="2" class="java.lang.String" itemvalue="android.databinding.BindingAdapter" />
-      <item index="3" class="java.lang.String" itemvalue="android.databinding.InverseBindingAdapter" />
-      <item index="4" class="java.lang.String" itemvalue="butterknife.OnClick" />
-      <item index="5" class="java.lang.String" itemvalue="butterknife.OnTextChanged" />
-      <item index="6" class="java.lang.String" itemvalue="org.junit.Rule" />
+      <item index="1" class="java.lang.String" itemvalue="android.databinding.BindingAdapter" />
+      <item index="2" class="java.lang.String" itemvalue="android.databinding.InverseBindingAdapter" />
+      <item index="3" class="java.lang.String" itemvalue="org.junit.Rule" />
     </list>
   </component>
   <component name="NullableNotNullManager">
diff --git a/.travis.yml b/.travis.yml
index d1e6e006e..7563c6d96 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,7 +45,7 @@ script:
 - echo -en 'travis_fold:end:script.build\\r'
 
 - echo -e '\033[0;33mUnit tests...\033[0m' && echo -en 'travis_fold:start:script.unittest\\r'
-- ./gradlew testRelease jacocoTestReport -PdisablePreDex
+- ./gradlew testRelease -PdisablePreDex
 - echo -en 'travis_fold:end:script.unittest\\r'
 
 # - echo -e '\033[0;33mUI tests...\033[0m' && echo -en 'travis_fold:start:script.uitest\\r'
diff --git a/app/build.gradle b/app/build.gradle
index 4928119e2..f547062d9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -107,7 +107,6 @@ android {
     }
 }
 
-//apply from: '../tools/script-codacy.gradle'
 apply from: '../tools/script-play-store.gradle'
 
 dependencies {
diff --git a/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt b/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
index 3ccf7759a..c450fb54c 100644
--- a/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/navigation/NavigationController.kt
@@ -71,9 +71,7 @@ import de.dreier.mytargets.views.selector.*
 
 class NavigationController(
     private val activity: AppCompatActivity,
-    private val fragment: Fragment? = null//,
-//        private val fragmentManager: FragmentManager,
-//        private val containerId: Int = R.id.container
+    private val fragment: Fragment? = null
 ) {
 
     constructor(fragment: Fragment) : this(fragment.activity as AppCompatActivity, fragment)
@@ -335,31 +333,6 @@ class NavigationController(
         }
     }
 
-//    fun navigateToSearch() {
-//        val searchFragment = SearchFragment()
-//        fragmentManager.beginTransaction()
-//                .replace(containerId, searchFragment)
-//                .commitAllowingStateLoss()
-//    }
-//
-//    fun navigateToRepo(owner: String, name: String) {
-//        val fragment = RepoFragment.create(owner, name)
-//        val tag = "repo/$owner/$name"
-//        fragmentManager.beginTransaction()
-//                .replace(containerId, fragment, tag)
-//                .addToBackStack(null)
-//                .commitAllowingStateLoss()
-//    }
-//
-//    fun navigateToUser(login: String) {
-//        val tag = "user" + "/" + login
-//        val userFragment = UserFragment.create(login)
-//        fragmentManager.beginTransaction()
-//                .replace(containerId, userFragment, tag)
-//                .addToBackStack(null)
-//                .commitAllowingStateLoss()
-//    }
-
     companion object {
         const val ITEM = "item"
         const val INTENT = "intent"
diff --git a/tools/script-codacy.gradle b/tools/script-codacy.gradle
deleted file mode 100644
index 4dd936bef..000000000
--- a/tools/script-codacy.gradle
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2018 Florian Dreier
- *
- * This file is part of MyTargets.
- *
- * MyTargets is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * MyTargets is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-configurations { codacy }
-
-repositories {
-    maven { url "https://jitpack.io" }
-    maven { url "http://dl.bintray.com/typesafe/maven-releases" }
-}
-
-dependencies {
-    codacy 'com.github.codacy:codacy-coverage-reporter:3.0.0'
-}
-
-task sendCoverageToCodacy(type: JavaExec, dependsOn: jacocoTestReport) {
-    main = "com.codacy.CodacyCoverageReporter"
-    classpath = configurations.codacy
-    args = [
-            "-l", "Java",
-            "-r", "${buildDir}/reports/jacoco/test/jacocoTestReport.xml"
-    ]
-}

From 65534095edcac1db3f99eec1e58391bdd073426c Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Sun, 29 Jul 2018 11:38:20 +0200
Subject: [PATCH 093/102] Fixed a bug in round deletion

---
 app/build.gradle                              |  2 +-
 .../dreier/mytargets/base/db/dao/RoundDAO.kt  |  5 ++++-
 .../features/bows/BowListFragment.kt          |  2 +-
 .../features/settings/SettingsManager.kt      |  2 +-
 .../StandardRoundListFragment.kt              |  2 +-
 .../training/target/TargetListFragment.kt     |  4 ++--
 build.gradle                                  | 22 +++++++++----------
 7 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f547062d9..af45427ee 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,7 +38,7 @@ android {
     defaultConfig {
         applicationId 'de.dreier.mytargets'
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode gitVersionCode
         versionName gitVersionName
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
index 8d61814a5..dcbf9cb7f 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/RoundDAO.kt
@@ -64,10 +64,13 @@ abstract class RoundDAO {
 
     @Transaction
     open fun deleteRound(round: Round) {
-        deleteRound(round)
+        deleteRoundWithoutIndexUpdate(round)
         decrementIndices(round.index)
     }
 
+    @Delete
+    abstract fun deleteRoundWithoutIndexUpdate(round: Round)
+
     @Query("UPDATE Round SET `index` = `index` - 1 WHERE `index` > :allAboveIndex")
     abstract fun decrementIndices(allAboveIndex: Int)
 
diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
index f63c78e03..d97ff4011 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowListFragment.kt
@@ -29,7 +29,7 @@ class BowListFragment : SelectPureListItemFragmentBase<Bow>(compareBy(Bow::name,
     override fun onLoad(args: Bundle?): LoaderUICallback {
         val bows = bowDAO.loadBows().toMutableList()
         return {
-            adapter!!.setList(bows)
+            adapter.setList(bows)
             val bow = arguments!!.getParcelable<Bow>(ITEM)
             selectItem(binding.recyclerView, bow!!)
         }
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt
index 652ccf8e8..9f0d69819 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.kt
@@ -364,7 +364,7 @@ object SettingsManager {
 
     var language: String
         get() = preferences[KEY_LANGUAGE, ""]
-        set(value) = preferences.set(KEY_LANGUAGE, language)
+        set(value) = preferences.set(KEY_LANGUAGE, value)
 
     var shouldShowIntroActivity: Boolean
         get() = preferences[KEY_INTRO_SHOWED, true]
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
index b0cd2f758..695c11417 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/standardround/StandardRoundListFragment.kt
@@ -100,7 +100,7 @@ class StandardRoundListFragment :
             )
         }.toMutableList()
         return {
-            adapter!!.setList(data)
+            adapter.setList(data)
             selectItem(binding.recyclerView, currentSelection!!)
         }
     }
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
index b1d3cb8e4..9df799048 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
@@ -113,7 +113,7 @@ class TargetListFragment :
     }
 
     override fun selectItem(recyclerView: RecyclerView, item: Target) {
-        adapter!!.ensureItemIsExpanded(item)
+        adapter.ensureItemIsExpanded(item)
         super.selectItem(recyclerView, item)
     }
 
@@ -128,7 +128,7 @@ class TargetListFragment :
 
     private fun updateSettings() {
         // Init scoring styles
-        val target = adapter!!.getItemById(selector.getSelectedId()!!)
+        val target = adapter.getItemById(selector.getSelectedId()!!)
         val styles = target!!.model.scoringStyles.map { it.toString() }
         updateAdapter(binding.scoringStyle, scoringStyleAdapter!!, styles)
 
diff --git a/build.gradle b/build.gradle
index b81d956d1..23710ed0a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,22 +15,22 @@
 
 buildscript {
     ext.androidPluginVersion = '3.1.2'
-    ext.kotlinVersion = '1.2.41'
+    ext.kotlinVersion = '1.2.51'
     repositories {
         jcenter()
         google()
-        maven { url "https://jitpack.io" }
+        maven { url 'https://jitpack.io' }
         maven { url 'https://maven.fabric.io/public' }
     }
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.3'
-        classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
-        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
-        classpath 'com.google.gms:google-services:3.2.1'
+        classpath 'com.github.triplet.gradle:play-publisher:1.2.2'
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.3'
+        classpath 'com.google.gms:google-services:4.0.2'
         classpath 'com.google.firebase:firebase-plugins:1.1.5'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath 'io.fabric.tools:gradle:1.25.3'
+        classpath 'io.fabric.tools:gradle:1.25.4'
     }
 }
 
@@ -39,7 +39,7 @@ plugins {
     id 'com.github.ben-manes.versions' version '0.17.0'
 }
 
-apply from: "dependencies.gradle"
+apply from: 'dependencies.gradle'
 
 allprojects {
     repositories {
@@ -51,7 +51,7 @@ allprojects {
     }
 }
 
-apply from: "tools/script-git-version.gradle"
-apply from: "tools/script-crowdin.gradle"
-apply from: "tools/script-dependency-updates.gradle"
-apply from: "tools/script-keystore-fallback.gradle"
+apply from: 'tools/script-git-version.gradle'
+apply from: 'tools/script-crowdin.gradle'
+apply from: 'tools/script-dependency-updates.gradle'
+apply from: 'tools/script-keystore-fallback.gradle'

From bdd3fbc9ce30df0340a7b043ee50f6a0fe6a61c5 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Sun, 29 Jul 2018 11:44:05 +0200
Subject: [PATCH 094/102] Updated dependencies

---
 build.gradle          |  2 +-
 dependencies.gradle   | 22 ++++++++++------------
 shared/build.gradle   |  2 +-
 wearable/build.gradle |  6 +-----
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/build.gradle b/build.gradle
index 23710ed0a..d293de58d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,7 @@ buildscript {
 
 plugins {
     id 'com.mendhak.gradlecrowdin' version '0.1.0'
-    id 'com.github.ben-manes.versions' version '0.17.0'
+    id 'com.github.ben-manes.versions' version '0.19.0'
 }
 
 apply from: 'dependencies.gradle'
diff --git a/dependencies.gradle b/dependencies.gradle
index 52ad1d776..d850c2ebd 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -19,40 +19,38 @@ ext {
     libraryVersion = [
             aboutPage                 : '1.2.4',
             androidLanguages          : 'v1.0.1',
-            androidState              : '1.2.1',
+            androidState              : '1.3.1',
             architectureComponents    : '1.1.1',
-            architectureComponentsRoom: '1.0.0',
-            crashlytics               : '2.9.2',
-            dbFlow                    : '4.2.4',
-            dexmaker                  : '2.2.0',
+            architectureComponentsRoom: '1.1.1-rc1',
+            crashlytics               : '2.9.4',
             discreteSeekbar           : '1.0.1',
             easyImage                 : '2.0.4',
             espresso                  : '3.0.2',
             findbugs                  : '3.0.2',
-            gson                      : '2.8.2',
+            gson                      : '2.8.5',
             homage                    : '0.2.0',
             iab                       : '1.0.44',
             jUnit                     : '4.12',
             materialDialogs           : '0.9.6.0',
             materialIntroScreen       : '0.0.5',
             mpAndroidChart            : 'v3.0.3',
-            mockito                   : '2.18.3',
+            mockito                   : '2.20.1',
             multidex                  : '1.0.3',
-            okhttp                    : '3.10.0',
+            okhttp                    : '3.11.0',
             permissionsdispatcher     : '3.2.0',
             photoView                 : '2.1.3',
             picasso                   : '2.5.2',
-            playService               : '15.0.0',
+            playService               : '15.0.1',
             retrofit                  : '2.4.0',
             roundedImageView          : '2.3.0',
             screengrab                : '1.2.0',
             signaturePad              : '1.2.1',
             support                   : '27.1.1',
-            supportWearable           : '2.2.0',
+            supportWearable           : '2.3.0',
             testSupport               : '1.0.2',
             threeTenABP               : '1.1.0',
-            timber                    : '4.7.0',
-            truth                     : '0.40',
+            timber                    : '4.7.1',
+            truth                     : '0.42',
             uiAutomator               : '2.1.3',
             versionInfoDialog         : '0.1.0'
     ]
diff --git a/shared/build.gradle b/shared/build.gradle
index 526bed1f4..e20c2b803 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -28,7 +28,7 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
         vectorDrawables.useSupportLibrary true
     }
diff --git a/wearable/build.gradle b/wearable/build.gradle
index 39f9e3f10..ff8ad540b 100644
--- a/wearable/build.gradle
+++ b/wearable/build.gradle
@@ -29,7 +29,7 @@ android {
     defaultConfig {
         applicationId 'de.dreier.mytargets'
         minSdkVersion 23
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode gitVersionCode
         versionName gitVersionName
     }
@@ -71,17 +71,13 @@ android {
 
 dependencies {
     Map<String, String> dependencies = rootProject.ext.dependencies
-
     implementation dependencies.supportWearable
     compileOnly dependencies.wearable
     implementation dependencies.supportCompat
     implementation dependencies.supportWear
     implementation dependencies.androidxCoreKtx
-
     implementation dependencies.androidState
     kapt dependencies.androidStateProcessor
-
-
     implementation project(':shared')
     implementation dependencies.kotlinStdlibJre7
 }
\ No newline at end of file

From 416f28f59b0ff33035e944e8d343ce1c060266e5 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Sun, 29 Jul 2018 14:34:59 +0200
Subject: [PATCH 095/102] Updated translations

---
 app/src/main/res/raw-cs-rCZ/help.html         |  24 +-
 app/src/main/res/raw-de-rDE/help.html         |   2 +-
 app/src/main/res/raw-es-rES/help.html         |  28 +-
 app/src/main/res/raw-hu-rHU/help.html         |  18 +-
 app/src/main/res/raw-in-rID/help.html         |  30 +-
 app/src/main/res/raw-it-rIT/help.html         |   2 +-
 app/src/main/res/raw-ro-rRO/help.html         |  54 +-
 app/src/main/res/raw-tr-rTR/help.html         |  34 +-
 app/src/main/res/values-af/strings.xml        |   3 +-
 app/src/main/res/values-ar/strings.xml        | 581 +++++++++---------
 app/src/main/res/values-ca/strings.xml        |   3 +-
 app/src/main/res/values-cs/strings.xml        |  29 +-
 app/src/main/res/values-da/strings.xml        |   3 +-
 app/src/main/res/values-de/strings.xml        |   3 +-
 app/src/main/res/values-el/strings.xml        |   3 +-
 app/src/main/res/values-es/strings.xml        |  10 +-
 app/src/main/res/values-et/strings.xml        |   3 +-
 app/src/main/res/values-fi/strings.xml        |   3 +-
 app/src/main/res/values-fr/strings.xml        |  27 +-
 app/src/main/res/values-hu/strings.xml        |  23 +-
 app/src/main/res/values-in/strings.xml        |   5 +-
 app/src/main/res/values-it/strings.xml        |  15 +-
 app/src/main/res/values-iw/strings.xml        |   3 +-
 app/src/main/res/values-ja/strings.xml        |   3 +-
 app/src/main/res/values-ko/strings.xml        |   3 +-
 app/src/main/res/values-nl/strings.xml        |  35 +-
 app/src/main/res/values-no/strings.xml        |   9 +-
 app/src/main/res/values-pl/strings.xml        |   3 +-
 app/src/main/res/values-pt-rBR/strings.xml    |   3 +-
 app/src/main/res/values-pt-rPT/strings.xml    |   3 +-
 app/src/main/res/values-ro/strings.xml        | 451 +++++++-------
 app/src/main/res/values-ru/strings.xml        |   3 +-
 app/src/main/res/values-sk/strings.xml        |   3 +-
 app/src/main/res/values-sl/strings.xml        |   3 +-
 app/src/main/res/values-sr/strings.xml        |   3 +-
 app/src/main/res/values-sv/strings.xml        |   3 +-
 app/src/main/res/values-tr/strings.xml        |   5 +-
 app/src/main/res/values-uk/strings.xml        |  13 +-
 app/src/main/res/values-vi/strings.xml        |   3 +-
 app/src/main/res/values-zh-rCN/strings.xml    |   3 +-
 app/src/main/res/values-zh-rTW/strings.xml    |   3 +-
 app/src/main/res/values/translators.xml       |  20 +-
 shared/src/main/res/values-fr/strings.xml     |  14 +-
 .../src/main/res/values-fr/target_faces.xml   |   2 +-
 .../src/main/res/values-hu/target_faces.xml   |  12 +-
 shared/src/main/res/values-no/strings.xml     |   2 +-
 shared/src/main/res/values-ro/rounds.xml      |  16 +-
 shared/src/main/res/values-ro/strings.xml     |   6 +-
 .../src/main/res/values-ro/target_faces.xml   |   8 +-
 wearable/src/main/res/values-fr/strings.xml   |  12 +-
 wearable/src/main/res/values-ro/strings.xml   |  18 +-
 51 files changed, 802 insertions(+), 766 deletions(-)

diff --git a/app/src/main/res/raw-cs-rCZ/help.html b/app/src/main/res/raw-cs-rCZ/help.html
index a1150182b..2de728c11 100644
--- a/app/src/main/res/raw-cs-rCZ/help.html
+++ b/app/src/main/res/raw-cs-rCZ/help.html
@@ -26,13 +26,13 @@ <h1>Začínáme s MyTargets</h1>
            
             <section> 
                 <h2>Organizace tréninků</h2>
-                <p>Trénink je rozdělen na jedno nebo více kol. Každé kolo může obsahovat libovolný počet sad, přičemž jedna sada obsahuje předem definovaný počet šípů.</p>
+                <p>Trénink je organizován do jednoho nebo více kol. Každé kolo může obsahovat libovolný počet sad, přičemž sada obsahuje předem definovaný počet vystřelených šípů.</p>
                 <details>
                     <summary>Vytvořte trénink</summary>
                     <p>Chcete-li vytvořit nový trénink, klepněte na oranžové kolečko v dolní části stránky tréninku. Nyní můžete vybírat z následujících možností:</p>
                     <ul>
                         <li><strong>Volný trénink</strong>: Lze libovolně nastavit vzdálenost, typ a průměr terče, stejně jako počet šípů vystřelených na sadu.</li>
-                        <li><strong>Trénink - standardní kolo</strong>: Umožňuje vybrat z obrovského počtu standardních kol. Můžete také vytvořit své vlastní, pokud žádné z předdefinovaných nevyhovuje vašim potřebám.</li>
+                        <li><strong>Trénink - Standardní kolo</strong>: Umožňuje si vybrat z velkého množství běžných standardních kol. Můžete také definovat své vlastní, pokud žádné z předdefinovaných nevyhovuje vašim potřebám.</li>
                     </ul>
                 </details>
                 <details>
@@ -45,11 +45,11 @@ <h2>Organizace tréninků</h2>
                     <summary>WA spůsob bodování</summary>
                     <p>V následujících bodech jsou podrobněji popsány všechny styly bodování WA:</p>
                     <ul>
-                        <li><strong>Reflexní styl (X-1)</strong>: Nejvnitřnější žlutý kruh odpovídá 10 bodům, ale je označen jako X. Vnější žluté kruhy odpovídají 10 a 9 bodům. Skóre se s každým kroužkem snižuje o 1.</li>
+                        <li><strong>Reflexní styl (X-1)</strong>: Nejvnitřnější žlutý kruh odpovídá 10 bodům, ale je označen jako X. Vnější žluté kruhy odpovídají 10 a 9 bodům. Skóre se s každým kruhem snižuje o 1 bod.</li>
                         <li><strong>Reflexní styl (10-1)</strong>: Stejné jako předchozí, ale vnitřní dva žluté kroužky jsou zobrazeny jako jeden kruh za 10 bodů (bez X).</li>
-                        <li><strong>Kladkový styl</strong>: Pouze nejvnitřnější žlutý kruh je za 10 bodů. Okolní dva žluté kroužky jsou zobrazeny jako jeden za 9 bodů.</li>
-                        <li><strong>11, 10, 9, ..., 1</strong>: Vnitřní kroužek za 11 bodů. Skóre se s každým kroužkem snižuje o 1.</li>
-                        <li><strong>X, 5, 4, 3, 2, 1</strong>: Žluté skóre 5, červené 4, modré 3, černé 2 a bílé 1 bod. Nejvnitřnější žlutý kruh je zapsán jako X.</li>
+                        <li><strong>Kladkový styl</strong>: Pouze nejvnitřnější žlutý kruh získává 10 bodů. Vnější dva žluté kruhy jsou zobrazeny jako jeden se skóre 9 bodů.</li>
+                        <li><strong>11, 10, 9, ..., 1</strong>: Nejvnitřnější kruh je za 11 bodů. Skóre se s každým kruhem snižuje o 1 bod.</li>
+                        <li><strong>X, 5, 4, 3, 2, 1</strong>: Žlutá 5 bodů, červená 4, modrá 3, černá 2 a bílá 1 bod. Nejvnitřnější žlutý kruh je zaznamenán jako X.</li>
                         <li><strong>9, 7, 5, 3, 1</strong>: Žluté skóre 9, červené 7, modré 5, černé 3 a bílé 1 bod.</li>
                         <li><strong>FCFS Barvy (obráceně 10-1)</strong>: Hraje se bodový styl, kde bílé jsou 10 bodů, černé 8, modré 6, červené 4, vnější žlutá 2 a vnitřní dvě žluté 1. Obvykle se střílí se 6 šípů na sadu. Pouze jeden šíp se počítá na jednu barvu. Maximální dosažitelné skóre je 31 bodů na sadu, když každý šíp zasádne jinou barvu.</li>
                     </ul>
@@ -61,7 +61,7 @@ <h2>Organizace tréninků</h2>
                 </details>
                 <details>
                     <summary>Co je standardní kolo?</summary>
-                    <p>Standardní kolo je přednastavená šablona výcviku, která specifikuje daný počet kol, sad a šípů vystřelených na sadu. Krom toho jsou vzdálenosti a terče fixní.</p>
+                    <p>Standardní kolo je předdefinovaná tréninková šablona, která určuje přesný počet kol, sad a šípů na sadu. Krom toho jsou vzdálenosti a cílové plochy fixní.</p>
                     <p>Aplikace vám nabízí řadu standardních kol, které jsou běžně používané.</p>
                 </details>
                 <details>
@@ -72,16 +72,16 @@ <h2>Organizace tréninků</h2>
             </section>
             <section> 
                 <h2>Vstup</h2>
-                <p>MyTargets podporuje přesné zakreslení šípu a klávesnice, na základě vstupního režimu. Přepínání mezi nimi je možné přes nastavení.</p>
+                <p>MyTargets podporuje přesné zakreslení šípu a režim klávesnice. Přepínání mezi nimi je možné v nastavení.</p>
                 <details>
                     <summary>Přesné zakreslení šípu</summary>
-                    <p>Přesné zakreslení šípu je výchozí metoda zadávání. Chcete-li zadat zásah, klepněte na něj a podržte ho na cílové ploše, nastavte jeho polohu, dokud nebudete spokojeni s polohou šipky a potom uvolněte prst.</p>
+                    <p>Přesné zakreslení šípu je výchozí metoda zadávání. Chcete-li zadat zásah, klepněte na něj a podržte ho na ploše, nastavte jeho polohu, dokud nebudete spokojeni s polohou šípu a potom uvolněte prst.</p>
                     <img src="images/input_plotting.png"/>
                     <p><strong>Poznámka: </strong>Detekce skluzu prstu rozpozná neúmyslné pohyby při uvolnění prstu a ignoruje je.</p>
                 </details>
                 <details>
                     <summary>Režim klávesnice</summary>
-                    <p>Režim klávesnice, jako alternativa k výchozímu přesnému zadávání pozice. V režimu klávesnice zadáte pouze prstence zasažené šípem ale ne jejich přesnou pozici.</p>
+                    <p>Režim klávesnice je alternativa k výchozímu přesnému zakreslení šípu. V režimu klávesnice zadáte pouze kruh zasažený šípem a ne jeho přesnou polohu.</p>
                     <img src="images/input_keyboard.png"/>
                     <p>Nastavení levou rukou přenese klávesnici na levou stranu, aby bylo možné zadávat jednou rukou.</p>
                 </details>
@@ -97,7 +97,7 @@ <h2>Statistiky</h2>
                     <summary>Statistické prvky</summary>
                     <p>Níže jsou popsány hlavní komponenty uživatelského rozhraní:</p>
                     <ul>
-                        <li><strong>Linkový graf</strong>: Zobrazuje průměrné skóre šípů na sadu. Oranžové regresní čáry ukazují celkový trend. Graf lze zvětšit vodorovně dvěma prsty.</li>
+                        <li><strong>Linkový graf</strong>: Zobrazuje průměrné skóre šípů na sadu. Oranžová lineární čára ukazuje celkový trend. Graf může být zvětšen dvěma prsty horizontálně.</li>
                         <li><strong>Distribuční graf</strong>: Ukazuje rozložení šípů mezi dostupné kruhy. Není-li vybrán žádný segment, zobrazí se celkový počet zásahů a chyb. Klepnutím na segment se zobrazí přesný počet zásahů v této skupině.</li>
                         <li><strong>Rozptylový vzor</strong>: Zobrazuje všechny zásahy na jednom terči, dané spůsobem bodování (lze změnit v nastavení aplikace). Pokud klepnete na rozptylový vzor, získáte zvětšení rozptylového vzoru. Z obrazovky podrobnosti můžete také sdílet obrázek rozptylového vzoru, nebo ho vytisknout.</li>
                         <li><strong>Hodnocení šípu</strong>: Pokud jste použili funkci číslování šípů v jednom z vybraných tréninků, je tato tabulka zobrazena níže. Šípy s nejlepším průměrným skóre jsou umístěny v horní části seznamu. Klepnutím na číslo šípu se dostanete k rozptylovému vzoru, který zobrazuje pouze zásahy vybraného šípu.</li>
@@ -112,7 +112,7 @@ <h2>Statistiky</h2>
                 </details>
                 <details>
                     <summary>Používání filtrů</summary>
-                    <p>Můžete také použít filtry na vybrané údaje o tréninku. Filtrování je možné pomocí luků, šípů, vzdáleností a průměru terče.</p>
+                    <p>Můžete také použít filtry na vybrané údaje o tréninku. Filtrování je možné pomocí luku, šípu, vzdálenosti a průměru terče.</p>
                     <img src="images/statistics_filter.png" style="width:10%;"/>
                 </details>
                 <details>
diff --git a/app/src/main/res/raw-de-rDE/help.html b/app/src/main/res/raw-de-rDE/help.html
index 687385cd0..a00729fac 100644
--- a/app/src/main/res/raw-de-rDE/help.html
+++ b/app/src/main/res/raw-de-rDE/help.html
@@ -45,7 +45,7 @@ <h2>Trainings organisieren</h2>
                     <summary>WA Scoring Stile</summary>
                     <p>Im folgenden sind alle WA Scoring Stile genauer beschrieben:</p>
                     <ul>
-                        <li><strong>Recurve-Stil (x-1)</strong>: Der innerste golden Ring zählt 10 Ringe, wird aber als X gekennzeichnet. Die äußeren goldenen Ringe zählen 10 bzw. 9 Ringe. Die Ringzahl sinkt mit jeder Ring um eins.</li>
+                        <li><strong>Recurve-Stil (X-1)</strong>: Der innerste golden Ring zählt 10 Ringe, wird aber als X gekennzeichnet. Die äußeren goldenen Ringe zählen 10 bzw. 9 Ringe. Die Ringzahl sinkt mit jeder Ring um eins.</li>
                         <li><strong>Recurve Stil (10-1)</strong>: Das gleiche wie der vorherige, mit dem Unterschied, dass die inneren zwei goldene Ringe als ein Ring gezeichnet und mit 10 Ringen gezählt werden (kein X).</li>
                         <li><strong>Compound Stil</strong>: Nur der innerste goldene Ring zählt 10 Ringe. Die äußersten zwei goldene Ringe sind nicht optisch getrennt und zählen als 9 Ringe.</li>
                         <li><strong>11, 10, 9,..., 1</strong>: Der innerste Ring wird mit 11 gezählt. Die Ringzahl sinkt mit jedem Ring um eins.</li>
diff --git a/app/src/main/res/raw-es-rES/help.html b/app/src/main/res/raw-es-rES/help.html
index f4d241bae..b4c246e7d 100644
--- a/app/src/main/res/raw-es-rES/help.html
+++ b/app/src/main/res/raw-es-rES/help.html
@@ -26,53 +26,53 @@ <h1>Empezar con MyTargets</h1>
            
             <section> 
                 <h2>Organizar entrenamientos</h2>
-                <p>Un entrenamiento esto organizado en una o varias tandas y cada tanda contiene un numero indeterminado de entradas, una entrada contiene un numero predefinido de flechas.</p>
+                <p>A training is organized into one or multiple rounds. Cada entrada contiene un numero arbitrario de rondas y donde cada ronda contiene un numero predefinido de flechas.</p>
                 <details>
                     <summary>Crear un entrenamiento</summary>
-                    <p>Para crear un nuevo entrenamiento Pulse el círculo anaranjado en la parte inferior de la página de Entrenamientos. Ahora usted puede seleccionar de:</p>
+                    <p>Para crear un nuevo entrenamiento, pulsa el circulo naranja de la parte inferior de la pagina de entrenamientos. Ahora puede seleccionar de:</p>
                     <ul>
                         <li><strong>Entrenamiento Libre</strong>: le permite definir libremente la distancia,  target face y diámetro, así como el número de flechas que deseas tirar por entrada.</li>
-                        <li><strong>Entrenamiento  con Ronda estandard</strong>: le permite seleccionar de un gran número de rondas estándar común. También puede definir su propio si ninguno de los predefinidos ajusta a sus necesidades.</li>
+                        <li><strong>Entranamiento con entradas estandar</strong>: Te permite elegir entre un numero variable de entradas comunes. Tu puedes seleccionar la tuya propia predefinida con tus necesidades.</li>
                     </ul>
                 </details>
                 <details>
                     <summary>Seleccion un target Face</summary>
                     <p>Puedes selecionar una gran variadad de target faces Algunos target faces tienen diferentes <strong>estilos de puntuación</strong> (1). El estilo de puntuación describe los puntos asociados con un area particular de la diana. Adicionalmente el diametro de la diana puede ser especifico (2). </p>
                     <img src="images/target_face_selection.png" />
-                    <p><strong>Note: </strong>The diameter of a spot target face is relative to the target face of the full target. Por ejemplo un WA 5 anillos  con 80cm de diámetro, en   la aplicación representa  un anillo  que tiene en realidad sólo 40cm en la vida real, porque la WA completa  tendría 80cm.</p>
+                    <p><strong>Nota:</strong> El diámetro de un anillo de la diana es relativo al tamaño de una diana completa. Por ejemplo un WA 5 anillos  con 80cm de diámetro, en   la aplicación representa  un anillo  que tiene en realidad sólo 40cm en la vida real, porque la WA completa  tendría 80cm.</p>
                 </details>
                 <details>
                     <summary>Estilos de puntuación WA</summary>
-                    <p>In the following all WA scoring styles are described in more detail:</p>
+                    <p>A continuación se describen con mas detalle los estilos de puntuación WA:</p>
                     <ul>
                         <li><strong>Recurve style (X-1)</strong>: The innermost golden ring scores 10 points, but is marked as X. The outer golden rings score 10 and 9 accordingly. The score decreases with every ring by 1.</li>
-                        <li><strong>Recurve style (10-1)</strong>: Same as previous, but the inner two golden rings are shown as one ring, rewarded with 10 points (no X).</li>
+                        <li><strong>Recurvo estilo (10 - 1)</strong>: igual a la anterior, pero el interior de los dos circulos amarillos se muestran como un unico circulo, recompensado con 10 puntos (no X).</li>
                         <li><strong>Compound style</strong>: Only the innermost golden ring scores 10 points. The outermost two golden rings are shown as one and score 9 points.</li>
                         <li><strong>11, 10, 9, ..., 1</strong>: The innermost ring scores 11. The score decreases with every ring by 1.</li>
                         <li><strong>X, 5, 4, 3, 2, 1</strong>: Gold scores 5, red 4, blue 3, black 2 and white 1 points. The innermost golden ring is recorded as X.</li>
-                        <li><strong>9, 7, 5, 3, 1</strong>: Gold scores 9, red 7, blue 5, black 3 and white 1 points.</li>
-                        <li><strong>FCFS Color (Reversed 10-1)</strong>: Play scoring style where white scores 10, black 8, blue 6, red 4, outer gold 2 and the inner two gold 1. Typically shot with 6 arrows per end. Only one arrow is counted per color. The maximum achievable score is 31 points per end, when every arrow is shot into a distinct color.</li>
+                        <li><strong>9, 7, 5, 3, 1</strong>: Circulo amarillo 9 puntos, rojo 7 puntos, Azul 5 puntos, negro 3 puntos y blanco 1 punto.</li>
+                        <li><strong>Color de FCFS (invertido 10 - 1)</strong>: estilo de puntuacion del juego, donde el circulo blanco son 10 puntos, el negro 8, el azul 6, el rojo 4, el circulo amarillo exteriore son 2 puntos y el amarillo interior es 1 punto. Tirada tipica con 6 flechas por entrada. Solo se cuenta una flecha por color. La puntuación maxima obtenible es de 31 puntos, cuando cada flecha es en un color distinto.</li>
                     </ul>
                 </details>
                 <details>
                     <summary>Números de flecha</summary>
-                    <p>Además de documentar las flechas utilizadas en una formación particular, también puede anotar tiros individuales con el número de la flecha. You can enable the behaviour on a per-training basis. When you create the training you have to set the option accordingly:</p>
+                    <p>Además de documentar las flechas utilizadas en una formación particular, también puede anotar tiros individuales con el número de la flecha. You can enable the behaviour on a per-training basis. Cuando tu crees un entrenamiento deves escoger la opción acorde a ello:</p>
                     <img src="images/arrow_numbers.png" />
                 </details>
                 <details>
                     <summary>¿que es una ronda estándar?</summary>
                     <p>A standard round is a predefined training template, which specified the exact number of rounds, ends and arrows shot per end. Additionally the distances and target faces are fixed.</p>
-                    <p>The app provides you with a variety of standard rounds that are commonly used.</p>
+                    <p>La aplicación te ofrece una variedad de rondas estándar que se utilizan.</p>
                 </details>
                 <details>
                     <summary>¿como  puedo cambiar la tamaño de diana en una ronda estándar?</summary>
-                    <p>A standard round defines only which type of target should be used, but not which exact target face. So you can adjust the target face to that one you actually use. Just tap on "Change target face" below the standard round.</p>
+                    <p>Un entrada estandar define sólo que tipo de diana se suele usar, pero no con un target face exacto. Así puede ajustar el tipo de objetivo que va ha utilizar actualmente. Just tap on "Change target face" below the standard round.</p>
                     <img src="images/change_target_face.png" />
                 </details>
             </section>
             <section> 
                 <h2>Entrada</h2>
-                <p>MyTargets admite un trazado de flecha exacto y un modo de entrada basado en el teclado. El cambio entre ellos es posible a través de la configuración.</p>
+                <p>MyTargets supports an exact arrow plotting and a keyboard based input mode. Switching between them is possible via the settings.</p>
                 <details>
                     <summary>Trazado exacto de la flecha</summary>
                     <p>The exact arrow plotting is the default input method. To enter a shot tap and hold on the target face adjust the position until you are satisfied with the arrow position and then release the finger.</p>
@@ -117,7 +117,7 @@ <h2>Estadísticas</h2>
                 </details>
                 <details>
                     <summary>Exportando datos...</summary>
-                    <p>You can export the selected data to a *.csv file, which can be opened in a spreadsheet application like Excel. The x and y columns describe the coordinates of the shots whereby the origin 0, 0 is the center of the target and the outer border of the target is 1 unit away.</p>
+                    <p>You can export the selected data to a *.csv file, which can be opened in a spreadsheet application like Excel. Las columnas X e y describen las coordenadas de los lanzamientos donde el origen 0, 0 es el centro del blanco y el borde externo del blanco es 1 unidad de distancia.</p>
                     <img src="images/statistics_export.png" style="width:10%;"/>
                     <p><strong>Note</strong>: You can <strong>not</strong> import training data into the app. To create a backup of your data you have to use the backup and restore functionality in the settings.</p>
                 </details>
@@ -127,7 +127,7 @@ <h2>Varios</h2>
                 <p></p>
                 <details>
                     <summary>¿por qué mis flechas se sibujan muy pequeñas?</summary>
-                    <p>The size of the arrows is determined by the diameter specified in the arrow properties and the diameter of the selected target face. The arrow size is drawn in "real" size. If you do not want the arrows to be drawn in realistic sizes, you can scale the arrows artificially. Go to Settings > Input > Arrow diameter scale and adjust the scaling. In case you just want to have the arrow bigger, while placing the arrow on the target you can adjust the Target zoom level.</p>
+                    <p>The size of the arrows is determined by the diameter specified in the arrow properties and the diameter of the selected target face. The arrow size is drawn in "real" size. If you do not want the arrows to be drawn in realistic sizes, you can scale the arrows artificially. Vaya a Configuración > Input > Medida de diámetro de Flecha y ajustar la escala. In case you just want to have the arrow bigger, while placing the arrow on the target you can adjust the Target zoom level.</p>
                 </details>
                 <details>
                     <summary>¿dondes estan mis backups guardados en Google Drive?</summary>
diff --git a/app/src/main/res/raw-hu-rHU/help.html b/app/src/main/res/raw-hu-rHU/help.html
index 2870b7781..62fc94ff9 100644
--- a/app/src/main/res/raw-hu-rHU/help.html
+++ b/app/src/main/res/raw-hu-rHU/help.html
@@ -22,11 +22,11 @@
     <body>
         <main>
             <h1>Kezdjük el használni a MyTargets-t</h1>
-            <p>MyTargets lehetővé teszi, hogy minden íjász eredményt rögzíts, toll és papír használata nélkül. MyTargets három fő kategóriára tagolódik: Lövészet, Íj és Nyílvessző. A lövészetek alatt az edzések/versenyek összes rögzített információit tartalmazza. Az Íj szakaszban, az íjak tulajdonságait és beállításait rögzítheti, mint például az irányzék beállításait. Végül a Nyílvessző szakasz különböző típusú/számú nyílvesszők adatait tartalmazza.</p>
+            <p>MyTargets lehetővé teszi, hogy minden íjász eredményt rögzíts, írószer és papír használata nélkül. MyTargets három fő kategóriára tagolódik: Lövészet, Íj és Nyílvessző. A lövészetek alatt az edzések/versenyek összes rögzített információit tartalmazza. Az Íj szakaszban, az íjak tulajdonságait és beállításait rögzítheti, mint például az irányzék távolsági beállításait. Végül a Nyílvessző szakasz különböző típusú/számú nyílvesszők adatait tartalmazza.</p>
            
             <section> 
                 <h2>Lövészetek rendezése</h2>
-                <p>A Lövészet egy vagy több fordulóban van szervezve. Minden forduló egy tetszőleges számú sorozatot tartalmazhat, amely előre meghatározott számú sorozatot és nyílvesszőt kínál fel rögzítésre.</p>
+                <p>A lövészet egy vagy több fordulóra lehet állítani. Minden forduló tetszőleges számú sorozatra tagolható, a sorozatok pedig előre beállított mennyiségű vesszőt tartalmaznak.</p>
                 <details>
                     <summary>Lövészet kezdése</summary>
                     <p>Egy új lövészetet a jobbra lent lévő narancssárga + körrel kezdheti meg. Most rábökhet:</p>
@@ -48,10 +48,10 @@ <h2>Lövészetek rendezése</h2>
                         <li><strong>Recurve style (X-1)</strong>: The innermost golden ring scores 10 points, but is marked as X. The outer golden rings score 10 and 9 accordingly. The score decreases with every ring by 1.</li>
                         <li><strong>Recurve style (10-1)</strong>: Same as previous, but the inner two golden rings are shown as one ring, rewarded with 10 points (no X).</li>
                         <li><strong>Compound style</strong>: Only the innermost golden ring scores 10 points. The outermost two golden rings are shown as one and score 9 points.</li>
-                        <li><strong>11, 10, 9,..., 1</strong>: a legbelső körértéke a 11. A pontszám 1-el csökken minden gyűrűnél.</li>
+                        <li><strong>11, 10, 9, ..., 1</strong>: A legbelső körértéke a 11. A pontszám 1-el csökken minden gyűrűnél.</li>
                         <li><strong>X, 5, 4, 3, 2, 1</strong>: Az sárga találat 5, a piros 4, a kék 3, fekete 2, a fehér 1 pontot ér. A legbelső sárga találatot X-el kell jelölni.</li>
                         <li><strong>9, 7, 5, 3, 1</strong>: Sárga kör értéke 9, piros 7, kék 5, fekete 3 és a fehér 1 pont.</li>
-                        <li><strong>FCFS Color (Reversed 10-1)</strong>: Play scoring style where white scores 10, black 8, blue 6, red 4, outer gold 2 and the inner two gold 1. Szokásos lövészet 6 vessző / sorozatonként. Színenként csak egy nyílvessző értékelve. The maximum achievable score is 31 points per end, when every arrow is shot into a distinct color.</li>
+                        <li><strong>FCFS Color (Reversed 10-1)</strong>: Play scoring style where white scores 10, black 8, blue 6, red 4, outer gold 2 and the inner two gold 1. Szabványos lövészet 6 vessző / sorozatonként. Színenként csak egy nyílvessző értékelve. The maximum achievable score is 31 points per end, when every arrow is shot into a distinct color.</li>
                     </ul>
                 </details>
                 <details>
@@ -66,16 +66,16 @@ <h2>Lövészetek rendezése</h2>
                 </details>
                 <details>
                     <summary>Szabványos fordulóhoz hogy válthatom a lőlapot?</summary>
-                    <p>A standard round defines only which type of target should be used, but not which exact target face. So you can adjust the target face to that one you actually use. Csak érintse meg a "Lólap váltása" a szokásos forduló alatt.</p>
+                    <p>A standard round defines only which type of target should be used, but not which exact target face. So you can adjust the target face to that one you actually use. Csak érintse meg a "Lőlap váltása" a Szabványos forduló alatt.</p>
                     <img src="images/change_target_face.png" />
                 </details>
             </section>
             <section> 
                 <h2>Találatok rögzítése/megjelenítése</h2>
-                <p>MyTargets támogatja a találtatok pontos jelölését vagy a billentyűs bevitelt is. A beviteli módszer váltását a beállításokban teheti meg.</p>
+                <p>A MyTarteget támogatja a lövések pontos ábrázolását érintéssel vagy érték táblázat segítségével. A találatok rögzítési módja a beállításokban átváltható.</p>
                 <details>
                     <summary>Pontos nyílvessző ábrázolás</summary>
-                    <p>The exact arrow plotting is the default input method. To enter a shot tap and hold on the target face adjust the position until you are satisfied with the arrow position and then release the finger.</p>
+                    <p>Az érintéses találat jelölés az alapbeállítás. To enter a shot tap and hold on the target face adjust the position until you are satisfied with the arrow position and then release the finger.</p>
                     <img src="images/input_plotting.png"/>
                     <p><strong>Note: </strong>The finger slip detection will recognize unintended moves while releasing the finger and ignore them.</p>
                 </details>
@@ -112,7 +112,7 @@ <h2>Statisztika</h2>
                 </details>
                 <details>
                     <summary>Szűrők alkalmazása</summary>
-                    <p>You can also apply filters to your selected training data. Filtering is possible by bow, arrow, distance and target diameter.</p>
+                    <p>Különböző szűrőfeltételekkel elemezhető a lövészet eredménye. A szűrés elvégezhető az íj, vesszők, távolság vagy a lőlap szerint.</p>
                     <img src="images/statistics_filter.png" style="width:10%;"/>
                 </details>
                 <details>
@@ -130,7 +130,7 @@ <h2>Egyebek</h2>
                     <p>The size of the arrows is determined by the diameter specified in the arrow properties and the diameter of the selected target face. A vessző találati átmérője "valós" méretben történik. If you do not want the arrows to be drawn in realistic sizes, you can scale the arrows artificially. Lépjen a beállítások &gt; bemenet &gt; nyílra átmérőjű skála, és állítsa be a méretezés. In case you just want to have the arrow bigger, while placing the arrow on the target you can adjust the Target zoom level.</p>
                 </details>
                 <details>
-                    <summary>Hova tárolóbnak a mentéseim a Google Drive-on?</summary>
+                    <summary>A Google-Drive hol tárolja a mentéseim?</summary>
                     <p>A Google Drive-on a mentés az Application Data mappában tárolódik. Files stored there can only be accessed by the app, which created them. So you can only see the backups from inside the MyTargets app. The webapp of Google drive furthermore allows you to delete all your backup data (Settings > Manage Apps). When you install the app on another phone and log in with the your Google account you get access to all your backups again.</p>
                 </details>
             </section>
diff --git a/app/src/main/res/raw-in-rID/help.html b/app/src/main/res/raw-in-rID/help.html
index ea6ce792f..76f2438fa 100644
--- a/app/src/main/res/raw-in-rID/help.html
+++ b/app/src/main/res/raw-in-rID/help.html
@@ -37,21 +37,21 @@ <h2>Mengatur pelatihan</h2>
                 </details>
                 <details>
                     <summary>Pilih wajah target</summary>
-                    <p>Anda dapat memilih dari berbagai wajah target (3). Beberapa wajah target memiliki gaya skor <strong> yang berbeda </ 0> (1). Gaya skor menggambarkan skor yang terkait dengan area tertentu dari wajah target. Selain itu diameter wajah target bisa ditentukan (2). </p>
+                    <p>Anda dapat memilih dari berbagai wajah target (3). Beberapa wajah target memiliki gaya skor <strong>yang berbeda</strong> (1). Gaya skor menggambarkan skor yang terkait dengan area tertentu dari wajah target. Selain itu diameter wajah target bisa ditentukan (2). </p>
                     <img src="images/target_face_selection.png" />
-                    <p><strong> Catatan: </ 0> Diameter wajah target spot relatif terhadap target wajah target penuh. Misalnya, WA 5 Ring Spot dengan diameter 80cm di app mewakili titik di dalamnya yang sebenarnya hanya 40cm di kehidupan nyata, karena wajah WA target penuh akan memiliki 80cm.</p>
+                    <p><strong>Catatan:</strong> Diameter wajah target spot relatif terhadap target wajah target penuh. Misalnya, WA 5 Ring Spot dengan diameter 80cm di app mewakili titik di dalamnya yang sebenarnya hanya 40cm di kehidupan nyata, karena wajah WA target penuh akan memiliki 80cm.</p>
                 </details>
                 <details>
                     <summary>Gaya penilaian WA</summary>
                     <p>Berikut ini semua gaya penilaian WA dijelaskan secara lebih rinci:</p>
                     <ul>
-                        <li><strong> Gaya recurve (X-1) </ 0> : Cincin emas terdalam memiliki 10 poin, namun ditandai sebagai X. Cincin emas luar memiliki skor 10 dan 9. Skor menurun dengan setiap ring dengan 1.</li>
-                        <li><strong> Gaya recurve (10-1) </ 0> : Sama seperti sebelumnya, tapi dua cincin emas bagian dalam ditampilkan sebagai satu cincin, diberi hadiah dengan 10 poin (tidak ada X).</li>
-                        <li><strong> Gaya gabungan </ 0> : Hanya cincin emas terdalam yang nilainya 10 poin. Cincin emas terluar terbawah ditampilkan sebagai satu dan mendapat nilai 9 poin.</li>
-                        <li><strong> 11, 10, 9, ..., 1 </ 0> : Cincin terdalam skor 11. Skor menurun dengan setiap cincin dengan 1.</li>
-                        <li><strong> X, 5, 4, 3, 2, 1 </ 0> : Nilai emas 5, merah 4, biru 3, hitam 2 dan putih 1 poin. Cincin emas paling dalam dicatat sebagai X.</li>
-                        <li><strong> 9, 7, 5, 3, 1 </ 0> : Gold skor 9, merah 7, biru 5, hitam dan putih 3 1 poin.</li>
-                        <li><strong> Warna FCFS (Terbalik 10-1) </ 0> : Mainkan gaya skor di mana nilai putih 10, hitam 8, biru 6, merah 4, emas luar 2 dan emas dua bagian 1. Biasanya ditembak dengan 6 panah per ujungnya. Hanya satu panah yang dihitung per warna. Skor maksimum yang dapat dicapai adalah 31 poin per akhir, saat setiap panah ditembak menjadi warna yang berbeda.</li>
+                        <li><strong>Gaya recurve (X-1)</strong>: Cincin emas terdalam memiliki 10 poin, namun ditandai sebagai X. Cincin emas luar memiliki skor 10 dan 9. Skor menurun dengan setiap ring dengan 1.</li>
+                        <li><strong>Gaya recurve (10-1)</strong>: Sama seperti sebelumnya, tapi dua cincin emas bagian dalam ditampilkan sebagai satu cincin, diberi hadiah dengan 10 poin (tidak ada X).</li>
+                        <li><strong>Gaya gabungan</strong>: Hanya cincin emas terdalam yang nilainya 10 poin. Cincin emas terluar terbawah ditampilkan sebagai satu dan mendapat nilai 9 poin.</li>
+                        <li><strong>11, 10, 9, ..., 1</strong>: Cincin terdalam skor 11. Skor menurun dengan setiap cincin dengan 1.</li>
+                        <li><strong>X, 5, 4, 3, 2, 1</strong>: Nilai emas 5, merah 4, biru 3, hitam 2 dan putih 1 poin. Cincin emas paling dalam dicatat sebagai X.</li>
+                        <li><strong>9, 7, 5, 3, 1</strong>: Gold skor 9, merah 7, biru 5, hitam dan putih 3 1 poin.</li>
+                        <li><strong>Warna FCFS (Terbalik 10-1)</strong>: Mainkan gaya skor di mana nilai putih 10, hitam 8, biru 6, merah 4, emas luar 2 dan emas dua bagian 1. Biasanya ditembak dengan 6 panah per ujungnya. Hanya satu panah yang dihitung per warna. Skor maksimum yang dapat dicapai adalah 31 poin per akhir, saat setiap panah ditembak menjadi warna yang berbeda.</li>
                     </ul>
                 </details>
                 <details>
@@ -77,7 +77,7 @@ <h2>Memasukkan</h2>
                     <summary>Panah panah tepat</summary>
                     <p>Plot panah yang tepat adalah metode input default. Untuk memasukkan ketuk tekan dan tahan pada wajah target sesuaikan posisi sampai Anda puas dengan posisi panah dan lepaskan jari.</p>
                     <img src="images/input_plotting.png"/>
-                    <p><strong> Catatan: </ 0> Deteksi slip jari akan mengenali gerakan yang tidak diinginkan saat melepaskan jari dan mengabaikannya.</p>
+                    <p><strong>Catatan: </strong>Deteksi slip jari akan mengenali gerakan yang tidak diinginkan saat melepaskan jari dan mengabaikannya.</p>
                 </details>
                 <details>
                     <summary>Jenis keyboard</summary>
@@ -97,10 +97,10 @@ <h2>Statistik</h2>
                     <summary>Elemen statistik</summary>
                     <p>Berikut komponen UI utama yang dijelaskan:</p>
                     <ul>
-                        <li><strong> Diagram garis </ 0> : Menunjukkan nilai rata-rata per panah per akhir. Garis regresi linier oranye menunjukkan keseluruhan tren. Bagan dapat diperbesar dengan mencubit dua jari secara horizontal.</li>
-                        <li><strong> Bagan distribusi </ 0> : Menampilkan distribusi panah di antara dering yang tersedia. Jika tidak ada segmen yang dipilih, jumlah keseluruhan hit dan rindu ditampilkan. Dengan mengetuk segmen, jumlah tembakan yang tepat dalam kategori ini akan ditampilkan.</li>
-                        <li><strong> Pola dispersi </ 0> : Menampilkan semua gambar pada satu wajah target termasuk metode pengelompokan yang dipilih (dapat diubah di setelan aplikasi). Jika Anda menyentuh pola dispersi, Anda mendapatkan versi pola dispersi yang lebih besar. Dari layar detail Anda juga bisa berbagi gambar pola dispersi atau mencetaknya.</li>
-                        <li><strong> Peringkat panah </ 0> : Jika Anda telah menggunakan fitur penomoran panah di salah satu pelatihan yang dipilih, peringkat panah ditunjukkan di bawah ini. The arrows with the best average score are placed at the top of the list. Mengetuk nomor panah akan membawa Anda ke pola dispersi, yang hanya menampilkan gambar panah yang dipilih.</li>
+                        <li><strong>Diagram garis</strong>: Menunjukkan nilai rata-rata per panah per akhir. Garis regresi linier oranye menunjukkan keseluruhan tren. Bagan dapat diperbesar dengan mencubit dua jari secara horizontal.</li>
+                        <li><strong>Bagan distribusi</strong>: Menampilkan distribusi panah di antara dering yang tersedia. Jika tidak ada segmen yang dipilih, jumlah keseluruhan hit dan rindu ditampilkan. Dengan mengetuk segmen, jumlah tembakan yang tepat dalam kategori ini akan ditampilkan.</li>
+                        <li><strong>Pola dispersi</strong>: Menampilkan semua gambar pada satu wajah target termasuk metode pengelompokan yang dipilih (dapat diubah di setelan aplikasi). Jika Anda menyentuh pola dispersi, Anda mendapatkan versi pola dispersi yang lebih besar. Dari layar detail Anda juga bisa berbagi gambar pola dispersi atau mencetaknya.</li>
+                        <li><strong>Peringkat panah</strong>: Jika Anda telah menggunakan fitur penomoran panah di salah satu pelatihan yang dipilih, peringkat panah ditunjukkan di bawah ini. The arrows with the best average score are placed at the top of the list. Mengetuk nomor panah akan membawa Anda ke pola dispersi, yang hanya menampilkan gambar panah yang dipilih.</li>
                     </ul>
                 </details>
                 <details>
@@ -119,7 +119,7 @@ <h2>Statistik</h2>
                     <summary>Mengekspor data</summary>
                     <p>Anda dapat mengekspor data yang dipilih ke file * .csv, yang dapat dibuka dalam aplikasi spreadsheet seperti Excel. Kolom x dan y menggambarkan koordinat tembakan dimana asal 0, 0 adalah pusat target dan batas luar target berjarak 1 unit.</p>
                     <img src="images/statistics_export.png" style="width:10%;"/>
-                    <p><strong> Catatan </ 0> : Anda dapat <strong> tidak </ 0> mengimpor data pelatihan ke dalam aplikasi. Untuk membuat cadangan data Anda, Anda harus menggunakan fungsi backup dan restore dalam pengaturan.</p>
+                    <p><strong>Catatan</strong>: Anda dapat <strong>tidak</strong> mengimpor data pelatihan ke dalam aplikasi. Untuk membuat cadangan data Anda, Anda harus menggunakan fungsi backup dan restore dalam pengaturan.</p>
                 </details>
             </section>
             <section> 
diff --git a/app/src/main/res/raw-it-rIT/help.html b/app/src/main/res/raw-it-rIT/help.html
index faa01c884..e92e3bdac 100644
--- a/app/src/main/res/raw-it-rIT/help.html
+++ b/app/src/main/res/raw-it-rIT/help.html
@@ -72,7 +72,7 @@ <h2>Organize trainings</h2>
             </section>
             <section> 
                 <h2>Input</h2>
-                <p>MyTargets supporta due metodi di immissione del punteggio selezionabili dalle impostazioni: input preciso del punto di impatto della freccia e input basato su tastiera.</p>
+                <p>MyTargets supports an exact arrow plotting and a keyboard based input mode. Switching between them is possible via the settings.</p>
                 <details>
                     <summary>Exact arrow plotting</summary>
                     <p>The exact arrow plotting is the default input method. To enter a shot tap and hold on the target face adjust the position until you are satisfied with the arrow position and then release the finger.</p>
diff --git a/app/src/main/res/raw-ro-rRO/help.html b/app/src/main/res/raw-ro-rRO/help.html
index e92e3bdac..6301a27ab 100644
--- a/app/src/main/res/raw-ro-rRO/help.html
+++ b/app/src/main/res/raw-ro-rRO/help.html
@@ -21,77 +21,77 @@
     </head>
     <body>
         <main>
-            <h1>Get started with MyTargets</h1>
-            <p>MyTargets allows you to record all results of you archery training rendering pen and paper obsolete. MyTargets is divided into three main categories: Trainings, bows and arrows. Trainings contains all the information you have collected during your training sessions. The bows section is the place to document your equipment properties and settings e.g. your sight marks. And the arrows section contains information about different arrow types.</p>
+            <h1>Începeţi cu MyTargets</h1>
+            <p>MyTargets vă permite să înregistrati toate rezultatele antrenamentelor de tir cu arcul inlocuind creionul şi hârtia. Aplicatia MyTargets este împărţită în trei categorii principale: antrenamente, arcuri şi săgeţi. Antrenamentele conţin toate informaţiile pe care le-aţi colectat în timpul sesiunilor de antrenament. Secţiunea de arcuri este locul unde introduceti detalii despre echipament, proprietăţi şi setări, de exemplu valorile sistemului de ochire. In categoria săgeţi introduceti informaţii despre săgetile folosite.</p>
            
             <section> 
-                <h2>Organize trainings</h2>
+                <h2>Organizarea antrenamentelor</h2>
                 <p>A training is organized into one or multiple rounds. Each round may contain an arbitrary number of ends, whereby an end contains up to predefined number of shot arrows.</p>
                 <details>
-                    <summary>Create a training</summary>
+                    <summary>Creaţi un antrenament</summary>
                     <p>To create a new training tap the orange circle at the bottom of the trainings page. Now you can select out of:</p>
                     <ul>
-                        <li><strong>Free Training</strong>: Allows you to freely set distance, target face type and diameter as well as the number of arrows you want to shot per end.</li>
+                        <li><strong>Liber</strong>: vă permite să setaţi distanta, ţinta şi diametru, precum şi numărul de săgeţi pe care doriţi să-l trageti per set.</li>
                         <li><strong>Training with Standard Round</strong>: Allows you to select from a huge number of common standard rounds. You can also define your own if none of the predefined ones fits your needs.</li>
                     </ul>
                 </details>
                 <details>
-                    <summary>Select a target face</summary>
-                    <p>You can select from a variety of target faces (3). Some target faces do have different <strong>scoring styles</strong> (1). The scoring style describes the score associated with a particular area of the target face. Additionally the diameter of the target face can be specified (2). </p>
+                    <summary>Selectaţi o faţă de ţintă</summary>
+                    <p>Aveţi posibilitatea să selectaţi dintr-o varietate de feţe de ţintă (3). Unele feţe de ţintă au diferite <strong>tipuri de notare</strong> (1). Tipul de notare descrie punctajul asociat cu o anumită zonă de pe faţa de ţintă. În plus, diametrul ţintei poate fi specificat (2). </p>
                     <img src="images/target_face_selection.png" />
-                    <p><strong>Note: </strong>The diameter of a spot target face is relative to the target face of the full target. For example a WA 5 Ring Spot with 80cm diameter in the app represents a spot in that has actually only 40cm in real-life, because the full WA target face would have 80cm.</p>
+                    <p><strong>Notă:</strong> Diametrul ţintei este relativ faţă de ţinta intreagă. De exemplu un WA 5 cercuri de 80cm în app reprezintă o tinta care are defapt numai 40cm în realitate, deoarece ţinta completă WA ar avea 80cm.</p>
                 </details>
                 <details>
-                    <summary>WA scoring styles</summary>
-                    <p>In the following all WA scoring styles are described in more detail:</p>
+                    <summary>Stilurile de notare WA</summary>
+                    <p>In cele ce urmeaza toate stilurile de notare WA sunt descrise în detaliu:</p>
                     <ul>
                         <li><strong>Recurve style (X-1)</strong>: The innermost golden ring scores 10 points, but is marked as X. The outer golden rings score 10 and 9 accordingly. The score decreases with every ring by 1.</li>
-                        <li><strong>Recurve style (10-1)</strong>: Same as previous, but the inner two golden rings are shown as one ring, rewarded with 10 points (no X).</li>
+                        <li><strong>Stilul Recurve (10-1)</strong>: ca si cel anterior, dar primele doua cercuri interioare galbene sunt prezentate ca un inel, notat cu 10 puncte (X).</li>
                         <li><strong>Compound style</strong>: Only the innermost golden ring scores 10 points. The outermost two golden rings are shown as one and score 9 points.</li>
                         <li><strong>11, 10, 9, ..., 1</strong>: The innermost ring scores 11. The score decreases with every ring by 1.</li>
                         <li><strong>X, 5, 4, 3, 2, 1</strong>: Gold scores 5, red 4, blue 3, black 2 and white 1 points. The innermost golden ring is recorded as X.</li>
-                        <li><strong>9, 7, 5, 3, 1</strong>: Gold scores 9, red 7, blue 5, black 3 and white 1 points.</li>
-                        <li><strong>FCFS Color (Reversed 10-1)</strong>: Play scoring style where white scores 10, black 8, blue 6, red 4, outer gold 2 and the inner two gold 1. Typically shot with 6 arrows per end. Only one arrow is counted per color. The maximum achievable score is 31 points per end, when every arrow is shot into a distinct color.</li>
+                        <li><strong>9, 7, 5, 3, 1</strong>: galben 9, roşu 7, albastru 5, negru 3 şi alb 1.</li>
+                        <li><strong>FCFS culoare (inversat 10 - 1)</strong>: alb 10, negru 8, albastru 6, rosu 4, galben exterior 2 şi cele doua cercuri interioare 1 punct. De obicei se trag 6 sageti pe set. Doar o săgeată este luată în calcul per culoare. Punctajul maxim realizabil este de 31 puncte pe set, când fiecare săgeată este trasă într-o culoare distinctă.</li>
                     </ul>
                 </details>
                 <details>
-                    <summary>Arrow numbering</summary>
-                    <p>Besides documenting the arrows used in a particular training, you may also annotate individual shots with the number of the arrow. You can enable the behaviour on a per-training basis. When you create the training you have to set the option accordingly:</p>
+                    <summary>Numărul săgetilor</summary>
+                    <p>Pe langa notarea săgeţile trase într-un antrenament, se poate nota individual fiecare săgeată cu număr. Aveţi posibilitatea de a vedea comportamentul fiecarei sageti intr-un antrenament. Atunci când creaţi un antrenament va trebui de asemenea să setaţi:</p>
                     <img src="images/arrow_numbers.png" />
                 </details>
                 <details>
-                    <summary>What is a Standard Round?</summary>
+                    <summary>Ce este o Runda Standard?</summary>
                     <p>A standard round is a predefined training template, which specified the exact number of rounds, ends and arrows shot per end. Additionally the distances and target faces are fixed.</p>
-                    <p>The app provides you with a variety of standard rounds that are commonly used.</p>
+                    <p>Aplicatie iti ofera o varietate de runde standard frecvent utilizate.</p>
                 </details>
                 <details>
-                    <summary>How to change the target face for a standard round?</summary>
-                    <p>A standard round defines only which type of target should be used, but not which exact target face. So you can adjust the target face to that one you actually use. Just tap on "Change target face" below the standard round.</p>
+                    <summary>Cum să schimbi ţinta pentru o rotundă standard?</summary>
+                    <p>O rundă standard defineşte numai ce tip de ţintă ar trebui să fie utilizată, nu si care dimensiune de ţintă. Deci se poate ajusta dimensiunea ţintei pe care o utilizaţi de fapt. Doar apăsaţi pe "Schimbă ţintă " din Rotundă Standard.</p>
                     <img src="images/change_target_face.png" />
                 </details>
             </section>
             <section> 
-                <h2>Input</h2>
+                <h2>Mod pozitie sageata</h2>
                 <p>MyTargets supports an exact arrow plotting and a keyboard based input mode. Switching between them is possible via the settings.</p>
                 <details>
-                    <summary>Exact arrow plotting</summary>
+                    <summary>Pozitia exacta a sagetilor</summary>
                     <p>The exact arrow plotting is the default input method. To enter a shot tap and hold on the target face adjust the position until you are satisfied with the arrow position and then release the finger.</p>
                     <img src="images/input_plotting.png"/>
-                    <p><strong>Note: </strong>The finger slip detection will recognize unintended moves while releasing the finger and ignore them.</p>
+                    <p><strong>Notă:</strong> Detectarea alunecarii degetului va fi recunoscuta si miscarile involuntare vor fi ignorate.</p>
                 </details>
                 <details>
-                    <summary>Keyboard mode</summary>
+                    <summary>Mod tastatură</summary>
                     <p>The keyboard mode as an alternative to the default detailed shot entry. In the keyboard mode you only enter the ring hit by the arrow and not its exact location.</p>
                     <img src="images/input_keyboard.png"/>
-                    <p>The left-handed setting brings the keyboard to the left side to make selection with a single hand possible.</p>
+                    <p>Setarea stângaci aduce tastatura in partea stângă pentru a face posibilă introducerea cu o singură mână.</p>
                 </details>
                 <details>
-                    <summary>Editing and deleting shots</summary>
-                    <p>To edit an already entered shot just tap on the circle on the top that shows the respective shot, then change the shot as you like. To delete the last shot you have entered press the backspace key at the top of the input screen.</p>
+                    <summary>Editarea şi ştergerea sagetilor</summary>
+                    <p>Pentru a edita valoarea unei sageti trase apasa pe cercul care arată valoarea ei, apoi modificaţi cu valoare dorita. Pentru a şterge ultima sageata introdusă apăsaţi tasta backspace din partea de sus a ecranului.</p>
                 </details>
             </section>
             <section> 
-                <h2>Statistics</h2>
+                <h2>Statistici</h2>
                 <p>The statistics allow you to get an aggregated view on your training data.</p>
                 <details>
                     <summary>Statistics elements</summary>
diff --git a/app/src/main/res/raw-tr-rTR/help.html b/app/src/main/res/raw-tr-rTR/help.html
index bf27ffa49..9083801e0 100644
--- a/app/src/main/res/raw-tr-rTR/help.html
+++ b/app/src/main/res/raw-tr-rTR/help.html
@@ -31,27 +31,27 @@ <h2>Eğitimler düzenleyin</h2>
                     <summary>Eğitim kurun</summary>
                     <p>Yeni bir eğitim oluşturmak için eğitim sayfasının altındaki turuncu renkli daireye dokunun. Şimdi arasından seçim yapabilirsiniz:</p>
                     <ul>
-                        <li><strong> Ücretsiz Eğitim </ 0>: Mesafeyi, hedef yüz türünü ve çapı ve sonuna kadar atmak istediğiniz ok sayısını serbestçe ayarlamanıza izin verir.</li>
-                        <li><strong> Standard Round ile Eğitim </ 0>: Çok sayıda ortak standart turdan seçim yapmanıza izin verir. Önceden tanımlanmış olanlardan hiçbiri ihtiyaçlarınıza uymuyorsa, kendi tanımınızı da yapabilirsiniz.</li>
+                        <li><strong>Ücretsiz Eğitim</strong>: Mesafeyi, hedef yüz türünü ve çapı ve sonuna kadar atmak istediğiniz ok sayısını serbestçe ayarlamanıza izin verir.</li>
+                        <li><strong>Standard Round ile Eğitim</strong>: Çok sayıda ortak standart turdan seçim yapmanıza izin verir. Önceden tanımlanmış olanlardan hiçbiri ihtiyaçlarınıza uymuyorsa, kendi tanımınızı da yapabilirsiniz.</li>
                     </ul>
                 </details>
                 <details>
                     <summary>Bir hedef yüz seç</summary>
-                    <p>Çeşitli hedef yüzlerinden seçim yapabilirsiniz (3). Bazı hedef yüzlerin farklı <strong> puanlama stilleri var </ 0> (1). Puanlama stili, hedef yüzün belirli bir alanıyla ilişkili puanı tanımlar. Buna ek olarak, hedef yüzün çapı belirtilebilir (2). </p>
+                    <p>Çeşitli hedef yüzlerinden seçim yapabilirsiniz (3). Bazı hedef yüzlerin farklı <strong>puanlama stilleri var</strong> (1). Puanlama stili, hedef yüzün belirli bir alanıyla ilişkili puanı tanımlar. Buna ek olarak, hedef yüzün çapı belirtilebilir (2). </p>
                     <img src="images/target_face_selection.png" />
-                    <p><strong> Not: </ 0> Nokta hedef yüzünün çapı, tam hedefin hedef yüzüne göredir. Örneğin, uygulamada 80 cm çaplı bir WA 5 Halkalı Nokta, tam WA hedef yüzünün 80 cm olmasından ötürü gerçek hayatta sadece 40 cm olan bir noktayı temsil eder.</p>
+                    <p><strong>Not: </strong>Nokta hedef yüzünün çapı, tam hedefin hedef yüzüne göredir. Örneğin, uygulamada 80 cm çaplı bir WA 5 Halkalı Nokta, tam WA hedef yüzünün 80 cm olmasından ötürü gerçek hayatta sadece 40 cm olan bir noktayı temsil eder.</p>
                 </details>
                 <details>
                     <summary>WA puanlama stilleri</summary>
                     <p>Aşağıda tüm WA puanlama stilleri daha ayrıntılı olarak açıklanmaktadır:</p>
                     <ul>
-                        <li><strong> Yineleme stili (X-1) </ 0>: En içteki altın halka puanları 10 sayı alır, ancak X olarak işaretlenmiştir. Dıştaki altın yüzükler buna göre 10 ve 9 puan alırlar. Skor her zille birlikte 1 azalır.</li>
-                        <li><strong> Recurve stili (10-1) </ 0>: Önceki ile aynıdır, ancak iç iki altın yüzük birer yüzük olarak gösterilir, 10 puanla ödüllendirilir (X yok).</li>
-                        <li><strong> Bileşik stili </ 0>: Sadece en içteki altın yüzük 10 puan alır. En dıştaki iki altın yüzük birer tane olarak gösterilir ve 9 puan alır.</li>
-                        <li><strong> 11, 10, 9, ..., 1 </ 0>: En içteki halka puanları 11. Puan, her halkayla birlikte 1 azalır.</li>
-                        <li><strong> X, 5, 4, 3, 2, 1 </>: Altın puanı 5, kırmızı 4, mavi 3, siyah 2 ve beyaz 1 puan. En içteki altın yüzük X olarak kaydedilir.</li>
-                        <li>9, 7, 5, 3, 1 </>: Altın puanı 9, kırmızı 7, mavi 5, siyah 3 ve beyaz 1 puan.</li>
-                        <li><strong> FCFS Rengi (10-1'e kadar ters çevrilmiş) </ 0>: Beyaz puanlar 10, siyah 8, mavi 6, kırmızı 4, dış altın 2 ve iç iki altın puanlama stilini oynat 1. Genellikle uç başına 6 okla vurulur. Renk başına yalnızca bir ok sayılır. Her ok ayrı bir renge çekildiğinde, ulaşılabilir maksimum skor 31'er sayıdır.</li>
+                        <li><strong>Yineleme stili (X-1)</strong>: En içteki altın halka puanları 10 sayı alır, ancak X olarak işaretlenmiştir. Dıştaki altın yüzükler buna göre 10 ve 9 puan alırlar. Skor her zille birlikte 1 azalır.</li>
+                        <li><strong>Recurve stili (10-1)</strong>: Önceki ile aynıdır, ancak iç iki altın yüzük birer yüzük olarak gösterilir, 10 puanla ödüllendirilir (X yok).</li>
+                        <li><strong>Bileşik stili</strong>: Sadece en içteki altın yüzük 10 puan alır. En dıştaki iki altın yüzük birer tane olarak gösterilir ve 9 puan alır.</li>
+                        <li><strong>11, 10, 9, ..., 1</strong>: En içteki halka puanları 11. Puan, her halkayla birlikte 1 azalır.</li>
+                        <li><strong>X, 5, 4, 3, 2, 1</strong>: Altın puanı 5, kırmızı 4, mavi 3, siyah 2 ve beyaz 1 puan. En içteki altın yüzük X olarak kaydedilir.</li>
+                        <li><strong>9, 7, 5, 3, 1</strong>: Altın puanı 9, kırmızı 7, mavi 5, siyah 3 ve beyaz 1 puan.</li>
+                        <li><strong>FCFS Rengi (10-1'e kadar ters çevrilmiş)</strong>: Beyaz puanlar 10, siyah 8, mavi 6, kırmızı 4, dış altın 2 ve iç iki altın puanlama stilini oynat 1. Genellikle uç başına 6 okla vurulur. Renk başına yalnızca bir ok sayılır. Her ok ayrı bir renge çekildiğinde, ulaşılabilir maksimum skor 31'er sayıdır.</li>
                     </ul>
                 </details>
                 <details>
@@ -77,7 +77,7 @@ <h2>Giriş</h2>
                     <summary>Kesin ok komplo</summary>
                     <p>Tam ok çizimi varsayılan giriş yöntemidir. Bir atış girmek için hedef yüzünde tutun ve basılı tutun, ok konumundan memnun kalana kadar konumu ayarlayın ve parmak serbest bırakın.</p>
                     <img src="images/input_plotting.png"/>
-                    <p><strong> Not: </ 0> Parmak kayması algılama, parmağınızı bırakırken istenmeyen hareketleri tanıyacak ve parantezleri yok sayacaktır.</p>
+                    <p><strong>Not: </strong>Parmak kayması algılama, parmağınızı bırakırken istenmeyen hareketleri tanıyacak ve parantezleri yok sayacaktır.</p>
                 </details>
                 <details>
                     <summary>Klavye modu</summary>
@@ -97,10 +97,10 @@ <h2>Istatistik</h2>
                     <summary>İstatistik öğeleri</summary>
                     <p>Aşağıda ana UI bileşenleri açıklanmaktadır:</p>
                     <ul>
-                        <li><strong> Çizgi grafik </ 0>: Her bir ok başına ortalama puanı gösterir. Turuncu doğrusal regresyon çizgisi genel eğilimi göstermektedir. Grafiği, iki parmağınızı yatay olarak sıkıştırarak büyütülebilir.</li>
-                        <li><strong> Dağıtım grafiği </ 0>: Mevcut halkalar arasında okların dağılımını gösterir. Hiçbir segment seçilmezse, toplam isabet ve kaçırma sayısı gösterilir. Bir segmente dokunarak bu kategorideki kesin çekim sayısı gösterilir.</li>
-                        <li><strong> Dağılım deseni </ 0>: Seçilen gruplama yöntemi de dahil olmak üzere tek bir hedef yüzdeki tüm çekimleri gösterir (uygulamanın ayarlarında değiştirilebilir). Dağılım modeline dokunduğunuzda dağılım modelinin daha büyük bir versiyonunu elde edersiniz. Ayrıntılar ekranından, dağılım deseni görüntüsünü paylaşabilir veya yazdırabilirsiniz.</li>
-                        <li><strong> Ok Sıralama </ 0>: Seçilen eğitimlerden birinde ok numaralandırma özelliğini kullandıysanız, ok sıralaması aşağıda gösterilmiştir. The arrows with the best average score are placed at the top of the list. Bir ok numarasına dokunmak, sizi yalnızca seçilen okun çekimlerini gösteren bir dağılım modeline götürür.</li>
+                        <li><strong>Çizgi grafik</strong>: Her bir ok başına ortalama puanı gösterir. Turuncu doğrusal regresyon çizgisi genel eğilimi göstermektedir. Grafiği, iki parmağınızı yatay olarak sıkıştırarak büyütülebilir.</li>
+                        <li><strong>Dağıtım grafiği</strong>: Mevcut halkalar arasında okların dağılımını gösterir. Hiçbir segment seçilmezse, toplam isabet ve kaçırma sayısı gösterilir. Bir segmente dokunarak bu kategorideki kesin çekim sayısı gösterilir.</li>
+                        <li><strong>Dağılım deseni</strong>: Seçilen gruplama yöntemi de dahil olmak üzere tek bir hedef yüzdeki tüm çekimleri gösterir (uygulamanın ayarlarında değiştirilebilir). Dağılım modeline dokunduğunuzda dağılım modelinin daha büyük bir versiyonunu elde edersiniz. Ayrıntılar ekranından, dağılım deseni görüntüsünü paylaşabilir veya yazdırabilirsiniz.</li>
+                        <li><strong>Ok Sıralama</strong>: Seçilen eğitimlerden birinde ok numaralandırma özelliğini kullandıysanız, ok sıralaması aşağıda gösterilmiştir. The arrows with the best average score are placed at the top of the list. Bir ok numarasına dokunmak, sizi yalnızca seçilen okun çekimlerini gösteren bir dağılım modeline götürür.</li>
                     </ul>
                 </details>
                 <details>
@@ -119,7 +119,7 @@ <h2>Istatistik</h2>
                     <summary>Verileri dışa aktarma</summary>
                     <p>Seçilen verileri Excel gibi bir elektronik tablo uygulamasında açılabilen bir *.csv dosyasına aktarabilirsiniz. X ve y sütunları, çekimin koordinatlarını tanımlar, burada 0, 0 kökeni hedefin merkezi ve hedefin dış kenarı 1 birim uzaklıktadır.</p>
                     <img src="images/statistics_export.png" style="width:10%;"/>
-                    <p><strong> Not </ 0>: Antrenman verilerini uygulamaya içe aktaramazsınız <strong> </ 0>. Verilerinizin yedeğini oluşturmak için, ayarlardaki yedekleme ve geri yükleme işlevini kullanmanız gerekir.</p>
+                    <p><strong>Not</strong>: Antrenman verilerini uygulamaya içe <strong>aktaramazsınız</strong>. Verilerinizin yedeğini oluşturmak için, ayarlardaki yedekleme ve geri yükleme işlevini kullanmanız gerekir.</p>
                 </details>
             </section>
             <section> 
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index ba9c0e5c2..83e5f84f0 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -364,5 +364,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 7fd6760c4..80e601e5d 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -16,93 +16,93 @@
   -->
 <resources>
   <!-- General -->
-  <string name="preferences">Options</string>
+  <string name="preferences">خيارات</string>
   <string name="settings">Settings</string>
-  <string name="prev">Previous</string>
-  <string name="next">Next</string>
-  <string name="save">Save</string>
-  <string name="custom">Custom</string>
-  <string name="training">Training</string>
-  <string name="bow">Bow</string>
-  <string name="arrow">Arrow</string>
-  <string name="round">Round</string>
-  <string name="points">Points</string>
-  <string name="passe">End</string>
+  <string name="prev">السابق</string>
+  <string name="next">اللاحق</string>
+  <string name="save">حفظ</string>
+  <string name="custom">تخصيص</string>
+  <string name="training">التمرين</string>
+  <string name="bow">القوس</string>
+  <string name="arrow">السهم</string>
+  <string name="round">جولة</string>
+  <string name="points">النقاط</string>
+  <string name="passe">النهاية</string>
   <!-- Overview -->
   <string name="new_training">تمرين جديد</string>
   <string name="new_bow">قوس جديد</string>
-  <string name="new_arrow">New arrow</string>
-  <string name="new_round">New round</string>
+  <string name="new_arrow">سهم جديد</string>
+  <string name="new_round">جولة جديدة</string>
   <plurals name="training_selected">
-    <item quantity="zero">%d trainings selected</item>
-    <item quantity="one">%d training selected</item>
-    <item quantity="two">%d trainings selected</item>
-    <item quantity="few">%d trainings selected</item>
-    <item quantity="many">%d trainings selected</item>
-    <item quantity="other">%d trainings selected</item>
+    <item quantity="zero">%d تمرين محدد</item>
+    <item quantity="one">%d تمرين محدد</item>
+    <item quantity="two">%d تمارين محددة</item>
+    <item quantity="few">%d تمارين محددة</item>
+    <item quantity="many">%d تمارين محددة</item>
+    <item quantity="other">%d تمارين محددة</item>
   </plurals>
   <plurals name="bow_selected">
-    <item quantity="zero">%d bows selected</item>
-    <item quantity="one">%d bow selected</item>
-    <item quantity="two">%d bows selected</item>
-    <item quantity="few">%d bows selected</item>
-    <item quantity="many">%d bows selected</item>
-    <item quantity="other">%d bows selected</item>
+    <item quantity="zero">%d قوس محدد</item>
+    <item quantity="one">%d قوس محدد</item>
+    <item quantity="two">%d أقواس محددة</item>
+    <item quantity="few">%d أقواس محددة</item>
+    <item quantity="many">%d أقواس محددة</item>
+    <item quantity="other">%d أقواس محددة</item>
   </plurals>
   <plurals name="arrow_selected">
-    <item quantity="zero">%d arrows selected</item>
-    <item quantity="one">%d arrow selected</item>
-    <item quantity="two">%d arrows selected</item>
-    <item quantity="few">%d arrows selected</item>
-    <item quantity="many">%d arrows selected</item>
-    <item quantity="other">%d arrows selected</item>
+    <item quantity="zero">%d سهم محدد</item>
+    <item quantity="one">%d سهم محدد</item>
+    <item quantity="two">%d أسهم محددة</item>
+    <item quantity="few">%d أسهم محددة</item>
+    <item quantity="many">%d أسهم محددة</item>
+    <item quantity="other">%d أسهم محددة</item>
   </plurals>
   <plurals name="passe_selected">
-    <item quantity="zero">%d ends selected</item>
-    <item quantity="one">%d end selected</item>
-    <item quantity="two">%d ends selected</item>
-    <item quantity="few">%d ends selected</item>
-    <item quantity="many">%d ends selected</item>
-    <item quantity="other">%d ends selected</item>
+    <item quantity="zero">%d نهاية محددة</item>
+    <item quantity="one">%d نهاية محددة</item>
+    <item quantity="two">%d نهايات محددة</item>
+    <item quantity="few">%d نهايات محددة</item>
+    <item quantity="many">%d نهايات محددة</item>
+    <item quantity="other">%d نهايات محددة</item>
   </plurals>
-  <string name="edit">Edit</string>
-  <string name="delete">Delete</string>
-  <string name="statistic">Statistic</string>
+  <string name="edit">تحرير</string>
+  <string name="delete">حذف</string>
+  <string name="statistic">الإحصائيات</string>
   <!-- Share -->
-  <string name="share">Share</string>
-  <string name="dispersion_pattern">Dispersion pattern</string>
-  <string name="sharing_failed">Sharing failed!</string>
+  <string name="share">مشاركة</string>
+  <string name="dispersion_pattern">نمك التوزيع</string>
+  <string name="sharing_failed">فشلت المشاركة!</string>
   <!-- Export -->
-  <string name="send_exported">Send exported data</string>
-  <string name="exporting_failed">Exporting failed!</string>
+  <string name="send_exported">إرسال البيانات التي تم إصدارها</string>
+  <string name="exporting_failed">فشل في إصدار البيانات!</string>
   <!-- New bow -->
-  <string name="add_bow">Add bow</string>
-  <string name="name">Name</string>
-  <string name="bow_type">Bow type</string>
-  <string name="properties">Properties</string>
-  <string name="brand">Brand</string>
-  <string name="size">Size</string>
-  <string name="description">Description</string>
+  <string name="add_bow">أضف قوس</string>
+  <string name="name">الإسم</string>
+  <string name="bow_type">نوع القوس</string>
+  <string name="properties">الخصائص</string>
+  <string name="brand">الماركة</string>
+  <string name="size">المقاس</string>
+  <string name="description">التفاصيل</string>
   <string name="height">Brace height</string>
   <string name="tiller">Tiller</string>
-  <string name="sight_settings">Sight settings</string>
-  <string name="add">Add</string>
-  <string name="take_picture">Take a picture</string>
-  <string name="pick_from_gallery">Select a picture from gallery</string>
+  <string name="sight_settings">إعدادات النيشان</string>
+  <string name="add">أضف</string>
+  <string name="take_picture">التقط صورة</string>
+  <string name="pick_from_gallery">اختر صورة من الألبوم</string>
   <!-- New arrow -->
-  <string name="add_arrow">Add arrow</string>
-  <string name="length">Length</string>
-  <string name="spine">Spine</string>
-  <string name="weight">Weight</string>
-  <string name="vanes">Vanes</string>
+  <string name="add_arrow">أضف سهم</string>
+  <string name="length">الطول</string>
+  <string name="spine">درجة الالتواء</string>
+  <string name="weight">الوزن</string>
+  <string name="vanes">ريش السهم</string>
   <string name="nock">Nock</string>
-  <string name="material">Material</string>
+  <string name="material">مادة الصنع</string>
   <!-- New round -->
-  <string name="title">Title</string>
-  <string name="outdoor">Outdoor</string>
-  <string name="indoor">Indoor</string>
-  <string name="distance">Distance</string>
-  <string name="format">Format</string>
+  <string name="title">العنوان</string>
+  <string name="outdoor">رماية خارجية</string>
+  <string name="indoor">رماية داخلية</string>
+  <string name="distance">المسافة</string>
+  <string name="format">التنسيق</string>
   <!-- x ends of y arrows -->
   <plurals name="passe">
     <item quantity="zero">%d ends</item>
@@ -112,113 +112,113 @@
     <item quantity="many">%d ends</item>
     <item quantity="other">%d ends</item>
   </plurals>
-  <string name="with">of</string>
+  <string name="with">من</string>
   <plurals name="arrow">
-    <item quantity="zero">%d arrows</item>
-    <item quantity="one">%d arrow</item>
-    <item quantity="two">%d arrows</item>
-    <item quantity="few">%d arrows</item>
-    <item quantity="many">%d arrows</item>
-    <item quantity="other">%d arrows</item>
+    <item quantity="zero">ولا سهم</item>
+    <item quantity="one">سهم واحد</item>
+    <item quantity="two">سهمان</item>
+    <item quantity="few">%d أسهم</item>
+    <item quantity="many">%d أسهم</item>
+    <item quantity="other">%d أسهم</item>
   </plurals>
-  <string name="target_face">Target face</string>
+  <string name="target_face">ورقة الهدف</string>
   <!-- Scoreboard -->
-  <string name="scoreboard">Scoreboard</string>
-  <string name="arrows">Arrows</string>
-  <string name="sum">Score</string>
+  <string name="scoreboard">لوحة النقاط</string>
+  <string name="arrows">أسهم</string>
+  <string name="sum">مجموع النقاط</string>
   <string name="carry">R.Total</string>
-  <string name="action_print">Print</string>
-  <string name="average">Average</string>
+  <string name="action_print">طباعة</string>
+  <string name="average">المتوسط</string>
   <!-- Input mode -->
-  <string name="comment">Comment</string>
+  <string name="comment">تعليق</string>
   <!-- Statistics -->
   <!-- Import/Backup -->
-  <string name="select_a_file">Select a file</string>
-  <string name="dir_not_created">Directory could not be created!</string>
-  <string name="import_failed">Import failed!</string>
-  <string name="file_not_found">File not found!</string>
-  <string name="failed_reading_file">Failed reading file!</string>
+  <string name="select_a_file">اختر ملف</string>
+  <string name="dir_not_created">لايمكن إنشاء المجلد!</string>
+  <string name="import_failed">فشل في الاستيراد!</string>
+  <string name="file_not_found">الملف غير موجود!</string>
+  <string name="failed_reading_file">فشل في قراءة الملف!</string>
   <!-- Donate -->
-  <string name="donate_2">Donate me a burger</string>
-  <string name="donate_5">Donate me a kebab</string>
-  <string name="donate_10">Donate me a large pizza</string>
-  <string name="donate_20">Donate me some fuel</string>
-  <string name="donation_thank">Thank you for your support!</string>
-  <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
+  <string name="donate_2">تبرع ببرغر</string>
+  <string name="donate_5">تبرع بكباب</string>
+  <string name="donate_10">تبرع ببيتزا كبيرة</string>
+  <string name="donate_20">تبرع بوقود</string>
+  <string name="donation_thank">شكرا على دعمك!</string>
+  <string name="donate_text" formatted="false">المبالغ تتضمن الضريبة و 30% تكاليف شركة Google. بدلا من ذلك يمكنك التبرع عن طريق Paypal إلى الحساب dreier.florian@gmail.com.</string>
   <!-- Timer -->
-  <string name="timer">Timer</string>
-  <string name="touch_to_start">Touch to start</string>
-  <string name="preparation">Get ready</string>
-  <string name="shooting">Shooting</string>
+  <string name="timer">المؤقت</string>
+  <string name="touch_to_start">اضغط للبدء</string>
+  <string name="preparation">استعد</string>
+  <string name="shooting">رماية</string>
   <!-- Timer settings -->
-  <string name="timer_shooting_time">Shooting Time</string>
-  <string name="timer_waiting_time">Prepare Time</string>
-  <string name="timer_warning_time">Warning Time</string>
-  <string name="timer_sound">Sound</string>
-  <string name="timer_vibrate">Vibrate</string>
+  <string name="timer_shooting_time">وقت الرماية</string>
+  <string name="timer_waiting_time">وقت التجهز</string>
+  <string name="timer_warning_time">وقت التحذير</string>
+  <string name="timer_sound">صوت</string>
+  <string name="timer_vibrate">اهتزار</string>
   <!-- Settings -->
-  <string name="backup_action">Backup</string>
-  <string name="import_action">Import</string>
-  <string name="exports_as_csv">Exports as csv</string>
-  <string name="licences">Open Source-Licences</string>
-  <string name="licences_summary">Legal notes to licences</string>
-  <string name="version">Version %s</string>
+  <string name="backup_action">النسخ الاحتياطي</string>
+  <string name="import_action">استيراد</string>
+  <string name="exports_as_csv">تصدير البيانات بصيغة csv</string>
+  <string name="licences">ترخيص مفتوح المصدر</string>
+  <string name="licences_summary">الملاحظات القانونية للرخص</string>
+  <string name="version">الإصدار %s</string>
   <plurals name="second">
-    <item quantity="zero">%d seconds</item>
-    <item quantity="one">%d second</item>
-    <item quantity="two">%d seconds</item>
-    <item quantity="few">%d seconds</item>
-    <item quantity="many">%d seconds</item>
-    <item quantity="other">%d seconds</item>
+    <item quantity="zero">%d ثانية</item>
+    <item quantity="one">ثانية واحدة</item>
+    <item quantity="two">ثانيتين</item>
+    <item quantity="few">%d ثواني</item>
+    <item quantity="many">%d ثواني</item>
+    <item quantity="other">%d ثواني</item>
   </plurals>
-  <string name="info">Information</string>
-  <string name="data">Data</string>
-  <string name="weather">Weather</string>
-  <string name="environment">Environment</string>
-  <string name="wind_speed">Wind speed</string>
-  <string name="wind_direction">Wind direction</string>
-  <string name="sight_setting_removed">Sight setting deleted!</string>
-  <string name="metric">Metric</string>
-  <string name="imperial">Imperial</string>
-  <string name="undo">Undo</string>
-  <string name="standard_rounds">Standard rounds</string>
-  <string name="expand_collapse">Expand/Collapse</string>
-  <string name="new_round_template">New template</string>
-  <string name="arrow_numbers">Arrow numbers</string>
-  <string name="round_removed">Round deleted!</string>
-  <string name="custom_round">Custom round</string>
-  <string name="filter">Filter</string>
-  <string name="club">Club</string>
-  <string name="target">Target</string>
-  <string name="standard_round">Standard round</string>
-  <string name="use_as_template">Use as template?</string>
-  <string name="create_copy">This is a standard round!\nDo you want to create a copy in order to edit it?</string>
-  <string name="practice">Practice</string>
-  <string name="edit_training">Edit Training</string>
-  <string name="edit_standard_round">Edit Standard Round</string>
+  <string name="info">معلومات</string>
+  <string name="data">البيانات</string>
+  <string name="weather">الطقس</string>
+  <string name="environment">البيئة</string>
+  <string name="wind_speed">سرعة الرياح</string>
+  <string name="wind_direction">اتجاه الريح</string>
+  <string name="sight_setting_removed">تم حذف إعدادات النيشان!</string>
+  <string name="metric">متري</string>
+  <string name="imperial">إمبراطورية</string>
+  <string name="undo">تراجع</string>
+  <string name="standard_rounds">خولات اعتيادية</string>
+  <string name="expand_collapse">تكبير\تصغير</string>
+  <string name="new_round_template">قالب جديد</string>
+  <string name="arrow_numbers">أرقام الأسهم</string>
+  <string name="round_removed">تم حذف الجولة!</string>
+  <string name="custom_round">جولة خاصة</string>
+  <string name="filter">مصفي</string>
+  <string name="club">النادي</string>
+  <string name="target">الهدف</string>
+  <string name="standard_round">خولات اعتيادية</string>
+  <string name="use_as_template">هل تريد استخدامه كالقالب أساسي؟</string>
+  <string name="create_copy">هذه جولة اعتيادية!\n هل تريد نسجها لتتمكن من التعديل عليها؟</string>
+  <string name="practice">تدريب</string>
+  <string name="edit_training">تحرير التدريب</string>
+  <string name="edit_standard_round">تحرير الجولة الاعتيادية</string>
   <plurals name="arrow_deleted">
-    <item quantity="zero">%d arrows deleted</item>
-    <item quantity="one">%d arrow deleted</item>
-    <item quantity="two">%d arrows deleted</item>
-    <item quantity="few">%d arrows deleted</item>
-    <item quantity="many">%d arrows deleted</item>
-    <item quantity="other">%d arrows deleted</item>
+    <item quantity="zero">لم يتم حذف أي سهم</item>
+    <item quantity="one">تم حذف سهم واحد</item>
+    <item quantity="two">تم حذف سهمان</item>
+    <item quantity="few">تم حذف %d أسهم</item>
+    <item quantity="many">تم حذف %d أسهم</item>
+    <item quantity="other">تم حذف %d أسهم</item>
   </plurals>
   <plurals name="bow_deleted">
-    <item quantity="zero">%d bows deleted</item>
-    <item quantity="one">%d bow deleted</item>
-    <item quantity="two">%d bows deleted</item>
-    <item quantity="few">%d bows deleted</item>
-    <item quantity="many">%d bows deleted</item>
-    <item quantity="other">%d bows deleted</item>
+    <item quantity="zero">لم يتم حذف أي قوس</item>
+    <item quantity="one">تم حذف قوس واحد</item>
+    <item quantity="two">تم حذف قوسان</item>
+    <item quantity="few">تم حذف %d أقواس</item>
+    <item quantity="many">تم حذف %d أقواس</item>
+    <item quantity="other">تم حذف %d أقواس</item>
   </plurals>
   <plurals name="training_deleted">
-    <item quantity="zero">%d trainings deleted</item>
-    <item quantity="one">%d training deleted</item>
-    <item quantity="two">%d trainings deleted</item>
-    <item quantity="few">%d trainings deleted</item>
-    <item quantity="many">%d trainings deleted</item>
-    <item quantity="other">%d trainings deleted</item>
+    <item quantity="zero">لم يتم حذف أي تمرين</item>
+    <item quantity="one">تم حذف تمرين واحد</item>
+    <item quantity="two">تم حذف تمرينان</item>
+    <item quantity="few">تم حذف %d تمارين</item>
+    <item quantity="many">تم حذف %d تمارين</item>
+    <item quantity="other">تم حذف %d تمارين</item>
   </plurals>
   <plurals name="passe_deleted">
     <item quantity="zero">%d ends deleted</item>
@@ -229,158 +229,158 @@
     <item quantity="other">%d ends deleted</item>
   </plurals>
   <plurals name="rounds">
-    <item quantity="zero">Round %d</item>
-    <item quantity="one">Round %d</item>
-    <item quantity="two">Round %d</item>
-    <item quantity="few">Round %d</item>
-    <item quantity="many">Round %d</item>
-    <item quantity="other">Round %d</item>
+    <item quantity="zero">الجولة %d</item>
+    <item quantity="one">الجولة %d</item>
+    <item quantity="two">الجولة %d</item>
+    <item quantity="few">الجولة %d</item>
+    <item quantity="many">الجولة %d</item>
+    <item quantity="other">الجولة %d</item>
   </plurals>
   <plurals name="round_selected">
-    <item quantity="zero">%d rounds selected</item>
-    <item quantity="one">%d round selected</item>
-    <item quantity="two">%d rounds selected</item>
-    <item quantity="few">%d rounds selected</item>
-    <item quantity="many">%d rounds selected</item>
-    <item quantity="other">%d rounds selected</item>
+    <item quantity="zero">لم يتم تحديد أي جولة</item>
+    <item quantity="one">تم تحديد جولة واحدة</item>
+    <item quantity="two">تم تحديد جولتان</item>
+    <item quantity="few">تم تحديد %d جولات</item>
+    <item quantity="many">تم تحديد %d جولات</item>
+    <item quantity="other">تم تحديد %d جولات</item>
   </plurals>
   <plurals name="round_deleted">
-    <item quantity="zero">%d rounds deleted</item>
-    <item quantity="one">%d round deleted</item>
-    <item quantity="two">%d rounds deleted</item>
-    <item quantity="few">%d rounds deleted</item>
-    <item quantity="many">%d rounds deleted</item>
-    <item quantity="other">%d rounds deleted</item>
+    <item quantity="zero">لم يتم حذف أي جولة</item>
+    <item quantity="one">تم حذف جولة واحدة</item>
+    <item quantity="two">تم حذف جولتان</item>
+    <item quantity="few">تم حذف %d جولات</item>
+    <item quantity="many">تم حذف %d جولات</item>
+    <item quantity="other">تم حذف %d جولات</item>
   </plurals>
-  <string name="date">Date</string>
-  <string name="edit_round">Edit round</string>
-  <string name="draw_weight">Draw weight</string>
-  <string name="sight">Sight</string>
+  <string name="date">تاريخ</string>
+  <string name="edit_round">تحرير جولة</string>
+  <string name="draw_weight">وزن السحبة</string>
+  <string name="sight">نيشان</string>
   <string name="limbs">Limbs</string>
-  <string name="my_bow">My bow</string>
-  <string name="my_arrow">My arrow</string>
-  <string name="tip_weight">Tip weight</string>
-  <string name="arrow_ranking">Arrow ranking</string>
-  <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
-  <string name="display">Display</string>
-  <string name="print">Print</string>
-  <string name="table">Table</string>
-  <string name="comments">Comments</string>
-  <string name="show_points_colored">Show points colored</string>
-  <string name="stabilizer">Stabilizer</string>
+  <string name="my_bow">قوسي</string>
+  <string name="my_arrow">سهمي</string>
+  <string name="tip_weight">وزن رأس السهم</string>
+  <string name="arrow_ranking">ترتيب السهم</string>
+  <string name="arrow_x_of_set_of_arrows">السهم %1$s من مجموعة الأسهم %2$s</string>
+  <string name="display">عرض</string>
+  <string name="print">طباعة</string>
+  <string name="table">الجدول</string>
+  <string name="comments">تعليقات</string>
+  <string name="show_points_colored">إظهار النقاط ملونة</string>
+  <string name="stabilizer">الموازن</string>
   <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Arrow number %s</string>
-  <string name="training_with_standard_round">Training with Standard Round</string>
-  <string name="free_training">Free Training</string>
-  <string name="competition">Competition</string>
-  <string name="about">About</string>
-  <string name="general">General</string>
-  <string name="contribute">Contribute</string>
-  <string name="connect">Connect</string>
-  <string name="special_thanks_to">Special thanks to</string>
-  <string name="all_translators">All guys, who helped translating the app!</string>
-  <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
-  <string name="test_beta">Test the latest beta version</string>
-  <string name="join_on_google_plus">Join us on Google+</string>
-  <string name="share_with_friends">Share with your friends</string>
-  <string name="donate">Donate</string>
-  <string name="donate_via_paypal">Donate via PayPal</string>
-  <string name="translate_crowdin">Translate on Crowdin</string>
-  <string name="network_linkedin">Network on LinkedIn</string>
-  <string name="search">Search</string>
+  <string name="arrow_number_x">السهم رقم %s</string>
+  <string name="training_with_standard_round">التدرب بجولات اعتيادية</string>
+  <string name="free_training">تدريب حر</string>
+  <string name="competition">مسابقة</string>
+  <string name="about">حول البرنامج</string>
+  <string name="general">عام</string>
+  <string name="contribute">ساهم</string>
+  <string name="connect">تواصل</string>
+  <string name="special_thanks_to">شكر خاص إلى</string>
+  <string name="all_translators">كل الأشخاص الذين ساهموا في ترجمة هذا البرنامج!</string>
+  <string name="all_beta_testers">كل من ساهم في تجربة نسخ البرنامج التجريبية مما أدى إلى استمرارية تطور البرنامج.</string>
+  <string name="test_beta">قم بتجربة آخر نسخة تجريبية</string>
+  <string name="join_on_google_plus">انضم إلينا على Google+</string>
+  <string name="share_with_friends">شارك مع أصدقائك</string>
+  <string name="donate">تبرع</string>
+  <string name="donate_via_paypal">التبرع عن طريق Paypal</string>
+  <string name="translate_crowdin">ترجم عبر Crowdin</string>
+  <string name="network_linkedin">تواصل عبر LinkedIn</string>
+  <string name="search">البحث</string>
   <string name="us">US</string>
-  <string name="show_shots_training">Whole training</string>
-  <string name="show_shots_round">Current round</string>
+  <string name="show_shots_training">التمرين بالكامل</string>
+  <string name="show_shots_round">الجولة الحالية</string>
   <string name="show_shots_end">Current end</string>
-  <string name="profile">Profile</string>
-  <string name="birthday">Birthday</string>
-  <string name="first_name">First name</string>
-  <string name="last_name">Last name</string>
-  <string name="age">Age</string>
-  <string name="show_signature">Signature</string>
-  <string name="archer">Archer</string>
-  <string name="hits">Hits</string>
-  <string name="misses">Misses</string>
+  <string name="profile">الملف الشخصي</string>
+  <string name="birthday">تاريخ الميلاد</string>
+  <string name="first_name">الإسم الأول</string>
+  <string name="last_name">اسم العائلة</string>
+  <string name="age">العمر</string>
+  <string name="show_signature">التوقيع</string>
+  <string name="archer">الرامي</string>
+  <string name="hits">الإصابات</string>
+  <string name="misses">الإخفاقات</string>
   <string name="new_end">New end</string>
-  <string name="distribution">Distribution</string>
-  <string name="count">Count</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Target zoom level</string>
+  <string name="distribution">توزيع</string>
+  <string name="count">عد</string>
+  <string name="diameter">قطر</string>
+  <string name="input">إدخال</string>
+  <string name="target_zoom">درجة تكبير الهدف</string>
   <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">Arrow diameter scale</string>
-  <string name="timestamp">Timestamp</string>
-  <string name="change_target_face">Change target face</string>
-  <string name="your_first_training">Your first training</string>
-  <string name="grouping">Grouping</string>
-  <string name="show_clusters">Clusters</string>
-  <string name="first_training_description">Tap the plus to start a new training.</string>
-  <string name="show_average">Average</string>
-  <string name="show_none">None</string>
-  <string name="left_handed">Left-handed</string>
-  <string name="right_handed">Right-handed</string>
-  <string name="keyboard">Keyboard</string>
-  <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
-  <string name="backup_now">Backup now</string>
-  <string name="last_backup">Last backup: %s</string>
-  <string name="recent_backups">Recent backups</string>
-  <string name="dialog_restore_title">Revert to previous version</string>
-  <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
-  <string name="backup_details">Backup details</string>
-  <string name="restore">Restore</string>
-  <string name="backup_location">Backup location</string>
-  <string name="internal_storage">Internal storage</string>
-  <string name="automatic_backup">Automatic backup</string>
-  <string name="restoring">Restoring backup…</string>
-  <string name="restore_failed">Restore failed</string>
-  <string name="delete_failed">Deletion failed</string>
-  <string name="backup_restore_desc">Backup and restore app data</string>
-  <string name="exporting">Exporting…</string>
-  <string name="loading_backups_failed">Loading backups failed!</string>
-  <string name="external_storage">External storage</string>
-  <string name="backup_interval">Backup interval</string>
-  <string name="daily">Daily</string>
-  <string name="weekly">Weekly</string>
-  <string name="monthly">Monthly</string>
-  <string name="connection_failed">Connection failed!</string>
-  <string name="shooting_indoor">Shooting indoor</string>
-  <string name="bow_rest_vertical_position">Vertical position</string>
+  <string name="arrow_diameter_scale">مقياس قطر السهم</string>
+  <string name="timestamp">التوقيت</string>
+  <string name="change_target_face">غير ورقة الهدف</string>
+  <string name="your_first_training">تمريبك الأمر</string>
+  <string name="grouping">التجميع</string>
+  <string name="show_clusters">المجموعات</string>
+  <string name="first_training_description">اضغط علامة الزائد لبدء تمرين جديد.</string>
+  <string name="show_average">المتوسط</string>
+  <string name="show_none">لا شيء</string>
+  <string name="left_handed">أعسر</string>
+  <string name="right_handed">أيمن</string>
+  <string name="keyboard">لوحة المفاتيح</string>
+  <string name="backup_drive_desc">النسخ الاحتياطي لبياناتك يسمح لك باستعادة جميع بيانات تمارينك الخاصة في حال فقدت أو غيّرت هاتفك.</string>
+  <string name="backup_now">قُم بالنسخ الاحتياطي الآن</string>
+  <string name="last_backup">آخر نسخ احتياطي: %s</string>
+  <string name="recent_backups">النسخ الاحتياطية الأخيرة</string>
+  <string name="dialog_restore_title">العودة إلى الإصدار السابق</string>
+  <string name="restore_desc">عند استعادة النسخة الاحتياطية سيتم استبدال كل البيانات الحالية ببيانات النسخة الاحتياطية.</string>
+  <string name="backup_details">تفاصيل النسخ الاحتياطي</string>
+  <string name="restore">استرجاع النسخة الإحتياطية</string>
+  <string name="backup_location">موقع النسخة الاحتياطية</string>
+  <string name="internal_storage">الذاكرة الداخلية</string>
+  <string name="automatic_backup">النسخ الاحتياطي التلقائي</string>
+  <string name="restoring">يتم استعادة النسخة الاحتياطية…</string>
+  <string name="restore_failed">قشل في استعادة النسخة الاحتياطية</string>
+  <string name="delete_failed">فشلت عملية الحذف</string>
+  <string name="backup_restore_desc">نسخ و استعادة بيانات البرنامج</string>
+  <string name="exporting">جاري التصدير…</string>
+  <string name="loading_backups_failed">فشل في استعادة النسخة الاحتياطية!</string>
+  <string name="external_storage">الذاكرة الخارجية</string>
+  <string name="backup_interval">فترة النسخ الاحتياطي</string>
+  <string name="daily">يومياً</string>
+  <string name="weekly">أسبوعيّا</string>
+  <string name="monthly">شهرياً</string>
+  <string name="connection_failed">فشل في الاتصال!</string>
+  <string name="shooting_indoor">الرماية في الداخل</string>
+  <string name="bow_rest_vertical_position">الموضع العمودي</string>
   <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Horizontal position</string>
+  <string name="bow_rest_horizontal_position">الموضع الأفقي</string>
   <string name="bow_cam_settings">Cam settings</string>
   <string name="bow_letoff_weight">Letoff weight</string>
   <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
+  <string name="bow_string">الوتر</string>
+  <string name="bow_scope_magnification">تكبير منظار القوس</string>
   <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
+  <string name="bow_button">زر القوس</string>
+  <string name="more_fields">المزيد من الحقول</string>
+  <string name="recently_used">المستخدمة مؤخرا</string>
+  <string name="intro_title_track_training_progress">انسى أوراق حساب النقاط!</string>
+  <string name="intro_description_track_training_progress">مع الرسم البيانات الدقيق للأسهم، \n يمكنك الحصول على معلومات مفيدة\n من بيانات تمرينك.</string>
+  <string name="intro_title_everything_in_one_place">كل ما تحتاجه\n في مكان واحد</string>
+  <string name="intro_description_everything_in_one_place">متضمن القوس-، السهم-،\nو إدارة النيشان،\nمؤقت الرماية، إحصائيات \n و غير ذلك الكثير…</string>
   <string name="average_arrow_score_per_end">Average arrow score per end</string>
   <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
+  <string name="show_round">أظهر الجولة</string>
+  <string name="show_training">أظهر التمرين</string>
+  <string name="summary">ملخص</string>
   <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
+  <string name="average_of">متوسط</string>
+  <string name="displayed_shots">عرض الرميات</string>
+  <string name="invalid_decimal_number">عدد عشري غير صحيح</string>
+  <string name="not_within_expected_range_mm">ليس من ضمن النطاق المتوقع 1 إلى 20 مم</string>
+  <string name="not_within_expected_range_inch">ليس من ضمن النطاق المتوقع 0 إلى 1 بوصة</string>
+  <string name="next_round">الجولة اللاحقة</string>
+  <string name="previous_round">الجولة السابقة</string>
+  <string name="overview">نظرة عامة</string>
+  <string name="score">مجموع النقاط</string>
+  <string name="show_reached_score">عرض النتيجة التي تم الوصول إليها</string>
+  <string name="show_total_score">أظهر مجموع النقاط</string>
+  <string name="show_percentage">أظهر النسبة</string>
+  <string name="show_arrow_average">أظهر متوسط الأسهم</string>
+  <string name="image_deleted">تم حذف الصورة</string>
+  <string name="delete_image">هل ترغب في حذف الصورة؟</string>
   <string name="keyboard_type">Keyboard type</string>
   <string name="keyboard_enabled">Keyboard enabled</string>
   <string name="sort_shots">Sort shots</string>
@@ -420,5 +420,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index b2135bc32..0d84783ed 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -364,5 +364,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index de1d029e9..9c597adfb 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -36,25 +36,25 @@
   <plurals name="training_selected">
     <item quantity="one">%d vybraný trénink</item>
     <item quantity="few">%d vybrané tréninky</item>
-    <item quantity="many">%d trainings selected</item>
+    <item quantity="many">%d vybraných tréninků</item>
     <item quantity="other">%d vybraných tréninků</item>
   </plurals>
   <plurals name="bow_selected">
     <item quantity="one">%d vybraný luk</item>
     <item quantity="few">%d vybrané luky</item>
-    <item quantity="many">%d bows selected</item>
+    <item quantity="many">%d vybraných luků</item>
     <item quantity="other">%d vybraných luků</item>
   </plurals>
   <plurals name="arrow_selected">
     <item quantity="one">%d vybraný šíp</item>
     <item quantity="few">%d vybrané šípy</item>
-    <item quantity="many">%d arrows selected</item>
+    <item quantity="many">%d vybraných šípů</item>
     <item quantity="other">%d vybraných šípů</item>
   </plurals>
   <plurals name="passe_selected">
     <item quantity="one">%d vybraná sada</item>
     <item quantity="few">%d vybrané sady</item>
-    <item quantity="many">%d ends selected</item>
+    <item quantity="many">%d vybraných sad</item>
     <item quantity="other">%d vybraných sad</item>
   </plurals>
   <string name="edit">Upravit</string>
@@ -185,43 +185,43 @@
   <plurals name="arrow_deleted">
     <item quantity="one">%d smazaný šíp</item>
     <item quantity="few">%d smazané šípy</item>
-    <item quantity="many">%d arrows deleted</item>
+    <item quantity="many">%d smazaných šípů</item>
     <item quantity="other">%d smazaných šípů</item>
   </plurals>
   <plurals name="bow_deleted">
     <item quantity="one">%d smazaný luk</item>
     <item quantity="few">%d smazané luky</item>
-    <item quantity="many">%d bows deleted</item>
+    <item quantity="many">%d smazaných luků</item>
     <item quantity="other">%d smazaných luků</item>
   </plurals>
   <plurals name="training_deleted">
     <item quantity="one">%d smazaný trénink</item>
     <item quantity="few">%d smazané tréninky</item>
-    <item quantity="many">%d trainings deleted</item>
+    <item quantity="many">%d smazaných tréninků</item>
     <item quantity="other">%d smazaných tréninků</item>
   </plurals>
   <plurals name="passe_deleted">
     <item quantity="one">%d smazaná sada</item>
     <item quantity="few">%d smazané sady</item>
-    <item quantity="many">%d ends deleted</item>
+    <item quantity="many">%d smazaných sad</item>
     <item quantity="other">%d smazaných sad</item>
   </plurals>
   <plurals name="rounds">
     <item quantity="one">Kolo %d</item>
     <item quantity="few">Kolo %d</item>
-    <item quantity="many">Round %d</item>
+    <item quantity="many">Kolo %d</item>
     <item quantity="other">Kolo %d</item>
   </plurals>
   <plurals name="round_selected">
     <item quantity="one">%d vybrané kolo</item>
     <item quantity="few">%d vybraná kola</item>
-    <item quantity="many">%d rounds selected</item>
+    <item quantity="many">%d vybraných kol</item>
     <item quantity="other">%d vybraných kol</item>
   </plurals>
   <plurals name="round_deleted">
     <item quantity="one">%d smazané kolo</item>
     <item quantity="few">%d smazaná kola</item>
-    <item quantity="many">%d rounds deleted</item>
+    <item quantity="many">%d smazaných kol</item>
     <item quantity="other">%d smazaných kol</item>
   </plurals>
   <string name="date">Datum</string>
@@ -355,8 +355,8 @@
   <string name="delete_image">Smazat obrázek?</string>
   <string name="keyboard_type">Typ klávesnice</string>
   <string name="keyboard_enabled">Zapnout klávesnici</string>
-  <string name="sort_shots">Třídění výstřelů</string>
-  <string name="sort_shots_for_spots">Řazení snímků pro účely zón</string>
+  <string name="sort_shots">Třídění zásahů</string>
+  <string name="sort_shots_for_spots">Řazení zásahů dle typu terče</string>
   <string name="target_captain">Terčový rozhodčí</string>
   <string name="language">Jazyk</string>
   <string name="warning_backup_experimental">Upozornění: Tato funkce je stále experimentální! Prosím, zkontrolujte pravidelně, jestli byla záloha skutečně úspěšná!</string>
@@ -392,5 +392,6 @@
   <string name="settings_statistics_spots_to_single_target">Agregované body k jednomu terči</string>
   <string name="keep_above_lockscreen">Nad zamykací obrazovkou</string>
   <string name="scoreboard_title_all_rounds">Všechny kola</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Požadováno oprávnění</string>
+  <string name="backup_permission_explanation"><![CDATA[Aby bylo možné vytvořit zálohu vašich dat, potřebuje aplikace oprávnění k přístupu k vnitřní paměti telefonu. Chcete-li použít funkci zálohování přejděte do nastavení systému > Aplikace > MyTargets > Oprávnění a povolit vstup \'Úložiště\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 7d0e783eb..4bdc8697c 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -364,5 +364,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 26cc9630a..926a9994a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -364,5 +364,6 @@
   <string name="settings_statistics_spots_to_single_target">Fasse Spots zu einer einzigen Zielscheibe zusammen</string>
   <string name="keep_above_lockscreen">Auf dem Sperrbildschirm anzeigen</string>
   <string name="scoreboard_title_all_rounds">Alle Runden</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Berechtigung erforderlich</string>
+  <string name="backup_permission_explanation"><![CDATA[Um ein Backup Ihrer Daten machen zu können, benötigt die App Zugriff auf den internen Speicher des Telefons. Um die Backup Funktion verwenden zu können gehe zu Systemeinstellungen > Apps > MyTargets > Berechtigungen und aktiviere den Eintrag \'Speicher\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index ba9c0e5c2..83e5f84f0 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -364,5 +364,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d6076add6..dd273e5bc 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -327,8 +327,8 @@
   <string name="delete_image">¿Borrar imagen?</string>
   <string name="keyboard_type">Tipo de teclado</string>
   <string name="keyboard_enabled">Teclado habilitado</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
+  <string name="sort_shots">Tiros Rapidos</string>
+  <string name="sort_shots_for_spots">Tiros rapidos a diferentes target faces</string>
   <string name="target_captain">Capitan de Diana</string>
   <string name="language">idioma</string>
   <string name="warning_backup_experimental">Precaución: esta caracteristica es todavia experimental. por favor, revisa regularmente que tu backup se ha realizado exitosamente!</string>
@@ -363,6 +363,8 @@
   <string name="settings_summary_statistics">Ajustar la pantalla de estadísticas</string>
   <string name="settings_statistics_spots_to_single_target">Agregar puntos en una sola diana</string>
   <string name="keep_above_lockscreen">Mantener sobre la pantalla de bloqueo</string>
-  <string name="scoreboard_title_all_rounds">Todas las rondas</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="scoreboard_title_all_rounds">Todas las entradas</string>
+  <string name="permission_required">Se necesita permiso</string>
+  <string name="backup_permission_explanation"><![CDATA[Para poder hacer un backup de tus datos, la aplicación necesita permiso de aaceso al almacenamiento interno de tu movil. Para usar la opción de backup vete a: 
+Ajustes, aplicaciones > permisos de aplicaciones y habilita \storage\.]]></string>
 </resources>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 40f9cfd9f..5b7dcf1e8 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -364,5 +364,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index dfaf91a7d..9ff2d3ccc 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -364,5 +364,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f329b28a7..9f775da28 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -222,7 +222,7 @@
   <string name="contribute">Contribuer</string>
   <string name="connect">Se connecter</string>
   <string name="special_thanks_to">Merci tout particulièrement à</string>
-  <string name="all_translators">Toutes les personnes, qui ont aidées à traduire l’app !</string>
+  <string name="all_translators">Toutes les personnes, qui ont aidé à traduire l’app !</string>
   <string name="all_beta_testers">Tous ceux qui ont rejoint le groupe de bêta-testeurs et ont contribué à l\'amélioration continue de l\'app.</string>
   <string name="test_beta">Tester la dernière bêta-version</string>
   <string name="join_on_google_plus">Rejoignez-nous sur Google+</string>
@@ -291,8 +291,8 @@
   <string name="bow_rest_vertical_position">Position verticale</string>
   <string name="bow_rest">Repose flèche</string>
   <string name="bow_rest_horizontal_position">Position horizontale</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
+  <string name="bow_cam_settings">Paramètres des poulies</string>
+  <string name="bow_letoff_weight">Pourcentage de la puissance résiduelle à pleine allonge</string>
   <string name="bow_nocking_point">Nockset</string>
   <string name="bow_string">Corde</string>
   <string name="bow_scope_magnification">Zoom du scope</string>
@@ -301,15 +301,15 @@
   <string name="more_fields">Autres champs</string>
   <string name="recently_used">Utilisé récemment</string>
   <string name="intro_title_track_training_progress">Oublier la feuille de scores !</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
+  <string name="intro_description_track_training_progress">Avec un suivi précis de vos flèches, vous pouvez tirer plus d\'enseignements de vos données d\'entrainement.</string>
   <string name="intro_title_everything_in_one_place">Tout ce qu\'il vous faut\nen un endroit</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
+  <string name="intro_description_everything_in_one_place">Incluant la gestion de l\'arc , des flèches, des réglages de visée, chronomètre, statistiques, et bien plus…</string>
+  <string name="average_arrow_score_per_end">Score moyen des flèches par volée</string>
   <string name="show_end">Affichage sur la volée</string>
   <string name="show_round">Affichage sur la serie</string>
   <string name="show_training">Affichage sur l\'entraînement</string>
   <string name="summary">Résumé</string>
-  <string name="end">End</string>
+  <string name="end">Volée</string>
   <string name="average_of">La moyenne de</string>
   <string name="displayed_shots">Tirs affichés</string>
   <string name="invalid_decimal_number">Nombre décimal non valide</string>
@@ -323,8 +323,8 @@
   <string name="show_total_score">Voir le score total</string>
   <string name="show_percentage">Voir le pourcentage</string>
   <string name="show_arrow_average">Afficher la moyenne par flèche</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
+  <string name="image_deleted">Image supprimée</string>
+  <string name="delete_image">Supprimer l\'Image?</string>
   <string name="keyboard_type">Keyboard type</string>
   <string name="keyboard_enabled">Clavier activé</string>
   <string name="sort_shots">Sort shots</string>
@@ -352,8 +352,8 @@
   <string name="settings_summary_timer">Régler le comportement de la minuterie</string>
   <string name="settings_summary_scoreboard">Changer l’apparence du tableau de scores</string>
   <string name="settings_summary_input">Personnaliser l’écran de saisie</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
+  <string name="settings_summary_overview">Personnaliser les informations affichées pour les entraienements, les séries et les volées</string>
+  <string name="settings_summary_profile">Entrer vosinformations personnelles</string>
   <string name="licence_number">Numéro de licence</string>
   <string name="file_type">Type de fichier</string>
   <string name="clear">Effacer</string>
@@ -361,8 +361,9 @@
   <string name="pdf_file">Fichier PDF</string>
   <string name="image_file">Fichier image</string>
   <string name="settings_summary_statistics">Régler l’écran des statistiques</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+  <string name="settings_statistics_spots_to_single_target">Agréger tous les impacts sur une seule cible</string>
   <string name="keep_above_lockscreen">Au-dessus de l\'écran de verrouillage</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Autorisation nécessaire</string>
+  <string name="backup_permission_explanation"><![CDATA[Pour être capable de sauver vos données, l\'application a besoin de l\'autorisation d\'accèder au stockage interne de votre téléphone. Pour utiliser la fonctionalité de backup, allez dans les paramètres systême > Apps > MyTargets > Autorisations et activez le paramètre \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 488dc174d..921006a34 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -42,11 +42,11 @@
     <item quantity="other">%d íjak kiválasztása</item>
   </plurals>
   <plurals name="arrow_selected">
-    <item quantity="one">%d vesszõ kiválasztva</item>
+    <item quantity="one">%d. vesszõ kiválasztva</item>
     <item quantity="other">%d vesszõ kiválasztva</item>
   </plurals>
   <plurals name="passe_selected">
-    <item quantity="one">%d sorozat kiválasztva</item>
+    <item quantity="one">%d. sorozat kiválasztva</item>
     <item quantity="other">%d sorozatok kiválasztása</item>
   </plurals>
   <string name="edit">Szerkesztés</string>
@@ -54,7 +54,7 @@
   <string name="statistic">Statisztika</string>
   <!-- Share -->
   <string name="share">Megosztás</string>
-  <string name="dispersion_pattern">Szórás minta</string>
+  <string name="dispersion_pattern">Találatok eloszlása</string>
   <string name="sharing_failed">Megosztás nem sikerült!</string>
   <!-- Export -->
   <string name="send_exported">Mentett adatok küldése</string>
@@ -149,14 +149,14 @@
   <string name="environment">Környezet</string>
   <string name="wind_speed">Szélsebesség</string>
   <string name="wind_direction">Szél irány</string>
-  <string name="sight_setting_removed">Irányzék-bellítás törölve!</string>
+  <string name="sight_setting_removed">Irányzék-beállítás törölve!</string>
   <string name="metric">Metrikus</string>
   <string name="imperial">Angolszász</string>
   <string name="undo">Visszavonás</string>
   <string name="standard_rounds">A szabványos fordulók</string>
   <string name="expand_collapse">Kibontás/összecsukás</string>
   <string name="new_round_template">Új Sablon</string>
-  <string name="arrow_numbers">Vesszők számozása</string>
+  <string name="arrow_numbers">Kilőtt vesszők sorszámozása</string>
   <string name="round_removed">Forduló törölve!</string>
   <string name="custom_round">Egyéni forduló</string>
   <string name="filter">Szűrő</string>
@@ -181,7 +181,7 @@
     <item quantity="other">%d edzések törölve</item>
   </plurals>
   <plurals name="passe_deleted">
-    <item quantity="one">%d sorozat törölve</item>
+    <item quantity="one">%d. sorozat törölve</item>
     <item quantity="other">%d sorozatok törölve</item>
   </plurals>
   <plurals name="rounds">
@@ -204,7 +204,7 @@
   <string name="my_bow">Az íjam</string>
   <string name="my_arrow">Vesszőim</string>
   <string name="tip_weight">a hegy súlya</string>
-  <string name="arrow_ranking">Vessző rangsor</string>
+  <string name="arrow_ranking">Vesszők találati értéke</string>
   <string name="arrow_x_of_set_of_arrows">%2$s. nyíl a %1$s-ból</string>
   <string name="display">Megjelenítés</string>
   <string name="print">Nyomtatás</string>
@@ -246,7 +246,7 @@
   <string name="hits">Találatok</string>
   <string name="misses">Mellé</string>
   <string name="new_end">Új sorozat</string>
-  <string name="distribution">Találatok eloszlása</string>
+  <string name="distribution">Szóráskép</string>
   <string name="count">Számláló</string>
   <string name="diameter">Átmérő</string>
   <string name="input">Találatok rögzítése/megjelenítése</string>
@@ -329,7 +329,7 @@
   <string name="keyboard_enabled">Engedélyezett billentyűzet</string>
   <string name="sort_shots">Lövések sorbarendezése</string>
   <string name="sort_shots_for_spots">Lövések rendezése a szemafor-lőlap szerint</string>
-  <string name="target_captain">Lőlap kapitány</string>
+  <string name="target_captain">Lőlap vezető</string>
   <string name="language">Nyelv</string>
   <string name="warning_backup_experimental">Figyelmeztetés: Ez a szolgáltatás még kísérleti fázisban! Kérjük, ellenőrizze a rendszeres időközönként ha igazán sikeres volt, a biztonsági másolat!</string>
   <string name="drawer_open">Rögzítő megnyitása</string>
@@ -363,6 +363,7 @@
   <string name="settings_summary_statistics">Állítsa be a statisztika képernyőt</string>
   <string name="settings_statistics_spots_to_single_target">Összesített pontok egyetlen lőlapon</string>
   <string name="keep_above_lockscreen">Tartsa a zárolt képernyőn</string>
-  <string name="scoreboard_title_all_rounds">Minden fordulóban</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="scoreboard_title_all_rounds">Forduló összesítő</string>
+  <string name="permission_required">Engedély szükséges</string>
+  <string name="backup_permission_explanation"><![CDATA[Ahhoz, hogy egy biztonsági másolatot készíts az adatokról, az alkalmazásnak engedélyre van szüksége az eszköz belső tárterületéhez. A további használathoz engedélyezze a hozzáférést: Beállítások &gt; Alkalmazások &gt; MyTargets &gt; Engedélyek a \'Tárolóeszköz\ ".]]></string>
 </resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index d36574699..bdbec616c 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -199,7 +199,7 @@
   <string name="show_points_colored">Tunjukkan titik berwarna</string>
   <string name="stabilizer">Stabilizer</string>
   <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Nomor panah % s</string>
+  <string name="arrow_number_x">Nomor panah %s</string>
   <string name="training_with_standard_round">Pelatihan dengan Putaran Standar</string>
   <string name="free_training">Pelatihan Gratis</string>
   <string name="competition">Kompetisi</string>
@@ -350,5 +350,6 @@
   <string name="settings_statistics_spots_to_single_target">Bintik agregat ke target tunggal</string>
   <string name="keep_above_lockscreen">Simpan di atas layar lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d4b3e3f3b..6e7867a79 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -283,10 +283,10 @@
   <string name="loading_backups_failed">Caricamento del backup fallito!</string>
   <string name="external_storage">External storage</string>
   <string name="backup_interval">Backup interval</string>
-  <string name="daily">Daily</string>
-  <string name="weekly">Weekly</string>
-  <string name="monthly">Monthly</string>
-  <string name="connection_failed">Connection failed!</string>
+  <string name="daily">Giornaliero</string>
+  <string name="weekly">Settimanale</string>
+  <string name="monthly">Mensile</string>
+  <string name="connection_failed">Connessione fallita!</string>
   <string name="shooting_indoor">Shooting indoor</string>
   <string name="bow_rest_vertical_position">Vertical position</string>
   <string name="bow_rest">Rest</string>
@@ -317,8 +317,8 @@
   <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
   <string name="next_round">Next round</string>
   <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
-  <string name="score">Score</string>
+  <string name="overview">Sommario</string>
+  <string name="score">Punteggio</string>
   <string name="show_reached_score">Show reached score</string>
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
@@ -364,5 +364,6 @@
   <string name="settings_statistics_spots_to_single_target">Raggruppa punti su un\'unica targa</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 00391ac14..16859bd7d 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -392,5 +392,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 8eab4058e..4e1d49ba1 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -350,5 +350,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index fe32bf4a8..078d10699 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -350,5 +350,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index b1d7f8336..bd988c18c 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -251,7 +251,7 @@
   <string name="diameter">Diameter</string>
   <string name="input">Invoer</string>
   <string name="target_zoom">Blazoen vergrotings niveau</string>
-  <string name="action_pdf">Export as PDF</string>
+  <string name="action_pdf">Exporteer als PDF</string>
   <string name="arrow_diameter_scale">Pijl diameter schaal</string>
   <string name="timestamp">Tijdstip</string>
   <string name="change_target_face">Verander blazoen</string>
@@ -330,39 +330,40 @@
   <string name="sort_shots">Sorteer schoten</string>
   <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
   <string name="target_captain">Target captain</string>
-  <string name="language">Language</string>
+  <string name="language">Taal</string>
   <string name="warning_backup_experimental">Waarschuwing: Deze functie is nog experimenteel! Gelieve regelmatig te controleren of de back-up echt succesvol was!</string>
   <string name="drawer_open">Open drawer</string>
   <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
+  <string name="help">Hulp</string>
   <string name="home">Home</string>
   <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
+  <string name="no_trainings">Je hebt momenteel nog geen trainingen!</string>
+  <string name="no_bows">Geen bogen</string>
+  <string name="no_arrows">Geen pijlen</string>
   <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
+  <string name="version_prefix">Versie</string>
+  <string name="max_arrow_number">Maximum aantal pijlen</string>
+  <string name="distances">Afstanden</string>
   <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
+  <string name="bows">Bogen</string>
   <string name="reset">Reset</string>
   <string name="end_x_of_y">Beurt %1$d/%2$d</string>
   <string name="round_x_of_y">Ronde %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
+  <string name="settings_summary_timer">Timer aanpassen</string>
   <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
   <string name="settings_summary_input">Customize input screen</string>
   <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
+  <string name="settings_summary_profile">Geef persoonlijke informatie in</string>
+  <string name="licence_number">Licentie nummer</string>
+  <string name="file_type">Bestand type</string>
   <string name="clear">Clear</string>
   <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
+  <string name="pdf_file">PDF bestand</string>
   <string name="image_file">Image file</string>
   <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
+  <string name="settings_statistics_spots_to_single_target">Combineer spots tot één blazoen</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 52b20e0a2..57f73226d 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -17,7 +17,7 @@
 <resources>
   <!-- General -->
   <string name="preferences">Instillinger</string>
-  <string name="settings">Settings</string>
+  <string name="settings">Innstillinger</string>
   <string name="prev">Forrige</string>
   <string name="next">Neste</string>
   <string name="save">Lagre</string>
@@ -251,7 +251,7 @@
   <string name="diameter">Diameter</string>
   <string name="input">Input</string>
   <string name="target_zoom">Blink zoom nivå</string>
-  <string name="action_pdf">Export as PDF</string>
+  <string name="action_pdf">Eksporter som PDF</string>
   <string name="arrow_diameter_scale">Pil diameter skala</string>
   <string name="timestamp">Tidsstempel</string>
   <string name="change_target_face">Endre blink type</string>
@@ -330,7 +330,7 @@
   <string name="sort_shots">Sort shots</string>
   <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
   <string name="target_captain">Target captain</string>
-  <string name="language">Language</string>
+  <string name="language">Språk</string>
   <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
   <string name="drawer_open">Open drawer</string>
   <string name="drawer_close">Close drawer</string>
@@ -364,5 +364,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index f7b2b97df..ddb977439 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -392,5 +392,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ae06de3b8..5be5cc1a1 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -364,5 +364,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index a6f9874d7..5e863487a 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -364,5 +364,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 2dd064560..cd8891dd4 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -17,7 +17,7 @@
 <resources>
   <!-- General -->
   <string name="preferences">Opțiuni</string>
-  <string name="settings">Settings</string>
+  <string name="settings">Setări</string>
   <string name="prev">Anterior</string>
   <string name="next">Următor</string>
   <string name="save">Salvare</string>
@@ -55,9 +55,9 @@
   </plurals>
   <string name="edit">Editare</string>
   <string name="delete">Șterge</string>
-  <string name="statistic">Statistici</string>
+  <string name="statistic">Statistică</string>
   <!-- Share -->
-  <string name="share">Distribuire</string>
+  <string name="share">Distribuie</string>
   <string name="dispersion_pattern">Modelul de dispersie</string>
   <string name="sharing_failed">Distribuirea nu a reușit!</string>
   <!-- Export -->
@@ -88,75 +88,75 @@
   <!-- New round -->
   <string name="title">Titlu</string>
   <string name="outdoor">Exterior</string>
-  <string name="indoor">Indoor</string>
-  <string name="distance">Distance</string>
+  <string name="indoor">Interior</string>
+  <string name="distance">Distanță</string>
   <string name="format">Format</string>
   <!-- x ends of y arrows -->
   <plurals name="passe">
-    <item quantity="one">%d end</item>
-    <item quantity="few">%d ends</item>
-    <item quantity="other">%d ends</item>
+    <item quantity="one">%d set</item>
+    <item quantity="few">%d seturi</item>
+    <item quantity="other">%d seturi</item>
   </plurals>
-  <string name="with">of</string>
+  <string name="with">din</string>
   <plurals name="arrow">
-    <item quantity="one">%d arrow</item>
-    <item quantity="few">%d arrows</item>
-    <item quantity="other">%d arrows</item>
+    <item quantity="one">%d săgeată</item>
+    <item quantity="few">%d săgeţi</item>
+    <item quantity="other">%d săgeţi</item>
   </plurals>
-  <string name="target_face">Target face</string>
+  <string name="target_face">Ţintă</string>
   <!-- Scoreboard -->
-  <string name="scoreboard">Scoreboard</string>
-  <string name="arrows">Arrows</string>
-  <string name="sum">Score</string>
-  <string name="carry">R.Total</string>
-  <string name="action_print">Print</string>
-  <string name="average">Average</string>
+  <string name="scoreboard">Fișă de scor</string>
+  <string name="arrows">Săgeți</string>
+  <string name="sum">Scor</string>
+  <string name="carry">Total</string>
+  <string name="action_print">Tipărește</string>
+  <string name="average">Media</string>
   <!-- Input mode -->
-  <string name="comment">Comment</string>
+  <string name="comment">Comentariu</string>
   <!-- Statistics -->
   <!-- Import/Backup -->
-  <string name="select_a_file">Select a file</string>
-  <string name="dir_not_created">Directory could not be created!</string>
-  <string name="import_failed">Import failed!</string>
-  <string name="file_not_found">File not found!</string>
-  <string name="failed_reading_file">Failed reading file!</string>
+  <string name="select_a_file">Selectează un fișier</string>
+  <string name="dir_not_created">Directorul nu poate fi creat!</string>
+  <string name="import_failed">Import nereușit!</string>
+  <string name="file_not_found">Fișierul nu a fost găsit!</string>
+  <string name="failed_reading_file">Citirea fişierului nereuşită!</string>
   <!-- Donate -->
-  <string name="donate_2">Donate me a burger</string>
-  <string name="donate_5">Donate me a kebab</string>
-  <string name="donate_10">Donate me a large pizza</string>
-  <string name="donate_20">Donate me some fuel</string>
-  <string name="donation_thank">Thank you for your support!</string>
-  <string name="donate_text" formatted="false">The amounts are incl. VAT and 30% fees for Google. Alternatively you may gladly donate on the PayPal account dreier.florian@gmail.com.</string>
+  <string name="donate_2">Donează un burger</string>
+  <string name="donate_5">Donează un kebab</string>
+  <string name="donate_10">Donează o pizza</string>
+  <string name="donate_20">Donează carburant</string>
+  <string name="donation_thank">Vă mulțumim pentru susținere!</string>
+  <string name="donate_text" formatted="false">Sumele sunt incl. TVA şi 30 % taxe pentru Google. Alternativ pot dona cu placere pe PayPal cont dreier.florian@gmail.com.</string>
   <!-- Timer -->
-  <string name="timer">Timer</string>
-  <string name="touch_to_start">Touch to start</string>
-  <string name="preparation">Get ready</string>
-  <string name="shooting">Shooting</string>
+  <string name="timer">Cronometru</string>
+  <string name="touch_to_start">Apasă pentru a începe</string>
+  <string name="preparation">Pregătește-te</string>
+  <string name="shooting">Tragere</string>
   <!-- Timer settings -->
-  <string name="timer_shooting_time">Shooting Time</string>
-  <string name="timer_waiting_time">Prepare Time</string>
-  <string name="timer_warning_time">Warning Time</string>
-  <string name="timer_sound">Sound</string>
-  <string name="timer_vibrate">Vibrate</string>
+  <string name="timer_shooting_time">Timpul de tragere</string>
+  <string name="timer_waiting_time">Timp de pregătire</string>
+  <string name="timer_warning_time">Timp de avertizare</string>
+  <string name="timer_sound">Sunet</string>
+  <string name="timer_vibrate">Vibrație</string>
   <!-- Settings -->
-  <string name="backup_action">Backup</string>
-  <string name="import_action">Import</string>
-  <string name="exports_as_csv">Exports as csv</string>
-  <string name="licences">Open Source-Licences</string>
-  <string name="licences_summary">Legal notes to licences</string>
-  <string name="version">Version %s</string>
+  <string name="backup_action">Copie</string>
+  <string name="import_action">Importă</string>
+  <string name="exports_as_csv">Export ca Csv</string>
+  <string name="licences">Licențe Open Source</string>
+  <string name="licences_summary">Adnotările legale a licenţelor</string>
+  <string name="version">Versiunea %s</string>
   <plurals name="second">
-    <item quantity="one">%d second</item>
-    <item quantity="few">%d seconds</item>
-    <item quantity="other">%d seconds</item>
+    <item quantity="one">%d secundă</item>
+    <item quantity="few">%d secunde</item>
+    <item quantity="other">%d secunde</item>
   </plurals>
-  <string name="info">Information</string>
+  <string name="info">Informaţii</string>
   <string name="data">Data</string>
-  <string name="weather">Weather</string>
-  <string name="environment">Environment</string>
-  <string name="wind_speed">Wind speed</string>
-  <string name="wind_direction">Wind direction</string>
-  <string name="sight_setting_removed">Sight setting deleted!</string>
+  <string name="weather">Vremea</string>
+  <string name="environment">Mediu</string>
+  <string name="wind_speed">Viteza vântului</string>
+  <string name="wind_direction">Directia vantului</string>
+  <string name="sight_setting_removed">Setările aparatului de ochire au fost șterse!</string>
   <string name="metric">Metric</string>
   <string name="imperial">Imperial</string>
   <string name="undo">Revenire</string>
@@ -206,177 +206,178 @@
     <item quantity="other">%d runde selectate</item>
   </plurals>
   <plurals name="round_deleted">
-    <item quantity="one">%d round deleted</item>
-    <item quantity="few">%d rounds deleted</item>
-    <item quantity="other">%d rounds deleted</item>
+    <item quantity="one">Runda %d ştearsă</item>
+    <item quantity="few">%d runde ştearse</item>
+    <item quantity="other">%d runde ştearse</item>
   </plurals>
-  <string name="date">Date</string>
-  <string name="edit_round">Edit round</string>
-  <string name="draw_weight">Draw weight</string>
-  <string name="sight">Sight</string>
-  <string name="limbs">Limbs</string>
-  <string name="my_bow">My bow</string>
-  <string name="my_arrow">My arrow</string>
-  <string name="tip_weight">Tip weight</string>
-  <string name="arrow_ranking">Arrow ranking</string>
-  <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
-  <string name="display">Display</string>
-  <string name="print">Print</string>
-  <string name="table">Table</string>
-  <string name="comments">Comments</string>
-  <string name="show_points_colored">Show points colored</string>
-  <string name="stabilizer">Stabilizer</string>
+  <string name="date">Data</string>
+  <string name="edit_round">Editare runda</string>
+  <string name="draw_weight">Puterea de tragere</string>
+  <string name="sight">Sistem de ochire</string>
+  <string name="limbs">Brate</string>
+  <string name="my_bow">Arcul meu</string>
+  <string name="my_arrow">Săgetile mele</string>
+  <string name="tip_weight">Greutatea varfului</string>
+  <string name="arrow_ranking">Poziția săgeții</string>
+  <string name="arrow_x_of_set_of_arrows">Săgeata %1$s din %2$s</string>
+  <string name="display">Setări ecran</string>
+  <string name="print">Tipărire</string>
+  <string name="table">Tabel</string>
+  <string name="comments">Comentarii</string>
+  <string name="show_points_colored">Arată punctele colorate</string>
+  <string name="stabilizer">Stabilizator</string>
   <string name="clicker">Clicker</string>
-  <string name="arrow_number_x">Arrow number %s</string>
-  <string name="training_with_standard_round">Training with Standard Round</string>
-  <string name="free_training">Free Training</string>
-  <string name="competition">Competition</string>
-  <string name="about">About</string>
+  <string name="arrow_number_x">Săgeata numărul %s</string>
+  <string name="training_with_standard_round">Antrenament standard</string>
+  <string name="free_training">Antrenament Liber</string>
+  <string name="competition">Competiţie</string>
+  <string name="about">Despre</string>
   <string name="general">General</string>
-  <string name="contribute">Contribute</string>
-  <string name="connect">Connect</string>
-  <string name="special_thanks_to">Special thanks to</string>
-  <string name="all_translators">All guys, who helped translating the app!</string>
-  <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
-  <string name="test_beta">Test the latest beta version</string>
-  <string name="join_on_google_plus">Join us on Google+</string>
-  <string name="share_with_friends">Share with your friends</string>
-  <string name="donate">Donate</string>
-  <string name="donate_via_paypal">Donate via PayPal</string>
-  <string name="translate_crowdin">Translate on Crowdin</string>
-  <string name="network_linkedin">Network on LinkedIn</string>
-  <string name="search">Search</string>
-  <string name="us">US</string>
-  <string name="show_shots_training">Whole training</string>
-  <string name="show_shots_round">Current round</string>
-  <string name="show_shots_end">Current end</string>
-  <string name="profile">Profile</string>
-  <string name="birthday">Birthday</string>
-  <string name="first_name">First name</string>
-  <string name="last_name">Last name</string>
-  <string name="age">Age</string>
-  <string name="show_signature">Signature</string>
-  <string name="archer">Archer</string>
-  <string name="hits">Hits</string>
-  <string name="misses">Misses</string>
-  <string name="new_end">New end</string>
-  <string name="distribution">Distribution</string>
-  <string name="count">Count</string>
-  <string name="diameter">Diameter</string>
-  <string name="input">Input</string>
-  <string name="target_zoom">Target zoom level</string>
-  <string name="action_pdf">Export as PDF</string>
-  <string name="arrow_diameter_scale">Arrow diameter scale</string>
-  <string name="timestamp">Timestamp</string>
-  <string name="change_target_face">Change target face</string>
-  <string name="your_first_training">Your first training</string>
-  <string name="grouping">Grouping</string>
-  <string name="show_clusters">Clusters</string>
-  <string name="first_training_description">Tap the plus to start a new training.</string>
-  <string name="show_average">Average</string>
-  <string name="show_none">None</string>
-  <string name="left_handed">Left-handed</string>
-  <string name="right_handed">Right-handed</string>
-  <string name="keyboard">Keyboard</string>
-  <string name="backup_drive_desc">Backing up your data allows you to restore all your trainings in case you lost or change your phone.</string>
-  <string name="backup_now">Backup now</string>
-  <string name="last_backup">Last backup: %s</string>
-  <string name="recent_backups">Recent backups</string>
-  <string name="dialog_restore_title">Revert to previous version</string>
-  <string name="restore_desc">Restoring the data will overwrite all the existing data with the backup.</string>
-  <string name="backup_details">Backup details</string>
-  <string name="restore">Restore</string>
-  <string name="backup_location">Backup location</string>
-  <string name="internal_storage">Internal storage</string>
-  <string name="automatic_backup">Automatic backup</string>
-  <string name="restoring">Restoring backup…</string>
-  <string name="restore_failed">Restore failed</string>
-  <string name="delete_failed">Deletion failed</string>
-  <string name="backup_restore_desc">Backup and restore app data</string>
-  <string name="exporting">Exporting…</string>
-  <string name="loading_backups_failed">Loading backups failed!</string>
-  <string name="external_storage">External storage</string>
-  <string name="backup_interval">Backup interval</string>
-  <string name="daily">Daily</string>
-  <string name="weekly">Weekly</string>
-  <string name="monthly">Monthly</string>
-  <string name="connection_failed">Connection failed!</string>
-  <string name="shooting_indoor">Shooting indoor</string>
-  <string name="bow_rest_vertical_position">Vertical position</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Horizontal position</string>
-  <string name="bow_cam_settings">Cam settings</string>
-  <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
-  <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
-  <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more…</string>
-  <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
-  <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
-  <string name="score">Score</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="image_deleted">Image deleted</string>
-  <string name="delete_image">Delete image?</string>
-  <string name="keyboard_type">Keyboard type</string>
-  <string name="keyboard_enabled">Keyboard enabled</string>
-  <string name="sort_shots">Sort shots</string>
-  <string name="sort_shots_for_spots">Sort shots for spot target faces</string>
-  <string name="target_captain">Target captain</string>
-  <string name="language">Language</string>
-  <string name="warning_backup_experimental">Warning: This feature is still experimental! Please check in regular intervals if the backup was really successful!</string>
-  <string name="drawer_open">Open drawer</string>
-  <string name="drawer_close">Close drawer</string>
-  <string name="help">Help</string>
-  <string name="home">Home</string>
-  <string name="click_to_enter_profile">Click to enter profile information</string>
-  <string name="no_trainings">You don\'t have any trainings, yet!</string>
-  <string name="no_bows">No bows</string>
-  <string name="no_arrows">No arrows</string>
-  <string name="version_info">Version info</string>
-  <string name="version_prefix">Version</string>
-  <string name="max_arrow_number">Maximum arrow number</string>
-  <string name="distances">Distances</string>
-  <string name="diameters">Diameters</string>
-  <string name="bows">Bows</string>
-  <string name="reset">Reset</string>
-  <string name="end_x_of_y">End %1$d/%2$d</string>
-  <string name="round_x_of_y">Round %1$d/%2$d</string>
-  <string name="settings_summary_timer">Adjust archery timer\' behaviour</string>
-  <string name="settings_summary_scoreboard">Change scoreboard appearance</string>
-  <string name="settings_summary_input">Customize input screen</string>
-  <string name="settings_summary_overview">Personalize information shown for trainings, rounds and ends</string>
-  <string name="settings_summary_profile">Enter personal information</string>
-  <string name="licence_number">Licence number</string>
-  <string name="file_type">File type</string>
-  <string name="clear">Clear</string>
-  <string name="tap_to_sign">Tap to sign</string>
-  <string name="pdf_file">PDF file</string>
-  <string name="image_file">Image file</string>
-  <string name="settings_summary_statistics">Adjust statistics screen</string>
-  <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
-  <string name="keep_above_lockscreen">Keep above lockscreen</string>
-  <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="contribute">Contribuie</string>
+  <string name="connect">Conectare</string>
+  <string name="special_thanks_to">Mulțumiri speciale</string>
+  <string name="all_translators">Tuturor celor care au ajutat la traducerea aplicației!</string>
+  <string name="all_beta_testers">Tuturor celor care s-au alăturat grupului de testeri beta şi, prin urmare, ajută pentru a îmbunătăţi in continuu aplicația.</string>
+  <string name="test_beta">Verificați cea mai recentă versiune beta</string>
+  <string name="join_on_google_plus">Alăturaţi-ne pe Google +</string>
+  <string name="share_with_friends">Distribuie prietenilor tăi</string>
+  <string name="donate">Donează</string>
+  <string name="donate_via_paypal">Doneaza prin PayPal</string>
+  <string name="translate_crowdin">Traduce pe Crowdin</string>
+  <string name="network_linkedin">Reţea pe LinkedIn</string>
+  <string name="search">Caută</string>
+  <string name="us">SUA</string>
+  <string name="show_shots_training">Întreagul antrenament</string>
+  <string name="show_shots_round">Runda curenta</string>
+  <string name="show_shots_end">Setul curent</string>
+  <string name="profile">Profil</string>
+  <string name="birthday">Data naşterii</string>
+  <string name="first_name">Prenume</string>
+  <string name="last_name">Nume</string>
+  <string name="age">Vârsta</string>
+  <string name="show_signature">Semnătura</string>
+  <string name="archer">Arcaș</string>
+  <string name="hits">Hit-uri</string>
+  <string name="misses">Ratate</string>
+  <string name="new_end">Set nou</string>
+  <string name="distribution">Distribuţie</string>
+  <string name="count">Contor</string>
+  <string name="diameter">Diametru</string>
+  <string name="input">Intrare</string>
+  <string name="target_zoom">Nivel de mărire a ţintei</string>
+  <string name="action_pdf">Exportă ca PDF</string>
+  <string name="arrow_diameter_scale">Diametru săgeată</string>
+  <string name="timestamp">Data/Ora</string>
+  <string name="change_target_face">Schimba ţinta</string>
+  <string name="your_first_training">Primul antrenament</string>
+  <string name="grouping">Grupare</string>
+  <string name="show_clusters">Grupuri</string>
+  <string name="first_training_description">Apasă \"+\" pentru a începe un nou antrenament.</string>
+  <string name="show_average">Medie</string>
+  <string name="show_none">Fără</string>
+  <string name="left_handed">Stângaci</string>
+  <string name="right_handed">Dreptaci</string>
+  <string name="keyboard">Tastatură</string>
+  <string name="backup_drive_desc">Copierea datelor pe Google Drive permite să restaurezi toate înregistrările în cazul în care pierzi telefonul.</string>
+  <string name="backup_now">Fă o copie acum</string>
+  <string name="last_backup">Ultimul backup: %s</string>
+  <string name="recent_backups">Backup-uri recente</string>
+  <string name="dialog_restore_title">Revenire la versiunea anterioară</string>
+  <string name="restore_desc">Restaurarea va suprascrie toate datele existente cu cele din backup.</string>
+  <string name="backup_details">Detalii backup</string>
+  <string name="restore">Restaurare</string>
+  <string name="backup_location">Locație backup</string>
+  <string name="internal_storage">Stocare internă</string>
+  <string name="automatic_backup">Backup automat</string>
+  <string name="restoring">Restaurare backup…</string>
+  <string name="restore_failed">Restabilire eșuată</string>
+  <string name="delete_failed">Ștergerea a eșuat</string>
+  <string name="backup_restore_desc">Backup şi restaurare</string>
+  <string name="exporting">Se exportă…</string>
+  <string name="loading_backups_failed">Încărcarea Backup-ului nu a reuşit!</string>
+  <string name="external_storage">Stocare externă</string>
+  <string name="backup_interval">Interval backup</string>
+  <string name="daily">Zilnic</string>
+  <string name="weekly">Săptămânal</string>
+  <string name="monthly">Lunar</string>
+  <string name="connection_failed">Conectare Eșuată!</string>
+  <string name="shooting_indoor">Tragere in interior</string>
+  <string name="bow_rest_vertical_position">Poziția verticală</string>
+  <string name="bow_rest">Suport sageata</string>
+  <string name="bow_rest_horizontal_position">Poziţie orizontală</string>
+  <string name="bow_cam_settings">Setări came</string>
+  <string name="bow_letoff_weight">Valoare Letoff</string>
+  <string name="bow_nocking_point">Punct de nock</string>
+  <string name="bow_string">Coarda</string>
+  <string name="bow_scope_magnification">Lupă</string>
+  <string name="bow_rest_stiffness">Rigiditate</string>
+  <string name="bow_button">Buton</string>
+  <string name="more_fields">Mai multe câmpuri</string>
+  <string name="recently_used">Utilizate Recent</string>
+  <string name="intro_title_track_training_progress">Uita de scorul pe hartie!</string>
+  <string name="intro_description_track_training_progress">Notarea sagetilor va ajuta sa va inbunatatiti antrenamentele.</string>
+  <string name="intro_title_everything_in_one_place">Tot ce ai nevoie intr-un singur loc</string>
+  <string name="intro_description_everything_in_one_place">Include date despre arc, sageti, valorile sistemului de ochire, cronometru, statistici si multe altele…</string>
+  <string name="average_arrow_score_per_end">Media valorilor sagetilor per set</string>
+  <string name="show_end">Arata setul</string>
+  <string name="show_round">Arata runda</string>
+  <string name="show_training">Arata antrenamentul</string>
+  <string name="summary">Rezumat</string>
+  <string name="end">Set</string>
+  <string name="average_of">Media a</string>
+  <string name="displayed_shots">Arata sagetile trase</string>
+  <string name="invalid_decimal_number">Număr zecimal invalid</string>
+  <string name="not_within_expected_range_mm">Nu este in intervalul de la 1 până la 20 mm</string>
+  <string name="not_within_expected_range_inch">Nu în intervalul de 0-1 inch</string>
+  <string name="next_round">Runda urmatoare</string>
+  <string name="previous_round">Runda precedentă</string>
+  <string name="overview">Rezumat</string>
+  <string name="score">Scor</string>
+  <string name="show_reached_score">Arată scorul</string>
+  <string name="show_total_score">Arată scorul total</string>
+  <string name="show_percentage">Afișează procentajul</string>
+  <string name="show_arrow_average">Arată media săgetilor</string>
+  <string name="image_deleted">Imagine stearsa</string>
+  <string name="delete_image">Ştergeţi imaginea?</string>
+  <string name="keyboard_type">Tip tastatură</string>
+  <string name="keyboard_enabled">Tastatură activată</string>
+  <string name="sort_shots">Trageri scurte</string>
+  <string name="sort_shots_for_spots">Trageri scurte pe tinte</string>
+  <string name="target_captain">Căpitanul ţintă</string>
+  <string name="language">Limbă</string>
+  <string name="warning_backup_experimental">Avertisment: Această optiune este încă experimentală! Vă rugăm să verificaţi la intervale regulate, în cazul în care copia a fost salvată cu succes!</string>
+  <string name="drawer_open">Deschide</string>
+  <string name="drawer_close">Închide</string>
+  <string name="help">Ajutor</string>
+  <string name="home">Start</string>
+  <string name="click_to_enter_profile">Clic pentru a introduce informaţii de profil</string>
+  <string name="no_trainings">Deocamdată, nu ai niciun abonament!</string>
+  <string name="no_bows">Nu sunt arcuri</string>
+  <string name="no_arrows">Nu sunt săgeţi</string>
+  <string name="version_info">Informații versiune</string>
+  <string name="version_prefix">Versiune</string>
+  <string name="max_arrow_number">Numărul maxim de săgeti</string>
+  <string name="distances">Distanțe</string>
+  <string name="diameters">Diametre</string>
+  <string name="bows">Arcuri</string>
+  <string name="reset">Resetare</string>
+  <string name="end_x_of_y">Seturi %1$d/%2$d</string>
+  <string name="round_x_of_y">Runde %1$d/%2$d</string>
+  <string name="settings_summary_timer">Setaţi cronometru</string>
+  <string name="settings_summary_scoreboard">Schimba aspectul fisei de scor</string>
+  <string name="settings_summary_input">Personaliza ecranul</string>
+  <string name="settings_summary_overview">Personaliza informaţiile afişate pentru antrenamente, runde şi seturi</string>
+  <string name="settings_summary_profile">Informații personale</string>
+  <string name="licence_number">Licenta</string>
+  <string name="file_type">Tip fişier</string>
+  <string name="clear">Curăță</string>
+  <string name="tap_to_sign">Apăsați pentru a inscriere</string>
+  <string name="pdf_file">Fişier PDF</string>
+  <string name="image_file">Fișier imagine</string>
+  <string name="settings_summary_statistics">Ajustaţi ecranul statistici</string>
+  <string name="settings_statistics_spots_to_single_target">Pune sagetile pe o singura tinta</string>
+  <string name="keep_above_lockscreen">Deasupra ecranului de blocare</string>
+  <string name="scoreboard_title_all_rounds">Toate rundele</string>
+  <string name="permission_required">Permisiune necesară</string>
+  <string name="backup_permission_explanation"><![CDATA[Pentru a putea face o copie a datelor dumneavoastră, aplicatia are nevoie de permisiunea de a accesa stocarea interna a telefonului. Pentru a utiliza copia, du-te la setările de sistem > Apps > MyTargets > permisiuni şi permite \'Stocarea\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9f43dc69a..be6ac072b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -392,5 +392,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 03df6bb1d..6cf3193e2 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -392,5 +392,6 @@
   <string name="settings_statistics_spots_to_single_target">Agregovať body do jedného terča</string>
   <string name="keep_above_lockscreen">Ponechať nad uzamykacou obrazovkou</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 9f220faaf..784da05af 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -392,5 +392,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index b0e7255e7..51c0cf080 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -378,5 +378,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index cf0b695b1..d657f65ea 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -364,5 +364,6 @@
   <string name="settings_statistics_spots_to_single_target">Sammanfoga spottar till en tavla</string>
   <string name="keep_above_lockscreen">Håll ovanför låsskärm</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Behörighet krävs</string>
+  <string name="backup_permission_explanation"><![CDATA[För att kunna göra en säkerhetskopiering av din data så behöver appen behörighet för att komma åt den interna lagringen hos din telefon. För att använda säkerhetskopierings-funktionen, gå till systeminställningar > Appar > MyTargets > behörigheter och aktivera "lagring".]]></string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 153110947..8aeede605 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -266,7 +266,7 @@
   <string name="keyboard">Klavye</string>
   <string name="backup_drive_desc">Verilerinizi yedeklemek, telefonunuzu kaybettiğinizde veya değiştirdiğinizde tüm eğitimlerinizi geri yüklemenizi sağlar.</string>
   <string name="backup_now">Şimdi yedekle</string>
-  <string name="last_backup">Son yedekleme:% s</string>
+  <string name="last_backup">Son yedekleme: %s</string>
   <string name="recent_backups">Son yedeklemeler</string>
   <string name="dialog_restore_title">Önceki sürüme geri çevir</string>
   <string name="restore_desc">Verilerin geri yüklenmesi, var olan tüm verilerin yedekleme ile üzerine yazacaktır.</string>
@@ -364,5 +364,6 @@
   <string name="settings_statistics_spots_to_single_target">Noktaları tek hedefe topla</string>
   <string name="keep_above_lockscreen">Kilit ekranın üstünde tutun</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index ecfe601ea..a5f5cbfc9 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -177,9 +177,9 @@
   <string name="club">Клуб</string>
   <string name="target">Мішень</string>
   <string name="standard_round">Типовий раунд</string>
-  <string name="use_as_template">Use as template?</string>
+  <string name="use_as_template">Використати шаблон?</string>
   <string name="create_copy">Це типовий раунд! \ \n Створити копію замість редагування?</string>
-  <string name="practice">Practice</string>
+  <string name="practice">Тренування</string>
   <string name="edit_training">Редагувати тренінг</string>
   <string name="edit_standard_round">Змінити типовий раунд</string>
   <plurals name="arrow_deleted">
@@ -235,7 +235,7 @@
   <string name="arrow_ranking">Arrow ranking</string>
   <string name="arrow_x_of_set_of_arrows">Arrow %1$s of %2$s</string>
   <string name="display">Display</string>
-  <string name="print">Print</string>
+  <string name="print">Друкувати</string>
   <string name="table">Table</string>
   <string name="comments">Коментарі</string>
   <string name="show_points_colored">Show points colored</string>
@@ -245,11 +245,11 @@
   <string name="training_with_standard_round">Тренування у типовому раунді</string>
   <string name="free_training">Free Training</string>
   <string name="competition">Competition</string>
-  <string name="about">About</string>
+  <string name="about">Про додаток</string>
   <string name="general">General</string>
   <string name="contribute">Contribute</string>
   <string name="connect">Connect</string>
-  <string name="special_thanks_to">Special thanks to</string>
+  <string name="special_thanks_to">Особлива подяка</string>
   <string name="all_translators">All guys, who helped translating the app!</string>
   <string name="all_beta_testers">Everyone who joined the beta testers group and therefore helps to continuously improve the app.</string>
   <string name="test_beta">Test the latest beta version</string>
@@ -392,5 +392,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index fe32bf4a8..078d10699 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -350,5 +350,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ac52e0e12..d5a90250e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -350,5 +350,6 @@
   <string name="settings_statistics_spots_to_single_target">聚集点到单个目标</string>
   <string name="keep_above_lockscreen">在锁屏界面上保持显示</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index b27de73de..4640f165c 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -350,5 +350,6 @@
   <string name="settings_statistics_spots_to_single_target">Aggregate spots to single target</string>
   <string name="keep_above_lockscreen">Keep above lockscreen</string>
   <string name="scoreboard_title_all_rounds">All rounds</string>
-  <string name="invalid_number">Invalid number</string>
+  <string name="permission_required">Permission required</string>
+  <string name="backup_permission_explanation"><![CDATA[To be able to make a backup of your data, the app needs permission to access the internal storage of your phone. To use the backup feature go to system settings > Apps > MyTargets > Permissions and enable the entry \'Storage\'.]]></string>
 </resources>
diff --git a/app/src/main/res/values/translators.xml b/app/src/main/res/values/translators.xml
index b2c51934f..c0a19b2d4 100644
--- a/app/src/main/res/values/translators.xml
+++ b/app/src/main/res/values/translators.xml
@@ -16,30 +16,32 @@
 
 <resources>
     <string name="translators" translatable="false"><![CDATA[
+Arabic - Abdullah Alhussainan\n
 Catalan - Miguel Perez Arroyo\n
 Chinese - Bronya Po\n
-Chinese Simplified - Zhulin\n
-Czech / Slovak - Gizmo Sk, hswn\n
+Chinese Simplified - Zhulin, renault1912\n
+Czech - Gizmo Sk, hswn\n
 Danish - Claus Pedersen\n
 Danish - magnus_bager, Dk_archer\n
 Dutch - Robbin Haasnoot, Meikk99, Double Crownman\n
 Estonian - Martti Siitsman\n
 Finnish - Urs Ganse\n
-French - Frédéric Mazoyer, Adrien Garandel\n
+French - Frédéric Mazoyer, Adrien Garandel, Luc Van Huysse, piitaya\n
 Hebrew - gbyx, Ficell\n
 Hungarian - Ladover István, Róbert Kökény\n
-Italian - Jaco Lamborghin, Pehilj, Francesco Ambrosini, zecoh\n
+Italian - Jaco Lamborghin, Pehilj, Francesco Ambrosini, zecoh, Gabriele Manfrè\n
 Indonesian - Ario Fitrianto, Yos.dikuta\n
 Japanese - Dominic Schmidt\n
-Norwegian - Joakim Klingsheim\n
+Norwegian - Joakim Klingsheim, Fredrik Andersson\n
 Polish - Krzysztof Szymanski, Roxy Kot, corvus89\n
 Portuguese - André Morais, Brum Jose Alves Neto, Fabio Passeto, Pétala Loli, Telmo Thadeu Fonseca, Lucas Corato\n
+Romanian - Andrei Avram\n
 Russian - Dmitry Berezovsky, Лиля Костенко\n
-Slovak - Erik Summer, Iveta Ježíková, Eduard Kirchner\n
+Slovak - Erik Summer, Iveta Ježíková, Eduard Kirchner, Gizmo Sk\n
 Slovenian - Jakob Krapez\n
-Spanish - Zonio de Mena, Risck, Alejandro Guirao Rodríguez\n
-Swedish - Bojan Motoh, Tobias Nilsson, Stefan Björk\n
-Turkish - ahmetozgen, Cengiz kılıç, Mesut Albayrak, Ömer Faruk, sebenli, Ali Kömesöğütlü, SteemKALVAS\n
+Spanish - Zonio de Mena, Risck, Alejandro Guirao Rodríguez, José Soriano, Joshep Hilltower\n
+Swedish - Bojan Motoh, Tobias Nilsson, Stefan Björk, Isak Kallini\n
+Turkish - ahmetozgen, Cengiz kılıç, Mesut Albayrak, Ömer Faruk, sebenli, Ali Kömesöğütlü, SteemKALVAS, Yos.dikuta\n
 Ukrainian - Kostiantyn Zablotskiy
 ]]>
 </string>
diff --git a/shared/src/main/res/values-fr/strings.xml b/shared/src/main/res/values-fr/strings.xml
index d61a11f80..77973126b 100644
--- a/shared/src/main/res/values-fr/strings.xml
+++ b/shared/src/main/res/values-fr/strings.xml
@@ -55,20 +55,20 @@
   <string name="left_back">de l\'arrière gauche</string>
   <string name="right_back">de l\'arrière droit</string>
   <string name="stop">STOP</string>
-  <string name="end_n">End %d</string>
-  <string name="miss">Miss</string>
-  <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %d: %s</string>
+  <string name="end_n">Volée %d</string>
+  <string name="miss">Manqué</string>
+  <string name="backspace">Retour en arrière</string>
+  <string name="accessibility_description_shot_n_score">Tir %d: %s</string>
   <plurals name="rounds">
-    <item quantity="one">%d round</item>
+    <item quantity="one">%d série</item>
     <item quantity="other">%d rounds</item>
   </plurals>
   <plurals name="ends_arrow">
-    <item quantity="one">%1$d \u00D7 %2$d arrow</item>
+    <item quantity="one">%1$d \u00D7 %2$d flèche</item>
     <item quantity="other">%1$d \u00D7 %2$d arrows</item>
   </plurals>
   <plurals name="arrows_per_end">
-    <item quantity="one">%d arrow per end</item>
+    <item quantity="one">%d flèche par volée</item>
     <item quantity="other">%d arrows per end</item>
   </plurals>
 </resources>
diff --git a/shared/src/main/res/values-fr/target_faces.xml b/shared/src/main/res/values-fr/target_faces.xml
index 4c1518228..187c0dc81 100644
--- a/shared/src/main/res/values-fr/target_faces.xml
+++ b/shared/src/main/res/values-fr/target_faces.xml
@@ -50,7 +50,7 @@
   <string name="wa_danage_6_spot">WA 6 spot pour l\'entrainement</string>
   <string name="dbsc_blowpipe">DBSC sarbacane</string>
   <!-- Scoring styles -->
-  <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
+  <string name="fcfs_color_reversed">Couleur de FCFS (inversé 10 – 1)</string>
   <string name="recurve_style_x_1">Style classique (X-1)</string>
   <string name="recurve_style_10_1">Style classique (10-1)</string>
   <string name="recurve_style_x_5">Style classique (X-5)</string>
diff --git a/shared/src/main/res/values-hu/target_faces.xml b/shared/src/main/res/values-hu/target_faces.xml
index 63824a665..87eda939a 100644
--- a/shared/src/main/res/values-hu/target_faces.xml
+++ b/shared/src/main/res/values-hu/target_faces.xml
@@ -16,17 +16,17 @@
   -->
 <resources>
   <!-- Target groups -->
-  <string name="target_type_target_archery">Szokásos</string>
+  <string name="target_type_target_archery">Szabványos</string>
   <string name="target_type_field_archery">Terep</string>
   <string name="target_type_3d_archery">3D</string>
   <!-- Target names -->
   <string name="wa_full">WA teljes</string>
-  <string name="wa_6_ring">WA 6 szűkétés</string>
-  <string name="wa_5_ring">WA 5 szűkítés</string>
-  <string name="wa_3_ring">WA 3 szűkítés</string>
+  <string name="wa_6_ring">WA 6-os szűkétéssel</string>
+  <string name="wa_5_ring">WA 5-ös szűkítéssel</string>
+  <string name="wa_3_ring">WA 3-as szűkítéssel</string>
   <string name="vegas_3_spot">Vegas 3as lőlap</string>
   <string name="vertical_3_spot">WA függőleges 3as lőlap</string>
-  <string name="wa_3_ring_3_spot">WA 3 szűkítés 3as lőlap</string>
+  <string name="wa_3_ring_3_spot">WA 3-as szűkítés 3as lőlap</string>
   <string name="nfaa_field">NFAA terep</string>
   <string name="nfaa_expert_field">NFAA haladó terep</string>
   <string name="nfaa_hunter">NFAA vadász</string>
@@ -45,7 +45,7 @@
   <string name="nfas_field">NFAS terep</string>
   <string name="beursault">Beursault</string>
   <string name="sca_period">SCA időszak</string>
-  <string name="wa_field_3_spot">WA Field 3 pontos</string>
+  <string name="wa_field_3_spot">WA Field 3-as lőlap</string>
   <string name="wa_danage_3_spot">WA Danage 3 pontos</string>
   <string name="wa_danage_6_spot">WA Danage 6 pontos</string>
   <string name="dbsc_blowpipe">DBSC fúvócső</string>
diff --git a/shared/src/main/res/values-no/strings.xml b/shared/src/main/res/values-no/strings.xml
index cade05f25..9926bc0a6 100644
--- a/shared/src/main/res/values-no/strings.xml
+++ b/shared/src/main/res/values-no/strings.xml
@@ -54,7 +54,7 @@
   <string name="right_front">fra foran til høyre</string>
   <string name="left_back">fra bak til venstre</string>
   <string name="right_back">fra bak til høyre</string>
-  <string name="stop">STOP</string>
+  <string name="stop">STOPP</string>
   <string name="end_n">End %d</string>
   <string name="miss">Miss</string>
   <string name="backspace">Backspace</string>
diff --git a/shared/src/main/res/values-ro/rounds.xml b/shared/src/main/res/values-ro/rounds.xml
index 8cc6d7b64..d9a732c53 100644
--- a/shared/src/main/res/values-ro/rounds.xml
+++ b/shared/src/main/res/values-ro/rounds.xml
@@ -32,11 +32,11 @@
   <string name="portsmouth">Portsmouth</string>
   <string name="worcester">Worcester</string>
   <string name="vegas_300">Vegas 300</string>
-  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adult/Youth</string>
-  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Cub</string>
+  <string name="ifaa_150_indoor">IFAA 150 Indoor: Adulti/Tineret</string>
+  <string name="ifaa_150_indoor_cub">IFAA 150 Indoor: Copii</string>
   <string name="nasp_300">NASP 300</string>
   <string name="nfaa_420">NFAA 420</string>
-  <string name="nfaa_300_cub">NFAA/IFAA 300: Cub</string>
+  <string name="nfaa_300_cub">NFAA/IFAA 300: Copii</string>
   <string name="flint_bowman_indoor">Flint Bowman Indoor</string>
   <!-- WA -->
   <string name="wa_individual_compound_eleminiation_18">WA Individual Compound Elimination 18m</string>
@@ -51,15 +51,15 @@
   <string name="wa_70">WA 70</string>
   <string name="wa_900">WA 900</string>
   <string name="wa_bowman">WA Bowman</string>
-  <string name="wa_1440_cadet_men">WA 1440 Cadet Men</string>
-  <string name="wa_1440_cadet_women">WA 1440 Cadet Women</string>
+  <string name="wa_1440_cadet_men">WA 1440 Cadeti Masculin</string>
+  <string name="wa_1440_cadet_women">WA 1440 Cadeti Feminin</string>
   <string name="wa_compound_individual">WA Compound Individual</string>
   <string name="wa_compound_qualification">WA Compound Qualification</string>
-  <string name="wa_cub">WA Cub</string>
+  <string name="wa_cub">WA Copii</string>
   <string name="wa_standard">WA Standard</string>
   <string name="olympic_round">Olympic Round</string>
-  <string name="wa_1440_junior_men">WA 1440 Junior Men</string>
-  <string name="wa_1440_junior_women">WA 1440 Junior Women</string>
+  <string name="wa_1440_junior_men">WA 1440 Junior Masculin</string>
+  <string name="wa_1440_junior_women">WA 1440 Junior Feminin</string>
   <string name="wa_1440_men_master_50">WA 1440 Men Master 50+</string>
   <string name="wa_1440_men_master_60">WA 1440 Men Master 60+</string>
   <string name="wa_1440_men_master_70">WA 1440 Men Master 70+</string>
diff --git a/shared/src/main/res/values-ro/strings.xml b/shared/src/main/res/values-ro/strings.xml
index 722109655..3580de812 100644
--- a/shared/src/main/res/values-ro/strings.xml
+++ b/shared/src/main/res/values-ro/strings.xml
@@ -26,7 +26,7 @@
   <string name="cloudy">Înnorat</string>
   <string name="light_rain">Ploaie ușoară</string>
   <string name="rain">Ploios</string>
-  <string name="round_desc">%1$s: %2$d &#215; %3$d arrows (%4$s face)</string>
+  <string name="round_desc">%1$s: %2$d &#215; %3$d săgeţi (tinta %4$s)</string>
   <string name="mini">Mini</string>
   <string name="small">Mică</string>
   <string name="medium">Medie</string>
@@ -56,9 +56,9 @@
   <string name="right_back">din spate dreapta</string>
   <string name="stop">STOP</string>
   <string name="end_n">Setul %d</string>
-  <string name="miss">Miss</string>
+  <string name="miss">Ratare</string>
   <string name="backspace">Backspace</string>
-  <string name="accessibility_description_shot_n_score">Shot %d: %s</string>
+  <string name="accessibility_description_shot_n_score">Tragerea %1$d: %2$s</string>
   <plurals name="rounds">
     <item quantity="one">%d runda</item>
     <item quantity="few">%d runde</item>
diff --git a/shared/src/main/res/values-ro/target_faces.xml b/shared/src/main/res/values-ro/target_faces.xml
index f7e59fc25..bf8fe315d 100644
--- a/shared/src/main/res/values-ro/target_faces.xml
+++ b/shared/src/main/res/values-ro/target_faces.xml
@@ -16,9 +16,9 @@
   -->
 <resources>
   <!-- Target groups -->
-  <string name="target_type_target_archery">Regular</string>
-  <string name="target_type_field_archery">Field</string>
-  <string name="target_type_3d_archery">3D</string>
+  <string name="target_type_target_archery">Normală</string>
+  <string name="target_type_field_archery">Teren</string>
+  <string name="target_type_3d_archery">3D animale</string>
   <!-- Target names -->
   <string name="wa_full">WA Full</string>
   <string name="wa_6_ring">WA 6 Ring</string>
@@ -28,7 +28,7 @@
   <string name="vertical_3_spot">WA Vertical 3 Spot</string>
   <string name="wa_3_ring_3_spot">WA 3 Ring 3 Spot</string>
   <string name="nfaa_field">NFAA Field</string>
-  <string name="nfaa_expert_field">NFAA Expert Field</string>
+  <string name="nfaa_expert_field">NFAA Field Expert</string>
   <string name="nfaa_hunter">NFAA Hunter</string>
   <string name="nfaa_indoor">NFAA Indoor</string>
   <string name="nfaa_indoor_5_spot">NFAA Indoor 5 Spot</string>
diff --git a/wearable/src/main/res/values-fr/strings.xml b/wearable/src/main/res/values-fr/strings.xml
index 002228a54..89d5bc7e7 100644
--- a/wearable/src/main/res/values-fr/strings.xml
+++ b/wearable/src/main/res/values-fr/strings.xml
@@ -17,11 +17,11 @@
 <resources>
   <string name="saved">Enregistré</string>
   <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
+  <string name="add_end">Ajouter une volée</string>
+  <string name="toggle_timer">Activer/désactiver le timer</string>
+  <string name="start_timer">Démarrer le timer</string>
   <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+  <string name="sound">Son</string>
+  <string name="today">aujourd\'hui</string>
+  <string name="notification_channel_default">Défaut</string>
 </resources>
diff --git a/wearable/src/main/res/values-ro/strings.xml b/wearable/src/main/res/values-ro/strings.xml
index 2c33eb5e2..9084bb0c6 100644
--- a/wearable/src/main/res/values-ro/strings.xml
+++ b/wearable/src/main/res/values-ro/strings.xml
@@ -15,13 +15,13 @@
   ~ GNU General Public License for more details.
   -->
 <resources>
-  <string name="saved">Saved</string>
-  <string name="start_phone_app">Start the app on your phone to continue…</string>
-  <string name="add_end">Add end</string>
-  <string name="toggle_timer">Toggle timer</string>
-  <string name="start_timer">Start timer</string>
-  <string name="vibration">Vibration</string>
-  <string name="sound">Sound</string>
-  <string name="today">today</string>
-  <string name="notification_channel_default">Default</string>
+  <string name="saved">Salvat</string>
+  <string name="start_phone_app">Porniţi aplicaţia pentru a continua…</string>
+  <string name="add_end">Adaugă Set</string>
+  <string name="toggle_timer">Comuta cronometru</string>
+  <string name="start_timer">Porneste cronometrul</string>
+  <string name="vibration">Vibrare</string>
+  <string name="sound">Sunet</string>
+  <string name="today">azi</string>
+  <string name="notification_channel_default">Implicit</string>
 </resources>

From e8361e0d14fb9ac5c124dcc2ff8f6040c7b6e99c Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Sun, 29 Jul 2018 15:12:35 +0200
Subject: [PATCH 096/102] Refactored target models to use lists instead of
 arrays

---
 app/build.gradle                                   |  2 +-
 .../features/training/target/TargetListFragment.kt |  2 +-
 dependencies.gradle                                |  4 ++--
 shared/build.gradle                                |  2 +-
 .../shared/targets/models/TargetModelBaseTest.kt   | 14 +++++++-------
 .../de/dreier/mytargets/shared/models/Target.kt    |  2 +-
 .../mytargets/shared/targets/Target3DBase.kt       |  6 +++---
 .../mytargets/shared/targets/TargetFactory.kt      | 11 +++++------
 .../mytargets/shared/targets/models/ASA3D.kt       |  4 ++--
 .../mytargets/shared/targets/models/ASA3D14.kt     |  4 ++--
 .../mytargets/shared/targets/models/Beursault.kt   |  6 +++---
 .../mytargets/shared/targets/models/DAIR3D.kt      |  4 ++--
 .../shared/targets/models/DBSCBlowpipe.kt          |  6 +++---
 .../mytargets/shared/targets/models/HitOrMiss.kt   |  6 +++---
 .../mytargets/shared/targets/models/IBO3D.kt       |  4 ++--
 .../mytargets/shared/targets/models/IFAAAnimal.kt  |  6 +++---
 .../mytargets/shared/targets/models/NFAAAnimal.kt  |  6 +++---
 .../shared/targets/models/NFAAExpertField.kt       |  6 +++---
 .../mytargets/shared/targets/models/NFAAField.kt   |  6 +++---
 .../mytargets/shared/targets/models/NFAAHunter.kt  |  6 +++---
 .../mytargets/shared/targets/models/NFAAIndoor.kt  |  6 +++---
 .../shared/targets/models/NFAAIndoor5Spot.kt       |  8 ++++----
 .../mytargets/shared/targets/models/NFAS3D.kt      |  4 ++--
 .../mytargets/shared/targets/models/NFASField.kt   |  6 +++---
 .../mytargets/shared/targets/models/SCAPeriod.kt   |  6 +++---
 .../shared/targets/models/TargetModelBase.kt       | 10 +++++-----
 .../mytargets/shared/targets/models/WA3Ring.kt     |  8 ++++----
 .../shared/targets/models/WA3Ring3Spot.kt          |  4 ++--
 .../mytargets/shared/targets/models/WA5Ring.kt     |  8 ++++----
 .../mytargets/shared/targets/models/WA6Ring.kt     |  6 +++---
 .../shared/targets/models/WADanage3Spot.kt         |  4 ++--
 .../shared/targets/models/WADanage6Spot.kt         |  4 ++--
 .../mytargets/shared/targets/models/WAField.kt     |  6 +++---
 .../shared/targets/models/WAField3Spot.kt          |  2 +-
 .../mytargets/shared/targets/models/WAFull.kt      |  6 +++---
 .../shared/targets/models/WAVegas3Spot.kt          |  4 ++--
 .../shared/targets/models/WAVertical3Spot.kt       |  4 ++--
 .../mytargets/shared/targets/models/Worcester.kt   |  6 +++---
 wearable/build.gradle                              |  3 ++-
 39 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index af45427ee..972601e60 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -112,7 +112,7 @@ apply from: '../tools/script-play-store.gradle'
 dependencies {
     Map<String, String> dependencies = rootProject.ext.dependencies
 
-    implementation dependencies.kotlinStdlibJre7
+    implementation dependencies.kotlinStdlibJdk7
 
     implementation dependencies.supportCompat
     implementation dependencies.supportCoreUtils
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
index 9df799048..c5aaaff37 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/target/TargetListFragment.kt
@@ -160,7 +160,7 @@ class TargetListFragment :
         spinner.onItemSelectedListener = this
     }
 
-    private fun diameterToList(diameters: Array<Dimension>): List<String> {
+    private fun diameterToList(diameters: List<Dimension>): List<String> {
         return diameters.map { it.toString() }
     }
 
diff --git a/dependencies.gradle b/dependencies.gradle
index d850c2ebd..b21776987 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -40,7 +40,7 @@ ext {
             permissionsdispatcher     : '3.2.0',
             photoView                 : '2.1.3',
             picasso                   : '2.5.2',
-            playService               : '15.0.1',
+            playService               : '15.0.0',
             retrofit                  : '2.4.0',
             roundedImageView          : '2.3.0',
             screengrab                : '1.2.0',
@@ -150,7 +150,7 @@ ext {
 
             screengrab                    : "tools.fastlane:screengrab:$libraryVersion.screengrab",
 
-            kotlinStdlibJre7              : "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion",
+            kotlinStdlibJdk7              : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion",
             kotlinTest                    : "org.jetbrains.kotlin:kotlin-test:$kotlinVersion",
             kotlinTestJunit               : "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion",
 
diff --git a/shared/build.gradle b/shared/build.gradle
index e20c2b803..b1f219d34 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -66,5 +66,5 @@ dependencies {
     testImplementation dependencies.jUnit
     testImplementation dependencies.mockito
     androidTestImplementation dependencies.runner
-    implementation dependencies.kotlinStdlibJre7
+    implementation dependencies.kotlinStdlibJdk7
 }
\ No newline at end of file
diff --git a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.kt b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.kt
index b0333831e..f2ace9892 100644
--- a/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.kt
+++ b/shared/src/androidTest/java/de/dreier/mytargets/shared/targets/models/TargetModelBaseTest.kt
@@ -37,7 +37,7 @@ class TargetModelBaseTest {
     @Throws(Exception::class)
     fun trivialTargetRealSize() {
         for (id in NFAAField.ID..WAField3Spot.ID) {
-            val target = TargetFactory.getTarget(id.toInt())
+            val target = TargetFactory.getTarget(id)
             val diameter = Dimension(40f, Dimension.Unit.CENTIMETER)
             val realSize = target.getRealSize(diameter)
             Assert.assertEquals("Real size $realSize for target id $id does not match with expected value 40cm",
@@ -48,7 +48,7 @@ class TargetModelBaseTest {
     @Test
     @Throws(Exception::class)
     fun waFieldRealSize() {
-        val target = TargetFactory.getTarget(WAField.ID.toInt())
+        val target = TargetFactory.getTarget(WAField.ID)
         val diameter = Dimension(40f, Dimension.Unit.CENTIMETER)
         val realSize = target.getRealSize(diameter)
         Assert.assertEquals(realSize, Dimension(40f, Dimension.Unit.CENTIMETER))
@@ -57,7 +57,7 @@ class TargetModelBaseTest {
     @Test
     @Throws(Exception::class)
     fun waVertical3SpotRealSize() {
-        val target = TargetFactory.getTarget(WAVertical3Spot.ID.toInt())
+        val target = TargetFactory.getTarget(WAVertical3Spot.ID)
         val diameter = Dimension(40f, Dimension.Unit.CENTIMETER)
         val realSize = target.getRealSize(diameter)
         Assert.assertEquals(realSize, Dimension(20f, Dimension.Unit.CENTIMETER))
@@ -66,7 +66,7 @@ class TargetModelBaseTest {
     @Test
     @Throws(Exception::class)
     fun waFullRealSize() {
-        val target = TargetFactory.getTarget(WAFull.ID.toInt())
+        val target = TargetFactory.getTarget(WAFull.ID)
         val diameter = Dimension(40f, Dimension.Unit.CENTIMETER)
         val realSize = target.getRealSize(diameter)
         Assert.assertEquals(realSize, Dimension(40f, Dimension.Unit.CENTIMETER))
@@ -75,7 +75,7 @@ class TargetModelBaseTest {
     @Test
     @Throws(Exception::class)
     fun wa6RingRealSize() {
-        val target = TargetFactory.getTarget(WA6Ring.ID.toInt())
+        val target = TargetFactory.getTarget(WA6Ring.ID)
         val diameter = Dimension(40f, Dimension.Unit.CENTIMETER)
         val realSize = target.getRealSize(diameter)
         Assert.assertEquals(realSize, Dimension(24f, Dimension.Unit.CENTIMETER))
@@ -84,7 +84,7 @@ class TargetModelBaseTest {
     @Test
     @Throws(Exception::class)
     fun wa5RingRealSize() {
-        val target = TargetFactory.getTarget(WA5Ring.ID.toInt())
+        val target = TargetFactory.getTarget(WA5Ring.ID)
         val diameter = Dimension(40f, Dimension.Unit.CENTIMETER)
         val realSize = target.getRealSize(diameter)
         Assert.assertEquals(realSize, Dimension(20f, Dimension.Unit.CENTIMETER))
@@ -93,7 +93,7 @@ class TargetModelBaseTest {
     @Test
     @Throws(Exception::class)
     fun wa3RingRealSize() {
-        val target = TargetFactory.getTarget(WA3Ring.ID.toInt())
+        val target = TargetFactory.getTarget(WA3Ring.ID)
         val diameter = Dimension(40f, Dimension.Unit.CENTIMETER)
         val realSize = target.getRealSize(diameter)
         Assert.assertEquals(realSize, Dimension(12f, Dimension.Unit.CENTIMETER))
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt b/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
index 9e0bf5874..13d9198f6 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/models/Target.kt
@@ -42,7 +42,7 @@ data class Target(
 
     @IgnoredOnParcel
     @delegate:Ignore
-    val model: TargetModelBase by lazy { TargetFactory.getTarget(id.toInt()) }
+    val model: TargetModelBase by lazy { TargetFactory.getTarget(id) }
     @IgnoredOnParcel
     @delegate:Ignore
     val drawable: TargetDrawable by lazy { TargetDrawable(this) }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/Target3DBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/Target3DBase.kt
index 900382302..91eb0fef6 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/Target3DBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/Target3DBase.kt
@@ -24,12 +24,12 @@ import de.dreier.mytargets.shared.targets.zone.ZoneBase
 abstract class Target3DBase protected constructor(
         id: Long,
         @StringRes nameRes: Int,
-        zones: Array<ZoneBase>,
-        scoringStyles: Array<ScoringStyle>
+        zones: List<ZoneBase>,
+        scoringStyles: List<ScoringStyle>
 ) : TargetModelBase(
         id = id,
         nameRes = nameRes,
-        diameters = arrayOf(Diameter.MINI, Diameter.SMALL, Diameter.MEDIUM, Diameter.LARGE, Diameter.XLARGE),
+        diameters = listOf(Diameter.MINI, Diameter.SMALL, Diameter.MEDIUM, Diameter.LARGE, Diameter.XLARGE),
         type = ETargetType.THREE_D,
         zones = zones,
         scoringStyles = scoringStyles
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/TargetFactory.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/TargetFactory.kt
index bdbdc6cfa..a6fca6c07 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/TargetFactory.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/TargetFactory.kt
@@ -22,10 +22,10 @@ object TargetFactory {
 
     private val list: MutableList<TargetModelBase>
 
-    private var idIndexLookup: Array<Int?>
+    private var idIndexLookup = mutableMapOf<Long, Int>()
 
     val comparator: Comparator<Target>
-        get() = compareBy { idIndexLookup[(it.id).toInt()]!! }
+        get() = compareBy { idIndexLookup[it.id]!! }
 
     init {
         list = ArrayList()
@@ -61,9 +61,8 @@ object TargetFactory {
     }
 
     init {
-        idIndexLookup = arrayOfNulls(list.size)
         for (i in list.indices) {
-            idIndexLookup[list[i].id.toInt()] = i
+            idIndexLookup[list[i].id] = i
         }
     }
 
@@ -82,12 +81,12 @@ object TargetFactory {
             out.add(NFAAIndoor())
             out.add(NFAAIndoor5Spot())
         } else {
-            out.add(list[idIndexLookup[(target.id).toInt()]!!])
+            out.add(list[idIndexLookup[target.id]!!])
         }
         return out
     }
 
-    fun getTarget(id: Int): TargetModelBase {
+    fun getTarget(id: Long): TargetModelBase {
         return list[idIndexLookup[id]!!]
     }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/ASA3D.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/ASA3D.kt
index c6d9d8a35..6098e027a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/ASA3D.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/ASA3D.kt
@@ -29,7 +29,7 @@ import de.dreier.mytargets.shared.utils.Color.TURBO_YELLOW
 class ASA3D : Target3DBase(
         id = 15,
         nameRes = R.string.asa_3d,
-        zones = arrayOf(
+        zones = listOf(
                 CircularZone(0.053396f, 0.274396f, -0.089198f, TURBO_YELLOW, BLACK, 3),
                 CircularZone(0.053396f, -0.017104004f, 0.399802f, TURBO_YELLOW, BLACK, 3),
                 CircularZone(0.124f, 0.274396f, -0.089198f, TURBO_YELLOW, BLACK, 3),
@@ -38,7 +38,7 @@ class ASA3D : Target3DBase(
                 HeartZone(1.0f, 0.0f, 0.0f, LIGHT_GRAY, BLACK, 3),
                 CircularZone(1.0f, 0.0f, 0.0f, BROWN, GRAY, 5)
         ),
-        scoringStyles = arrayOf(
+        scoringStyles = listOf(
                 ScoringStyle(false, 12, 12, 12, 12, 10, 8, 5)
         )
 )
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/ASA3D14.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/ASA3D14.kt
index 7c8bafcf3..5a35cbfc4 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/ASA3D14.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/ASA3D14.kt
@@ -30,7 +30,7 @@ import de.dreier.mytargets.shared.utils.Color.TURBO_YELLOW
 class ASA3D14 : Target3DBase(
         id = 16,
         nameRes = R.string.asa_3d_14,
-        zones = arrayOf(
+        zones = listOf(
                 CircularZone(0.053396f, -0.631104f, -0.49886402f, GREEN, BLACK, 3),
                 CircularZone(0.124f, -0.631104f, -0.49886402f, GREEN, BLACK, 3),
                 CircularZone(0.053396f, 0.274396f, -0.089198f, TURBO_YELLOW, BLACK, 3),
@@ -41,7 +41,7 @@ class ASA3D14 : Target3DBase(
                 HeartZone(1.0f, 0.0f, 0.0f, LIGHT_GRAY, BLACK, 3),
                 CircularZone(1.0f, 0.0f, 0.0f, BROWN, GRAY, 5)
         ),
-        scoringStyles = arrayOf(
+        scoringStyles = listOf(
                 ScoringStyle(false, 14, 14, 12, 12, 12, 12, 10, 8, 5)
         )
 )
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/Beursault.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/Beursault.kt
index 99e4c747e..ff4b4786a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/Beursault.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/Beursault.kt
@@ -26,8 +26,8 @@ import de.dreier.mytargets.shared.utils.Color.DARK_GRAY
 class Beursault : TargetModelBase(
         id = 23,
         nameRes = R.string.beursault,
-        diameters = arrayOf(Dimension(48f, CENTIMETER)),
-        zones = arrayOf(
+        diameters = listOf(Dimension(48f, CENTIMETER)),
+        zones = listOf(
                 CircularZone(0.062178f, WHITE, DARK_GRAY, 27, false),
                 CircularZone(0.13934599f, WHITE, DARK_GRAY, 6, false),
                 CircularZone(0.19715601f, WHITE, DARK_GRAY, 6, false),
@@ -37,7 +37,7 @@ class Beursault : TargetModelBase(
                 CircularZone(0.820678f, WHITE, DARK_GRAY, 6, false),
                 CircularZone(1.0f, WHITE, DARK_GRAY, 27, false)
         ),
-        scoringStyles = arrayOf(
+        scoringStyles = listOf(
                 ScoringStyle(false, 4, 4, 3, 3, 2, 2, 1, 1)
         )
 ) {
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/DAIR3D.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/DAIR3D.kt
index a0b12fdd9..dd5aea35a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/DAIR3D.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/DAIR3D.kt
@@ -31,7 +31,7 @@ import de.dreier.mytargets.shared.utils.Color.TURBO_YELLOW
 class DAIR3D : Target3DBase(
         id = ID,
         nameRes = R.string.dair_3d,
-        zones = arrayOf(
+        zones = listOf(
                 CircularZone(0.053396f, -0.631104f, -0.49886402f, GREEN, BLACK, 3),
                 CircularZone(0.124f, -0.631104f, -0.49886402f, GREEN, BLACK, 3),
                 CircularZone(0.053396f, 0.274396f, -0.089198f, TURBO_YELLOW, BLACK, 3),
@@ -44,7 +44,7 @@ class DAIR3D : Target3DBase(
                 HeartZone(1.0f, 0.0f, 0.0f, LIGHT_GRAY, BLACK, 3),
                 CircularZone(1.0f, 0.0f, 0.0f, BROWN, GRAY, 5)
         ),
-        scoringStyles = arrayOf(
+        scoringStyles = listOf(
                 ScoringStyle(false, 8, 8, 12, 12, 12, 12, 11, 11, 10, 8, 0),
                 ScoringStyle(false, 14, 14, 12, 12, 12, 12, 11, 11, 10, 8, 0),
                 ScoringStyle(false, 8, 8, 12, 12, 12, 12, 10, 10, 10, 8, 0),
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/DBSCBlowpipe.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/DBSCBlowpipe.kt
index 88ac72d20..1f03e20d6 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/DBSCBlowpipe.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/DBSCBlowpipe.kt
@@ -27,13 +27,13 @@ import de.dreier.mytargets.shared.utils.Color.DBSC_YELLOW
 class DBSCBlowpipe : TargetModelBase(
         id = ID,
         nameRes = R.string.dbsc_blowpipe,
-        diameters = arrayOf(Dimension(18f, CENTIMETER)),
-        zones = arrayOf(
+        diameters = listOf(Dimension(18f, CENTIMETER)),
+        zones = listOf(
                 CircularZone(0.3333f, DBSC_YELLOW, DARK_GRAY, 8),
                 CircularZone(0.6666f, DBSC_RED, DARK_GRAY, 8),
                 CircularZone(1f, DBSC_BLUE, DARK_GRAY, 8)
         ),
-        scoringStyles = arrayOf(ScoringStyle(false, 7, 5, 3))
+        scoringStyles = listOf(ScoringStyle(false, 7, 5, 3))
 ) {
     companion object {
         const val ID = 28L
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/HitOrMiss.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/HitOrMiss.kt
index 30644e77a..86c74d0e8 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/HitOrMiss.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/HitOrMiss.kt
@@ -26,12 +26,12 @@ import de.dreier.mytargets.shared.utils.Color.YELLOW
 
 class HitOrMiss : TargetModelBase(id = 14,
         nameRes = R.string.hit_or_miss,
-        zones = arrayOf(
+        zones = listOf(
                 CircularZone(0.25f, YELLOW, DARK_GRAY, 3),
                 CircularZone(1.0f, RED_MISS, DARK_GRAY, 3)
         ),
-        scoringStyles = arrayOf(ScoringStyle(false, 1, 0)),
-        diameters = arrayOf(Dimension(30f, CENTIMETER), Dimension(96f, CENTIMETER))
+        scoringStyles = listOf(ScoringStyle(false, 1, 0)),
+        diameters = listOf(Dimension(30f, CENTIMETER), Dimension(96f, CENTIMETER))
 ) {
     init {
         decorator = CenterMarkDecorator(DARK_GRAY, 4.188f, 4, false)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IBO3D.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IBO3D.kt
index 2fa5406b3..52f8efccd 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IBO3D.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IBO3D.kt
@@ -29,12 +29,12 @@ import de.dreier.mytargets.shared.utils.Color.RED
 class IBO3D : Target3DBase(
         id = 17,
         nameRes = R.string.ibo_3d,
-        zones = arrayOf(
+        zones = listOf(
                 CircularZone(0.053396f, 0.12689404f, 0.15313196f, RED, BLACK, 3),
                 CircularZone(0.124f, 0.12689404f, 0.15313196f, RED, BLACK, 3),
                 CircularZone(0.417876f, 0.12875f, 0.15562597f, CERULEAN_BLUE, BLACK, 4),
                 HeartZone(1.0f, 0.0f, 0.0f, LIGHT_GRAY, BLACK, 3),
                 CircularZone(1.0f, 0.0f, 0.0f, BROWN, GRAY, 5)
         ),
-        scoringStyles = arrayOf(ScoringStyle(false, 11, 11, 10, 8, 5))
+        scoringStyles = listOf(ScoringStyle(false, 11, 11, 10, 8, 5))
 )
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IFAAAnimal.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IFAAAnimal.kt
index 12d5f9917..801abff33 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IFAAAnimal.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/IFAAAnimal.kt
@@ -28,12 +28,12 @@ import de.dreier.mytargets.shared.utils.Color.ORANGE
 class IFAAAnimal : TargetModelBase(
         id = ID,
         nameRes = R.string.ifaa_animal,
-        diameters = arrayOf(Diameter.SMALL, Diameter.MEDIUM, Diameter.LARGE, Diameter.XLARGE),
-        zones = arrayOf(
+        diameters = listOf(Diameter.SMALL, Diameter.MEDIUM, Diameter.LARGE, Diameter.XLARGE),
+        zones = listOf(
                 EllipseZone(1.0f, 0.0f, 0.0f, ORANGE, BLACK, 4),
                 CircularZone(1.0f, LIGHTER_GRAY, GRAY, 3)
         ),
-        scoringStyles = arrayOf(
+        scoringStyles = listOf(
                 ArrowAwareScoringStyle(false, arrayOf(intArrayOf(20, 18), intArrayOf(16, 14), intArrayOf(12, 10))),
                 ArrowAwareScoringStyle(false, arrayOf(intArrayOf(20, 15), intArrayOf(15, 10))),
                 ArrowAwareScoringStyle(false, arrayOf(intArrayOf(20, 16), intArrayOf(14, 10), intArrayOf(8, 4))),
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAAnimal.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAAnimal.kt
index 55901f132..336ce342e 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAAnimal.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAAnimal.kt
@@ -30,13 +30,13 @@ import de.dreier.mytargets.shared.utils.Color.TURBO_YELLOW
 class NFAAAnimal : TargetModelBase(
         id = ID,
         nameRes = R.string.nfaa_animal,
-        diameters = arrayOf(Diameter.SMALL, Diameter.MEDIUM, Diameter.LARGE, Diameter.XLARGE),
-        zones = arrayOf(
+        diameters = listOf(Diameter.SMALL, Diameter.MEDIUM, Diameter.LARGE, Diameter.XLARGE),
+        zones = listOf(
                 CircularZone(0.162f, TURBO_YELLOW, BLACK, 5),
                 EllipseZone(1.0f, 0.0f, 0.0f, ORANGE, BLACK, 4),
                 CircularZone(1.0f, LIGHTER_GRAY, GRAY, 3)
         ),
-        scoringStyles = arrayOf(
+        scoringStyles = listOf(
                 ArrowAwareScoringStyle(false, arrayOf(intArrayOf(21, 20, 18), intArrayOf(17, 16, 14), intArrayOf(13, 12, 10))),
                 ScoringStyle(false, 20, 16, 10),
                 ScoringStyle(false, 15, 12, 7),
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAExpertField.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAExpertField.kt
index 0c8c1d2e7..71028860d 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAExpertField.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAExpertField.kt
@@ -27,7 +27,7 @@ import de.dreier.mytargets.shared.utils.Color.WHITE
 class NFAAExpertField : TargetModelBase(
         id = ID,
         nameRes = R.string.nfaa_expert_field,
-        zones = arrayOf(
+        zones = listOf(
                 CircularZone(0.1f, DARK_GRAY, WHITE, 4),
                 CircularZone(0.2f, DARK_GRAY, DARK_GRAY, 0),
                 CircularZone(0.4f, WHITE, DARK_GRAY, 4),
@@ -35,8 +35,8 @@ class NFAAExpertField : TargetModelBase(
                 CircularZone(0.8f, DARK_GRAY, WHITE, 4),
                 CircularZone(1.0f, DARK_GRAY, DARK_GRAY, 0)
         ),
-        scoringStyles = arrayOf(ScoringStyle(true, 6, 5, 4, 3, 2, 1)),
-        diameters = arrayOf(
+        scoringStyles = listOf(ScoringStyle(true, 6, 5, 4, 3, 2, 1)),
+        diameters = listOf(
                 Dimension(20f, CENTIMETER),
                 Dimension(35f, CENTIMETER),
                 Dimension(50f, CENTIMETER),
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAField.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAField.kt
index 0b2492ac8..bcc3c8f75 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAField.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAField.kt
@@ -27,7 +27,7 @@ import de.dreier.mytargets.shared.utils.Color.WHITE
 class NFAAField : TargetModelBase(
         id = ID,
         nameRes = R.string.nfaa_field,
-        zones = arrayOf(
+        zones = listOf(
                 CircularZone(0.1f, DARK_GRAY, WHITE, 4),
                 CircularZone(0.2f, DARK_GRAY, DARK_GRAY, 0),
                 CircularZone(0.4f, WHITE, DARK_GRAY, 4),
@@ -35,11 +35,11 @@ class NFAAField : TargetModelBase(
                 CircularZone(0.8f, DARK_GRAY, WHITE, 4),
                 CircularZone(1.0f, DARK_GRAY, DARK_GRAY, 0)
         ),
-        scoringStyles = arrayOf(
+        scoringStyles = listOf(
                 ScoringStyle(true, 5, 5, 4, 4, 3, 3),
                 ScoringStyle(false, 6, 5, 4, 4, 3, 3)
         ),
-        diameters = arrayOf(
+        diameters = listOf(
                 Dimension(20f, CENTIMETER),
                 Dimension(35f, CENTIMETER),
                 Dimension(50f, CENTIMETER),
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAHunter.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAHunter.kt
index 634778d72..1f4ca9b56 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAHunter.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAHunter.kt
@@ -27,17 +27,17 @@ import de.dreier.mytargets.shared.utils.Color.WHITE
 class NFAAHunter : TargetModelBase(
         id = ID,
         nameRes = R.string.nfaa_hunter,
-        zones = arrayOf(
+        zones = listOf(
                 CircularZone(0.1f, WHITE, DARK_GRAY, 4),
                 CircularZone(0.2f, WHITE, WHITE, 0),
                 CircularZone(0.6f, DARK_GRAY, WHITE, 4),
                 CircularZone(1.0f, DARK_GRAY, DARK_GRAY, 0)
         ),
-        scoringStyles = arrayOf(
+        scoringStyles = listOf(
                 ScoringStyle(true, 5, 5, 4, 3),
                 ScoringStyle(false, 6, 5, 4, 3)
         ),
-        diameters = arrayOf(
+        diameters = listOf(
                 Dimension(20f, CENTIMETER),
                 Dimension(35f, CENTIMETER),
                 Dimension(50f, CENTIMETER),
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAIndoor.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAIndoor.kt
index 2af42bd2d..e0f25076f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAIndoor.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAIndoor.kt
@@ -27,7 +27,7 @@ import de.dreier.mytargets.shared.utils.Color.WHITE
 class NFAAIndoor : TargetModelBase(
         id = ID,
         nameRes = R.string.nfaa_indoor,
-        zones = arrayOf(
+        zones = listOf(
                 CircularZone(0.1f, WHITE, DARK_GRAY, 4),
                 CircularZone(0.2f, WHITE, DARK_GRAY, 0),
                 CircularZone(0.4f, SAPPHIRE_BLUE, WHITE, 4),
@@ -35,12 +35,12 @@ class NFAAIndoor : TargetModelBase(
                 CircularZone(0.8f, SAPPHIRE_BLUE, WHITE, 4),
                 CircularZone(1.0f, SAPPHIRE_BLUE, WHITE, 4)
         ),
-        scoringStyles = arrayOf(
+        scoringStyles = listOf(
                 ScoringStyle(true, 5, 5, 4, 3, 2, 1),
                 ScoringStyle(false, 6, 5, 4, 3, 2, 1),
                 ScoringStyle(false, 7, 5, 4, 3, 2, 1)
         ),
-        diameters = arrayOf(Dimension(40f, CENTIMETER))
+        diameters = listOf(Dimension(40f, CENTIMETER))
 ) {
     init {
         decorator = CenterMarkDecorator(DARK_GRAY, 23.783f, 8, true)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAIndoor5Spot.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAIndoor5Spot.kt
index 1a542c169..2bd92bd08 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAIndoor5Spot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAAIndoor5Spot.kt
@@ -28,22 +28,22 @@ import de.dreier.mytargets.shared.utils.Color.WHITE
 class NFAAIndoor5Spot : TargetModelBase(
         id = ID,
         nameRes = R.string.nfaa_indoor_5_spot,
-        zones = arrayOf(
+        zones = listOf(
                 CircularZone(0.25f, WHITE, DARK_GRAY, 2),
                 CircularZone(0.5f, WHITE, DARK_GRAY, 2),
                 CircularZone(0.75f, SAPPHIRE_BLUE, WHITE, 2),
                 CircularZone(1.0f, SAPPHIRE_BLUE, WHITE, 0)
         ),
-        scoringStyles = arrayOf(
+        scoringStyles = listOf(
                 ScoringStyle(true, 5, 5, 4, 4),
                 ScoringStyle(false, 6, 6, 5, 4),
                 ScoringStyle(false, 7, 6, 5, 4)
         ),
-        diameters = arrayOf(Dimension(40f, CENTIMETER))
+        diameters = listOf(Dimension(40f, CENTIMETER))
 ) {
     init {
         decorator = CenterMarkDecorator(DARK_GRAY, 25f, 9, true)
-        facePositions = arrayOf(
+        facePositions = listOf(
                 PointF(-0.6f, -0.6f),
                 PointF(0.6f, -0.6f),
                 PointF(0.0f, 0.0f),
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAS3D.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAS3D.kt
index 9e972828f..e59722d55 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAS3D.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFAS3D.kt
@@ -29,12 +29,12 @@ import de.dreier.mytargets.shared.utils.Color.RED
 class NFAS3D : Target3DBase(
         id = 18,
         nameRes = R.string.nfas_3d,
-        zones = arrayOf(
+        zones = listOf(
                 CircularZone(0.053396f, 0.12689404f, 0.15313196f, RED, BLACK, 3),
                 CircularZone(0.124f, 0.12689404f, 0.15313196f, RED, BLACK, 3),
                 CircularZone(0.417876f, 0.12875f, 0.15562597f, CERULEAN_BLUE, BLACK, 4),
                 HeartZone(1.0f, 0.0f, 0.0f, LIGHT_GRAY, BLACK, 3),
                 CircularZone(1.0f, 0.0f, 0.0f, BROWN, GRAY, 5)
         ),
-        scoringStyles = arrayOf(ScoringStyle(false, 24, 24, 20, 16, 0))
+        scoringStyles = listOf(ScoringStyle(false, 24, 24, 20, 16, 0))
 )
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFASField.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFASField.kt
index 183752e8a..6c272fe1d 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFASField.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/NFASField.kt
@@ -29,13 +29,13 @@ import de.dreier.mytargets.shared.utils.Color.TURBO_YELLOW
 class NFASField : TargetModelBase(
         id = ID,
         nameRes = R.string.nfas_field,
-        diameters = arrayOf(Diameter.SMALL, Diameter.MEDIUM, Diameter.LARGE, Diameter.XLARGE),
-        zones = arrayOf(
+        diameters = listOf(Diameter.SMALL, Diameter.MEDIUM, Diameter.LARGE, Diameter.XLARGE),
+        zones = listOf(
                 CircularZone(0.162f, TURBO_YELLOW, BLACK, 5),
                 EllipseZone(1f, 0f, 0f, ORANGE, BLACK, 4),
                 CircularZone(1.0f, LIGHTER_GRAY, GRAY, 3)
         ),
-        scoringStyles = arrayOf(
+        scoringStyles = listOf(
                 ArrowAwareScoringStyle(false, arrayOf(intArrayOf(24, 20, 16), intArrayOf(14, 14, 10), intArrayOf(8, 8, 4)))
         ),
         type = ETargetType.FIELD
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/SCAPeriod.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/SCAPeriod.kt
index 796d9c364..71269786c 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/SCAPeriod.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/SCAPeriod.kt
@@ -28,13 +28,13 @@ import de.dreier.mytargets.shared.utils.Color.WHITE
 class SCAPeriod : TargetModelBase(
         id = ID,
         nameRes = R.string.sca_period,
-        zones = arrayOf(
+        zones = listOf(
                 CircularZone(0.1f, LEMON_YELLOW, DARK_GRAY, 2),
                 CircularZone(0.4f, GREEN, DARK_GRAY, 2),
                 CircularZone(1.0f, WHITE, DARK_GRAY, 2)
         ),
-        scoringStyles = arrayOf(ScoringStyle(false, 8, 4, 2)),
-        diameters = arrayOf(Dimension(60f, Dimension.Unit.CENTIMETER))
+        scoringStyles = listOf(ScoringStyle(false, 8, 4, 2)),
+        diameters = listOf(Dimension(60f, Dimension.Unit.CENTIMETER))
 ) {
     init {
         decorator = CenterMarkDecorator(DARK_GRAY, 5f, 4, false)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/TargetModelBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/TargetModelBase.kt
index 87fef0005..3441ff2f9 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/TargetModelBase.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/TargetModelBase.kt
@@ -34,13 +34,13 @@ import java.util.*
 open class TargetModelBase protected constructor(
         override val id: Long,
         @StringRes private val nameRes: Int,
-        val diameters: Array<Dimension>,
+        val diameters: List<Dimension>,
         val type: ETargetType = ETargetType.TARGET,
-        val zones: Array<ZoneBase>,
-        val scoringStyles: Array<ScoringStyle>
+        val zones: List<ZoneBase>,
+        val scoringStyles: List<ScoringStyle>
 ) : IIdProvider {
     var faceRadius: Float = 0f
-    var facePositions: Array<PointF>
+    var facePositions: List<PointF>
     var decorator: TargetDecorator? = null
         protected set
 
@@ -62,7 +62,7 @@ open class TargetModelBase protected constructor(
 
     init {
         this.faceRadius = 1f
-        this.facePositions = arrayOf(PointF(0f, 0f))
+        this.facePositions = listOf(PointF(0f, 0f))
     }
 
     override fun toString(): String {
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA3Ring.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA3Ring.kt
index 58a56762c..efc2ed7ed 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA3Ring.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA3Ring.kt
@@ -24,16 +24,16 @@ import de.dreier.mytargets.shared.utils.Color.DARK_GRAY
 import de.dreier.mytargets.shared.utils.Color.FLAMINGO_RED
 import de.dreier.mytargets.shared.utils.Color.LEMON_YELLOW
 
-open class WA3Ring internal constructor(id: Long, nameRes: Int, diameters: Array<Dimension>) : TargetModelBase(
+open class WA3Ring internal constructor(id: Long, nameRes: Int, diameters: List<Dimension>) : TargetModelBase(
         id = id,
         nameRes = nameRes,
-        zones = arrayOf(
+        zones = listOf(
                 CircularZone(0.166f, LEMON_YELLOW, DARK_GRAY, 4),
                 CircularZone(0.334f, LEMON_YELLOW, DARK_GRAY, 4),
                 CircularZone(0.666f, LEMON_YELLOW, DARK_GRAY, 4),
                 CircularZone(1.0f, FLAMINGO_RED, DARK_GRAY, 4)
         ),
-        scoringStyles = arrayOf(
+        scoringStyles = listOf(
                 ScoringStyle(R.string.recurve_style_x_8, true, 10, 10, 9, 8),
                 ScoringStyle(R.string.recurve_style_10_8, false, 10, 10, 9, 8),
                 ScoringStyle(R.string.compound_style, false, 10, 9, 9, 8),
@@ -47,7 +47,7 @@ open class WA3Ring internal constructor(id: Long, nameRes: Int, diameters: Array
     constructor() : this(
             id = ID,
             nameRes = R.string.wa_3_ring,
-            diameters = arrayOf(
+            diameters = listOf(
                     Dimension(40f, CENTIMETER),
                     Dimension(60f, CENTIMETER),
                     Dimension(80f, CENTIMETER),
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA3Ring3Spot.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA3Ring3Spot.kt
index 5a989355a..b4511f4d0 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA3Ring3Spot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA3Ring3Spot.kt
@@ -24,14 +24,14 @@ import de.dreier.mytargets.shared.models.Dimension.Unit.CENTIMETER
 class WA3Ring3Spot : WA3Ring(
         id = ID,
         nameRes = R.string.wa_3_ring_3_spot,
-        diameters = arrayOf(
+        diameters = listOf(
                 Dimension(40f, CENTIMETER),
                 Dimension(60f, CENTIMETER)
         )
 ) {
     init {
         faceRadius = 0.48f
-        facePositions = arrayOf(
+        facePositions = listOf(
                 PointF(-0.52f, 0.5f),
                 PointF(0.0f, -0.5f),
                 PointF(0.52f, 0.5f)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA5Ring.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA5Ring.kt
index d8343fabd..5c7b7c21b 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA5Ring.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA5Ring.kt
@@ -25,10 +25,10 @@ import de.dreier.mytargets.shared.utils.Color.DARK_GRAY
 import de.dreier.mytargets.shared.utils.Color.FLAMINGO_RED
 import de.dreier.mytargets.shared.utils.Color.LEMON_YELLOW
 
-open class WA5Ring internal constructor(id: Long, nameRes: Int, diameters: Array<Dimension>) : TargetModelBase(
+open class WA5Ring internal constructor(id: Long, nameRes: Int, diameters: List<Dimension>) : TargetModelBase(
         id = id,
         nameRes = nameRes,
-        zones = arrayOf(
+        zones = listOf(
                 CircularZone(0.1f, LEMON_YELLOW, DARK_GRAY, 4),
                 CircularZone(0.2f, LEMON_YELLOW, DARK_GRAY, 4),
                 CircularZone(0.4f, LEMON_YELLOW, DARK_GRAY, 4),
@@ -36,7 +36,7 @@ open class WA5Ring internal constructor(id: Long, nameRes: Int, diameters: Array
                 CircularZone(0.8f, FLAMINGO_RED, DARK_GRAY, 4),
                 CircularZone(1.0f, CERULEAN_BLUE, DARK_GRAY, 4)
         ),
-        scoringStyles = arrayOf(
+        scoringStyles = listOf(
                 ScoringStyle(R.string.recurve_style_x_6, true, 10, 10, 9, 8, 7, 6),
                 ScoringStyle(R.string.recurve_style_10_6, false, 10, 10, 9, 8, 7, 6),
                 ScoringStyle(R.string.compound_style, false, 10, 9, 9, 8, 7, 6),
@@ -50,7 +50,7 @@ open class WA5Ring internal constructor(id: Long, nameRes: Int, diameters: Array
     constructor() : this(
             id = ID,
             nameRes = R.string.wa_5_ring,
-            diameters = arrayOf(
+            diameters = listOf(
                     Dimension(40f, CENTIMETER),
                     Dimension(60f, CENTIMETER),
                     Dimension(80f, CENTIMETER),
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA6Ring.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA6Ring.kt
index 1e08b85fa..78399ab30 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA6Ring.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WA6Ring.kt
@@ -28,7 +28,7 @@ import de.dreier.mytargets.shared.utils.Color.LEMON_YELLOW
 class WA6Ring : TargetModelBase(
         id = ID,
         nameRes = R.string.wa_6_ring,
-        zones = arrayOf(
+        zones = listOf(
                 CircularZone(0.084f, LEMON_YELLOW, DARK_GRAY, 3),
                 CircularZone(0.166f, LEMON_YELLOW, DARK_GRAY, 3),
                 CircularZone(0.334f, LEMON_YELLOW, DARK_GRAY, 3),
@@ -37,7 +37,7 @@ class WA6Ring : TargetModelBase(
                 CircularZone(0.834f, CERULEAN_BLUE, DARK_GRAY, 3),
                 CircularZone(1.0f, CERULEAN_BLUE, DARK_GRAY, 3)
         ),
-        scoringStyles = arrayOf(
+        scoringStyles = listOf(
                 ScoringStyle(R.string.recurve_style_x_5, true, 10, 10, 9, 8, 7, 6, 5),
                 ScoringStyle(R.string.recurve_style_10_5, false, 10, 10, 9, 8, 7, 6, 5),
                 ScoringStyle(R.string.compound_style, false, 10, 9, 9, 8, 7, 6, 5),
@@ -45,7 +45,7 @@ class WA6Ring : TargetModelBase(
                 ScoringStyle(true, 5, 5, 5, 4, 4, 3, 3),
                 ScoringStyle(false, 9, 9, 9, 7, 7, 5, 5)
         ),
-        diameters = arrayOf(
+        diameters = listOf(
                 Dimension(40f, CENTIMETER),
                 Dimension(60f, CENTIMETER),
                 Dimension(80f, CENTIMETER),
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WADanage3Spot.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WADanage3Spot.kt
index de82ca947..a9c7cad08 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WADanage3Spot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WADanage3Spot.kt
@@ -24,14 +24,14 @@ import de.dreier.mytargets.shared.models.Dimension.Unit.CENTIMETER
 class WADanage3Spot : WA3Ring(
         id = ID,
         nameRes = R.string.wa_danage_3_spot,
-        diameters = arrayOf(
+        diameters = listOf(
                 Dimension(40f, CENTIMETER),
                 Dimension(60f, CENTIMETER)
         )
 ) {
     init {
         faceRadius = 0.54556f
-        facePositions = arrayOf(
+        facePositions = listOf(
                 PointF(0.0f, -0.39356598f),
                 PointF(-0.45444f, 0.39756605f),
                 PointF(0.45443994f, 0.39756605f)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WADanage6Spot.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WADanage6Spot.kt
index 434458759..f723b58c9 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WADanage6Spot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WADanage6Spot.kt
@@ -24,14 +24,14 @@ import de.dreier.mytargets.shared.models.Dimension.Unit.CENTIMETER
 class WADanage6Spot : WA3Ring(
         id = ID,
         nameRes = R.string.wa_danage_6_spot,
-        diameters = arrayOf(
+        diameters = listOf(
                 Dimension(40f, CENTIMETER),
                 Dimension(60f, CENTIMETER)
         )
 ) {
     init {
         faceRadius = 0.38692f
-        facePositions = arrayOf(
+        facePositions = listOf(
                 PointF(0.0f, -0.61308f),
                 PointF(-0.61308f, -0.16767126f),
                 PointF(0.6130799f, -0.16767126f),
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAField.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAField.kt
index 07e3f98d1..46c1a83af 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAField.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAField.kt
@@ -28,7 +28,7 @@ import de.dreier.mytargets.shared.utils.Color.LEMON_YELLOW
 open class WAField internal constructor(id: Long, nameRes: Int) : TargetModelBase(
         id = id,
         nameRes = nameRes,
-        zones = arrayOf(
+        zones = listOf(
                 CircularZone(0.1f, LEMON_YELLOW, DARK_GRAY, 4),
                 CircularZone(0.2f, LEMON_YELLOW, DARK_GRAY, 4),
                 CircularZone(0.4f, DARK_GRAY, WHITE, 4),
@@ -36,11 +36,11 @@ open class WAField internal constructor(id: Long, nameRes: Int) : TargetModelBas
                 CircularZone(0.8f, DARK_GRAY, WHITE, 4),
                 CircularZone(1.0f, DARK_GRAY, WHITE, 4)
         ),
-        scoringStyles = arrayOf(
+        scoringStyles = listOf(
                 ScoringStyle(true, 5, 5, 4, 3, 2, 1),
                 ScoringStyle(false, 6, 5, 4, 3, 2, 1)
         ),
-        diameters = arrayOf(
+        diameters = listOf(
                 Dimension(20f, CENTIMETER),
                 Dimension(40f, CENTIMETER),
                 Dimension(60f, CENTIMETER),
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAField3Spot.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAField3Spot.kt
index d6a8d732c..988e57f22 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAField3Spot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAField3Spot.kt
@@ -21,7 +21,7 @@ import de.dreier.mytargets.shared.R
 class WAField3Spot : WAField(ID, R.string.wa_field_3_spot) {
     init {
         faceRadius = 0.32f
-        facePositions = arrayOf(
+        facePositions = listOf(
                 PointF(0.0f, -0.68f),
                 PointF(0.0f, 0.0f),
                 PointF(0.0f, 0.68f)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAFull.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAFull.kt
index 6cf4ee220..d304aaae0 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAFull.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAFull.kt
@@ -31,7 +31,7 @@ import de.dreier.mytargets.shared.utils.Color.WHITE
 class WAFull : TargetModelBase(
         id = ID,
         nameRes = R.string.wa_full,
-        zones = arrayOf(
+        zones = listOf(
                 CircularZone(0.05f, LEMON_YELLOW, DARK_GRAY, 2),
                 CircularZone(0.1f, LEMON_YELLOW, DARK_GRAY, 2),
                 CircularZone(0.2f, LEMON_YELLOW, DARK_GRAY, 2),
@@ -44,7 +44,7 @@ class WAFull : TargetModelBase(
                 CircularZone(0.9f, WHITE, DARK_GRAY, 2),
                 CircularZone(1.0f, WHITE, DARK_GRAY, 2)
         ),
-        scoringStyles = arrayOf(
+        scoringStyles = listOf(
                 ScoringStyle(R.string.recurve_style_x_1, true, 10, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1),
                 ScoringStyle(R.string.recurve_style_10_1, false, 10, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1),
                 ScoringStyle(R.string.compound_style, false, 10, 9, 9, 8, 7, 6, 5, 4, 3, 2, 1),
@@ -53,7 +53,7 @@ class WAFull : TargetModelBase(
                 ScoringStyle(false, 9, 9, 9, 7, 7, 5, 5, 3, 3, 1, 1),
                 ColorScoringStyle(R.string.fcfs_color_reversed, 31, 1, 1, 2, 4, 4, 6, 6, 8, 8, 10, 10)
         ),
-        diameters = arrayOf(
+        diameters = listOf(
                 Dimension(40f, CENTIMETER),
                 Dimension(60f, CENTIMETER),
                 Dimension(80f, CENTIMETER),
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAVegas3Spot.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAVegas3Spot.kt
index ad8a90479..0b9dafcf1 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAVegas3Spot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAVegas3Spot.kt
@@ -24,14 +24,14 @@ import de.dreier.mytargets.shared.models.Dimension.Unit.CENTIMETER
 class WAVegas3Spot : WA5Ring(
         id = ID,
         nameRes = R.string.vegas_3_spot,
-        diameters = arrayOf(
+        diameters = listOf(
                 Dimension(40f, CENTIMETER),
                 Dimension(60f, CENTIMETER)
         )
 ) {
     init {
         faceRadius = 0.48f
-        facePositions = arrayOf(
+        facePositions = listOf(
                 PointF(-0.52f, 0.5f),
                 PointF(0.0f, -0.5f),
                 PointF(0.52f, 0.5f)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAVertical3Spot.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAVertical3Spot.kt
index 81fcaea20..d12e41cfa 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAVertical3Spot.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/WAVertical3Spot.kt
@@ -24,13 +24,13 @@ import de.dreier.mytargets.shared.models.Dimension.Unit.CENTIMETER
 class WAVertical3Spot : WA5Ring(
         id = ID,
         nameRes = R.string.vertical_3_spot,
-        diameters = arrayOf(Dimension(40f, CENTIMETER),
+        diameters = listOf(Dimension(40f, CENTIMETER),
                 Dimension(60f, CENTIMETER)
         )
 ) {
     init {
         faceRadius = 0.32f
-        facePositions = arrayOf(
+        facePositions = listOf(
                 PointF(0.0f, -0.68f),
                 PointF(0.0f, 0.0f),
                 PointF(0.0f, 0.68f)
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/Worcester.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/Worcester.kt
index 4513afccd..9cb77808d 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/models/Worcester.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/models/Worcester.kt
@@ -26,17 +26,17 @@ import de.dreier.mytargets.shared.utils.Color.WHITE
 class Worcester : TargetModelBase(
         id = ID,
         nameRes = R.string.worcester_face,
-        zones = arrayOf(
+        zones = listOf(
                 CircularZone(0.2f, WHITE, WHITE, 4),
                 CircularZone(0.4f, DARK_GRAY, WHITE, 4),
                 CircularZone(0.6f, DARK_GRAY, WHITE, 4),
                 CircularZone(0.8f, DARK_GRAY, WHITE, 4),
                 CircularZone(1.0f, DARK_GRAY, WHITE, 0)
         ),
-        scoringStyles = arrayOf(
+        scoringStyles = listOf(
                 ScoringStyle(false, 5, 4, 3, 2, 1)
         ),
-        diameters = arrayOf(Dimension(16f, INCH))
+        diameters = listOf(Dimension(16f, INCH))
 ) {
     init {
         decorator = CenterMarkDecorator(DARK_GRAY, 10.5f, 4, false)
diff --git a/wearable/build.gradle b/wearable/build.gradle
index ff8ad540b..7a7154376 100644
--- a/wearable/build.gradle
+++ b/wearable/build.gradle
@@ -79,5 +79,6 @@ dependencies {
     implementation dependencies.androidState
     kapt dependencies.androidStateProcessor
     implementation project(':shared')
-    implementation dependencies.kotlinStdlibJre7
+    implementation dependencies.kotlinStdlibJdk7
+    implementation "android.arch.lifecycle:livedata-core:$rootProject.ext.libraryVersion.architectureComponents"
 }
\ No newline at end of file

From 9df79df4d6a7fd0df721c279014498293c0f7cde Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Mon, 30 Jul 2018 22:11:50 +0200
Subject: [PATCH 097/102] Fixed disappearing aggregation

---
 .../features/training/input/TargetView.kt      | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.kt b/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.kt
index 366f4a51d..4235c7bb0 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.kt
@@ -101,16 +101,14 @@ class TargetView : TargetViewBase {
     public override var inputMethod: TargetViewBase.EInputMethod
         get() = super.inputMethod
         set(mode) {
-            if (mode !== inputMethod) {
-                super.inputMethod = mode
-                targetDrawable!!.drawArrowsEnabled(inputMethod === PLOTTING)
-                targetDrawable!!.setAggregationStrategy(
-                    if (inputMethod === PLOTTING)
-                        aggregationStrategy
-                    else
-                        EAggregationStrategy.NONE
-                )
-            }
+            super.inputMethod = mode
+            targetDrawable!!.drawArrowsEnabled(inputMethod === PLOTTING)
+            targetDrawable!!.setAggregationStrategy(
+                if (inputMethod === PLOTTING)
+                    aggregationStrategy
+                else
+                    EAggregationStrategy.NONE
+            )
         }
 
     private val spotEndMatrix: Matrix

From 0a63a5ecccae0ef61574a6a11a5f60976f6b6dad Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Mon, 30 Jul 2018 22:39:31 +0200
Subject: [PATCH 098/102] Fixed incomplete language switch

---
 .../de/dreier/mytargets/features/bows/BowAdapter.kt  |  2 +-
 .../features/settings/LanguagePreference.kt          |  2 ++
 .../features/training/details/SpannedInfoBuilder.kt  |  6 +++---
 .../features/training/details/TrainingFragment.kt    |  2 +-
 .../features/training/details/TrainingInfoUtils.kt   |  6 +++---
 .../mytargets/shared/SharedApplicationInstance.kt    | 12 ++++++------
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
index d2ab8f950..7b4b256f7 100644
--- a/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/bows/BowAdapter.kt
@@ -53,7 +53,7 @@ internal class BowAdapter(
             binding.image.setImageDrawable(item.thumbnail!!.roundDrawable)
             binding.details.visibility = View.VISIBLE
 
-            val info = SpannedInfoBuilder()
+            val info = SpannedInfoBuilder(binding.root.context)
             info.addLine(R.string.bow_type, item.type!!)
             if (!item.brand!!.trim { it <= ' ' }.isEmpty()) {
                 info.addLine(R.string.brand, item.brand!!)
diff --git a/app/src/main/java/de/dreier/mytargets/features/settings/LanguagePreference.kt b/app/src/main/java/de/dreier/mytargets/features/settings/LanguagePreference.kt
index 6ece49362..29b1539f5 100644
--- a/app/src/main/java/de/dreier/mytargets/features/settings/LanguagePreference.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/settings/LanguagePreference.kt
@@ -43,6 +43,7 @@ class LanguagePreference(context: Context, attrs: AttributeSet?) : ListPreferenc
     companion object {
         private val SUPPORTED_LOCALES = setOf(
             "",
+            "ar",
             "ca",
             "zh-CN",
             "zh-TW",
@@ -64,6 +65,7 @@ class LanguagePreference(context: Context, attrs: AttributeSet?) : ListPreferenc
             "pl",
             "pt-PT",
             "pt-BR",
+            "ro",
             "ru",
             "sr",
             "sk",
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/SpannedInfoBuilder.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/SpannedInfoBuilder.kt
index 20f01c0e4..a36089d06 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/SpannedInfoBuilder.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/SpannedInfoBuilder.kt
@@ -15,18 +15,18 @@
 
 package de.dreier.mytargets.features.training.details
 
+import android.content.Context
 import android.graphics.Typeface.BOLD
 import android.text.SpannableStringBuilder
 import android.text.Spanned
 import android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
 import android.text.style.StyleSpan
-import de.dreier.mytargets.shared.SharedApplicationInstance
 
-class SpannedInfoBuilder {
+class SpannedInfoBuilder(val context: Context) {
     private val info = SpannableStringBuilder()
 
     fun addLine(key: Int, value: Any) {
-        addLine(SharedApplicationInstance.getStr(key), value)
+        addLine(context.getString(key), value)
     }
 
     fun addLine(key: String, value: Any) {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
index 902b90e4c..4902faf9d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingFragment.kt
@@ -212,7 +212,7 @@ open class TrainingFragment : EditableListFragmentBase<Round, SimpleListAdapterB
                 R.plurals.rounds, item
                     .index + 1, item.index + 1
             )
-            binding.subtitle.text = TrainingInfoUtils.getRoundInfo(item, equals)
+            binding.subtitle.text = TrainingInfoUtils.getRoundInfo(binding.root.context, item, equals)
             if (binding.subtitle.text.isEmpty()) {
                 binding.subtitle.visibility = View.GONE
             } else {
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingInfoUtils.kt b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingInfoUtils.kt
index 68f6e7a64..b17c99c60 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingInfoUtils.kt
+++ b/app/src/main/java/de/dreier/mytargets/features/training/details/TrainingInfoUtils.kt
@@ -31,7 +31,7 @@ object TrainingInfoUtils {
         rounds: List<Round>,
         equals: BooleanArray
     ): Spanned {
-        val info = SpannedInfoBuilder()
+        val info = SpannedInfoBuilder(context)
         addStaticTrainingHeaderInfo(context, info, training)
         addDynamicTrainingHeaderInfo(rounds, equals, info)
         return info.toSpanned()
@@ -100,8 +100,8 @@ object TrainingInfoUtils {
         }
     }
 
-    fun getRoundInfo(round: Round, equals: BooleanArray): Spanned {
-        val info = SpannedInfoBuilder()
+    fun getRoundInfo(context: Context, round: Round, equals: BooleanArray): Spanned {
+        val info = SpannedInfoBuilder(context)
         if (!equals[0]) {
             info.addLine(R.string.distance, round.distance)
         }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt b/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt
index fbc3af399..8339ba473 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/SharedApplicationInstance.kt
@@ -33,12 +33,12 @@ open class SharedApplicationInstance : Application() {
     }
 
     protected fun enableDebugLogging() {
-        StrictMode.setThreadPolicy(StrictMode.ThreadPolicy.Builder()
-                .detectDiskReads()
-                .detectDiskWrites()
-//                .detectAll()
-                .penaltyLog()
-                .build())
+//        StrictMode.setThreadPolicy(StrictMode.ThreadPolicy.Builder()
+//                .detectDiskReads()
+//                .detectDiskWrites()
+////                .detectAll()
+//                .penaltyLog()
+//                .build())
 //        StrictMode.setVmPolicy(StrictMode.VmPolicy.Builder()
 //                .detectLeakedSqlLiteObjects()
 //                .detectLeakedClosableObjects()

From 967c7b8f6c913f87abe18189fed462714bce9320 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Tue, 31 Jul 2018 20:01:07 +0200
Subject: [PATCH 099/102] Removed commented out code

---
 app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
index f2ccd939b..a39a9eada 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/BowDAO.kt
@@ -55,20 +55,16 @@ abstract class BowDAO {
     @Transaction
     open fun saveBow(bow: Bow, images: List<BowImage>, sightMarks: List<SightMark>) {
         bow.id = insertBow(bow)
-        // deleteBowImages(bow.id) TODO test
         for (image in images) {
             image.bowId = bow.id
         }
         insertBowImages(images)
-        // deleteSightMarks(bow.id) TODO
         for (sightMark in sightMarks) {
             sightMark.bowId = bow.id
         }
         insertSightMarks(sightMarks)
     }
 
-    //    deleteSightMarks(bow.id) // TODO
-    //    deleteBowImages(bow.id)
     @Delete
     abstract fun deleteBow(bow: Bow)
 }

From 03cf0772c141dbc1997876a6c60a76cfd741836e Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Tue, 31 Jul 2018 20:06:47 +0200
Subject: [PATCH 100/102] Fixed typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 86ccac8f2..145c6f552 100644
--- a/README.md
+++ b/README.md
@@ -23,4 +23,4 @@ If you don't have a concrete idea, there a few issues in the backlog with some r
 If you want to help improve the translations of the app you can do so at https://crowdin.com/project/mytargets
 
 ## Licence ##
-Released under GNU GLP V2
+Released under GNU GPL V2

From f5ac063af9feeedf161cba0bde59de321eda67f9 Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Tue, 31 Jul 2018 20:55:18 +0200
Subject: [PATCH 101/102] Fixed #362

---
 shared/build.gradle                           |  1 +
 .../scoringstyle/ArrowAwareScoringStyle.kt    | 16 ++++-
 .../targets/scoringstyle/ScoringStyle.kt      |  8 ++-
 .../ArrowAwareScoringStyleTest.kt             | 63 +++++++++++++++++++
 4 files changed, 84 insertions(+), 4 deletions(-)
 create mode 100644 shared/src/test/java/de/dreier/mytargets/shared/targets/scoringstyle/ArrowAwareScoringStyleTest.kt

diff --git a/shared/build.gradle b/shared/build.gradle
index b1f219d34..6e5420ecb 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -65,6 +65,7 @@ dependencies {
 
     testImplementation dependencies.jUnit
     testImplementation dependencies.mockito
+    testImplementation dependencies.truth
     androidTestImplementation dependencies.runner
     implementation dependencies.kotlinStdlibJdk7
 }
\ No newline at end of file
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ArrowAwareScoringStyle.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ArrowAwareScoringStyle.kt
index 033fec658..67f4d5728 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ArrowAwareScoringStyle.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ArrowAwareScoringStyle.kt
@@ -15,6 +15,10 @@
 
 package de.dreier.mytargets.shared.targets.scoringstyle
 
+import de.dreier.mytargets.shared.models.Score
+import de.dreier.mytargets.shared.models.db.Shot
+import kotlin.math.min
+
 /**
  * Scoring style used for 3D targets, where the score is dependant on the arrow's index.
  * @param points Describes the scoring schema.
@@ -22,9 +26,17 @@ package de.dreier.mytargets.shared.targets.scoringstyle
  * The first arrow scores 20 points in the inner zone and 18 in the outer zone.
  * The second arrow 16 and 14 respectively.
  */
-class ArrowAwareScoringStyle(showAsX: Boolean, points: Array<IntArray>) : ScoringStyle(showAsX, points) {
+class ArrowAwareScoringStyle(showAsX: Boolean, points: Array<IntArray>) :
+    ScoringStyle(showAsX, points) {
 
     override fun getPoints(zone: Int, arrow: Int): Int {
-        return points[if (arrow < points.size) arrow else points.size - 1][zone]
+        return points[min(arrow, points.size - 1)][zone]
+    }
+
+    override fun getReachedScore(shots: List<Shot>): Score {
+        val reachedScore = shots
+            .map { s -> getPointsByScoringRing(s.scoringRing, s.index) }
+            .firstOrNull { it > 0 } ?: 0
+        return Score(reachedScore, getMaxPointsPerShot(0), shots.size)
     }
 }
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt
index 22d95d562..ef304d1b5 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/scoringstyle/ScoringStyle.kt
@@ -80,8 +80,7 @@ open class ScoringStyle private constructor(
     }
 
     fun getReachedScore(shot: Shot): Score {
-        val i = if (shot.index < maxScorePerShot.size) shot.index else maxScorePerShot.size - 1
-        val maxScore = maxScorePerShot[i]
+        val maxScore = getMaxPointsPerShot(shot.index)
         if (shot.scoringRing == Shot.NOTHING_SELECTED) {
             return Score(maxScore)
         }
@@ -89,6 +88,11 @@ open class ScoringStyle private constructor(
         return Score(reachedScore, maxScore)
     }
 
+    open fun getMaxPointsPerShot(index: Int): Int {
+        val i = if (index < maxScorePerShot.size) index else maxScorePerShot.size - 1
+        return maxScorePerShot[i]
+    }
+
     open fun getReachedScore(shots: List<Shot>): Score {
         return shots.map { getReachedScore(it) }.sum()
     }
diff --git a/shared/src/test/java/de/dreier/mytargets/shared/targets/scoringstyle/ArrowAwareScoringStyleTest.kt b/shared/src/test/java/de/dreier/mytargets/shared/targets/scoringstyle/ArrowAwareScoringStyleTest.kt
new file mode 100644
index 000000000..9d1ca86ea
--- /dev/null
+++ b/shared/src/test/java/de/dreier/mytargets/shared/targets/scoringstyle/ArrowAwareScoringStyleTest.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2018 Florian Dreier
+ *
+ * This file is part of MyTargets.
+ *
+ * MyTargets is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * MyTargets is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+package de.dreier.mytargets.shared.targets.scoringstyle
+
+import com.google.common.truth.Truth.assertThat
+import de.dreier.mytargets.shared.models.Score
+import de.dreier.mytargets.shared.models.db.Shot
+import org.junit.Test
+
+class ArrowAwareScoringStyleTest {
+
+    private val scoringStyle = ArrowAwareScoringStyle(
+        false,
+        arrayOf(intArrayOf(20, 18), intArrayOf(16, 14), intArrayOf(12, 10))
+    )
+
+    @Test
+    fun getPoints() {
+        assertThat(scoringStyle.getPointsByScoringRing(0, 0)).isEqualTo(20)
+        assertThat(scoringStyle.getPointsByScoringRing(1, 0)).isEqualTo(18)
+        assertThat(scoringStyle.getPointsByScoringRing(0, 1)).isEqualTo(16)
+        assertThat(scoringStyle.getPointsByScoringRing(1, 1)).isEqualTo(14)
+        assertThat(scoringStyle.getPointsByScoringRing(0, 2)).isEqualTo(12)
+        assertThat(scoringStyle.getPointsByScoringRing(1, 2)).isEqualTo(10)
+        assertThat(scoringStyle.getPointsByScoringRing(0, 3)).isEqualTo(12)
+        assertThat(scoringStyle.getPointsByScoringRing(1, 3)).isEqualTo(10)
+    }
+
+    @Test
+    fun getReachedScore() {
+        assertThat(scoringStyle.getReachedScore(Shot(scoringRing = 0, index = 0))).isEqualTo(
+            Score(
+                20,
+                20,
+                1
+            )
+        )
+
+        assertThat(scoringStyle.getReachedScore(listOf(
+            Shot(scoringRing = Shot.MISS, index = 0),
+            Shot(scoringRing = 0, index = 1)
+        ))).isEqualTo(
+            Score(
+                16,
+                20,
+                2
+            )
+        )
+    }
+}
\ No newline at end of file

From ecf829893832593d8268a9b4d63aee1e456b714d Mon Sep 17 00:00:00 2001
From: Unknown <dreier.florian@gmail.com>
Date: Tue, 31 Jul 2018 21:09:32 +0200
Subject: [PATCH 102/102] Fixed #361

---
 app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt b/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
index 4fdd26882..6dff970f5 100644
--- a/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
+++ b/app/src/main/java/de/dreier/mytargets/base/db/dao/EndDAO.kt
@@ -89,6 +89,7 @@ abstract class EndDAO {
     open fun replaceImages(end: End, images: List<EndImage>) {
         deleteEndImages(end.id)
         for (image in images) {
+            image.endId = end.id
             image.id = insertEndImage(image)
         }
     }