Move radius from geofence to place

app/src/commonTest/java/org/tasks/makers/GeofenceMaker.kt

@@ -11,7 +11,6 @@ object GeofenceMaker {
     val TASK: Property<Geofence, Long> = Property.newProperty()
     val ARRIVAL: Property<Geofence, Boolean> = Property.newProperty()
     val DEPARTURE: Property<Geofence, Boolean> = Property.newProperty()
-    val RADIUS: Property<Geofence, Int> = Property.newProperty()
 
     private val instantiator = Instantiator { lookup: PropertyLookup<Geofence> ->
         val geofence = Geofence()
@@ -19,7 +18,6 @@ object GeofenceMaker {
         geofence.task = lookup.valueOf(TASK, 1)
         geofence.isArrival = lookup.valueOf(ARRIVAL, false)
         geofence.isDeparture = lookup.valueOf(DEPARTURE, false)
-        geofence.radius = lookup.valueOf(RADIUS, 250)
         geofence
     }
 

app/src/main/java/com/todoroo/astrid/dao/Database.kt

@@ -1,5 +1,6 @@
 package com.todoroo.astrid.dao
 
+import androidx.room.AutoMigration
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import com.todoroo.astrid.data.Task
@@ -36,32 +37,36 @@ import org.tasks.data.TaskListMetadataDao
 import org.tasks.data.UpgraderDao
 import org.tasks.data.UserActivity
 import org.tasks.data.UserActivityDao
+import org.tasks.db.Migrations
 import org.tasks.notifications.Notification
 import org.tasks.notifications.NotificationDao
 
 @Database(
-        entities = [
+    entities = [
-            Notification::class,
+        Notification::class,
-            TagData::class,
+        TagData::class,
-            UserActivity::class,
+        UserActivity::class,
-            TaskAttachment::class,
+        TaskAttachment::class,
-            TaskListMetadata::class,
+        TaskListMetadata::class,
-            Task::class,
+        Task::class,
-            Alarm::class,
+        Alarm::class,
-            Place::class,
+        Place::class,
-            Geofence::class,
+        Geofence::class,
-            Tag::class,
+        Tag::class,
-            GoogleTask::class,
+        GoogleTask::class,
-            Filter::class,
+        Filter::class,
-            GoogleTaskList::class,
+        GoogleTaskList::class,
-            CaldavCalendar::class,
+        CaldavCalendar::class,
-            CaldavTask::class,
+        CaldavTask::class,
-            CaldavAccount::class,
+        CaldavAccount::class,
-            GoogleTaskAccount::class,
+        GoogleTaskAccount::class,
-            Principal::class,
+        Principal::class,
-            PrincipalAccess::class
+        PrincipalAccess::class
-        ],
+    ],
-        version = 82
+    autoMigrations = [
+        AutoMigration(from = 82, to = 83, spec = Migrations.AutoMigrate82to83::class),
+    ],
+    version = 83
 )
 abstract class Database : RoomDatabase() {
     abstract fun notificationDao(): NotificationDao

app/src/main/java/com/todoroo/astrid/service/TaskDuplicator.kt

@@ -75,7 +75,7 @@ class TaskDuplicator @Inject constructor(
         }
         for (g in locationDao.getGeofencesForTask(originalId)) {
             locationDao.insert(
-                    Geofence(clone.id, g.place, g.isArrival, g.isDeparture, g.radius))
+                    Geofence(clone.id, g.place, g.isArrival, g.isDeparture))
         }
         val alarms = alarmDao.getAlarms(originalId)
         if (alarms.isNotEmpty()) {

app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import androidx.core.widget.addTextChangedListener
+import com.google.android.material.slider.Slider
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import com.todoroo.astrid.activity.MainActivity
@@ -15,23 +16,30 @@ import org.tasks.data.LocationDao
 import org.tasks.data.Place
 import org.tasks.databinding.ActivityLocationSettingsBinding
 import org.tasks.filters.PlaceFilter
+import org.tasks.locale.Locale
 import org.tasks.location.MapFragment
 import org.tasks.preferences.Preferences
 import javax.inject.Inject
+import kotlin.math.roundToInt
 
 @AndroidEntryPoint
 class PlaceSettingsActivity : BaseListSettingsActivity(), MapFragment.MapFragmentCallback {
 
     companion object {
         const val EXTRA_PLACE = "extra_place"
+        private const val MIN_RADIUS = 75
+        private const val MAX_RADIUS = 1000
+        private const val STEP = 25.0
     }
 
     private lateinit var name: TextInputEditText
     private lateinit var nameLayout: TextInputLayout
+    private lateinit var slider: Slider
 
     @Inject lateinit var locationDao: LocationDao
     @Inject lateinit var map: MapFragment
     @Inject lateinit var preferences: Preferences
+    @Inject lateinit var locale: Locale
 
     private lateinit var place: Place
 
@@ -53,7 +61,7 @@ class PlaceSettingsActivity : BaseListSettingsActivity(), MapFragment.MapFragmen
         if (savedInstanceState == null) {
             name.setText(place.displayName)
             selectedColor = place.color
-            selectedIcon = place.getIcon()!!
+            selectedIcon = place.getIcon()
         }
 
         val dark = preferences.mapTheme == 2
@@ -71,12 +79,25 @@ class PlaceSettingsActivity : BaseListSettingsActivity(), MapFragment.MapFragmen
             )
         }
         nameLayout = it.nameLayout
+        slider = it.slider.apply {
+            setLabelFormatter { value ->
+                getString(
+                    R.string.location_radius_meters,
+                    locale.formatNumber(value.toInt())
+                )
+            }
+            valueTo = MAX_RADIUS.toFloat()
+            valueFrom = MIN_RADIUS.toFloat()
+            stepSize = STEP.toFloat()
+            haloRadius = 0
+            value = (place.radius / STEP * STEP).roundToInt().toFloat()
+        }
         it.root
     }
 
     override fun hasChanges() = name.text.toString() != place.displayName
                     || selectedColor != place.color
-                    || selectedIcon != place.getIcon()!!
+                    || selectedIcon != place.getIcon()
 
     override suspend fun save() {
         val newName: String = name.text.toString()
@@ -89,6 +110,7 @@ class PlaceSettingsActivity : BaseListSettingsActivity(), MapFragment.MapFragmen
         place.name = newName
         place.color = selectedColor
         place.setIcon(selectedIcon)
+        place.radius = slider.value.toInt()
         locationDao.update(place)
         setResult(
                 Activity.RESULT_OK,

app/src/main/java/org/tasks/backup/TasksJsonImporter.kt

@@ -195,7 +195,6 @@ class TasksJsonImporter @Inject constructor(
                     val geofence = Geofence()
                     geofence.task = taskId
                     geofence.place = place.uid
-                    geofence.radius = location.radius
                     geofence.isArrival = location.arrival
                     geofence.isDeparture = location.departure
                     locationDao.insert(geofence)

app/src/main/java/org/tasks/data/Geofence.kt

@@ -22,9 +22,6 @@ class Geofence : Serializable, Parcelable {
     @ColumnInfo(name = "place")
     var place: String? = null
 
-    @ColumnInfo(name = "radius")
-    var radius = 0
-
     @ColumnInfo(name = "arrival")
     var isArrival = false
 
@@ -34,7 +31,7 @@ class Geofence : Serializable, Parcelable {
     constructor()
 
     @Ignore
-    constructor(task: Long, place: String?, arrival: Boolean, departure: Boolean, radius: Int) : this(place, arrival, departure, radius) {
+    constructor(task: Long, place: String?, arrival: Boolean, departure: Boolean) : this(place, arrival, departure) {
         this.task = task
     }
 
@@ -44,15 +41,13 @@ class Geofence : Serializable, Parcelable {
         val defaultReminders = preferences.getIntegerFromString(R.string.p_default_location_reminder_key, 1)
         isArrival = defaultReminders == 1 || defaultReminders == 3
         isDeparture = defaultReminders == 2 || defaultReminders == 3
-        radius = preferences.getInt(R.string.p_default_location_radius, 250)
     }
 
     @Ignore
-    constructor(place: String?, arrival: Boolean, departure: Boolean, radius: Int) {
+    constructor(place: String?, arrival: Boolean, departure: Boolean) {
         this.place = place
         isArrival = arrival
         isDeparture = departure
-        this.radius = radius
     }
 
     @Ignore
@@ -60,7 +55,6 @@ class Geofence : Serializable, Parcelable {
         id = o.id
         task = o.task
         place = o.place
-        radius = o.radius
         isArrival = o.isArrival
         isDeparture = o.isDeparture
     }
@@ -70,7 +64,6 @@ class Geofence : Serializable, Parcelable {
         id = parcel.readLong()
         task = parcel.readLong()
         place = parcel.readString()
-        radius = parcel.readInt()
         isArrival = parcel.readInt() == 1
         isDeparture = parcel.readInt() == 1
     }
@@ -82,7 +75,6 @@ class Geofence : Serializable, Parcelable {
             writeLong(id)
             writeLong(task)
             writeString(place)
-            writeInt(radius)
             writeInt(if (isArrival) 1 else 0)
             writeInt(if (isDeparture) 1 else 0)
         }
@@ -95,7 +87,6 @@ class Geofence : Serializable, Parcelable {
         if (id != other.id) return false
         if (task != other.task) return false
         if (place != other.place) return false
-        if (radius != other.radius) return false
         if (isArrival != other.isArrival) return false
         if (isDeparture != other.isDeparture) return false
 
@@ -106,14 +97,13 @@ class Geofence : Serializable, Parcelable {
         var result = id.hashCode()
         result = 31 * result + task.hashCode()
         result = 31 * result + (place?.hashCode() ?: 0)
-        result = 31 * result + radius
         result = 31 * result + isArrival.hashCode()
         result = 31 * result + isDeparture.hashCode()
         return result
     }
 
     override fun toString(): String =
-            "Geofence(id=$id, task=$task, place=$place, radius=$radius, isArrival=$isArrival, isDeparture=$isDeparture)"
+            "Geofence(id=$id, task=$task, place=$place, isArrival=$isArrival, isDeparture=$isDeparture)"
 
     companion object {
         const val TABLE_NAME = "geofences"

app/src/main/java/org/tasks/data/Location.kt

@@ -35,7 +35,7 @@ class Location : Serializable, Parcelable {
         get() = place.longitude
 
     val radius: Int
-        get() = geofence.radius
+        get() = place.radius
 
     val phone: String?
         get() = place.phone

app/src/main/java/org/tasks/data/LocationDao.kt

@@ -28,8 +28,7 @@ interface LocationDao {
 
     @Query("SELECT places.*,"
             + " max(geofences.arrival) as arrival,"
-            + " max(geofences.departure) as departure,"
+            + " max(geofences.departure) as departure"
-            + " min(geofences.radius) as radius"
             + " FROM places"
             + " INNER JOIN geofences ON geofences.place = places.uid"
             + " INNER JOIN tasks ON tasks._id = geofences.task"

app/src/main/java/org/tasks/data/MergedGeofence.kt

@@ -6,7 +6,6 @@ class MergedGeofence {
     @Embedded lateinit var place: Place
     var arrival = false
     var departure = false
-    var radius = 0
 
     val uid: String?
         get() = place.uid
@@ -17,6 +16,9 @@ class MergedGeofence {
     val longitude: Double
         get() = place.longitude
 
+    val radius: Int
+        get() = place.radius
+
     override fun toString(): String =
-            "MergedGeofence(place=$place, arrival=$arrival, departure=$departure, radius=$radius)"
+            "MergedGeofence(place=$place, arrival=$arrival, departure=$departure)"
 }

app/src/main/java/org/tasks/data/Place.kt

@@ -5,7 +5,11 @@ import android.location.Location
 import android.net.Uri
 import android.os.Parcel
 import android.os.Parcelable
-import androidx.room.*
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.Ignore
+import androidx.room.Index
+import androidx.room.PrimaryKey
 import com.todoroo.andlib.data.Table
 import com.todoroo.astrid.api.FilterListItem.NO_ORDER
 import com.todoroo.astrid.helper.UUIDHelper
@@ -55,6 +59,9 @@ class Place : Serializable, Parcelable {
     @ColumnInfo(name = "place_order")
     var order = NO_ORDER
 
+    @ColumnInfo(name = "radius", defaultValue = "250")
+    var radius = 250
+
     constructor()
 
     @Ignore
@@ -70,6 +77,7 @@ class Place : Serializable, Parcelable {
         color = o.color
         icon = o.icon
         order = o.order
+        radius = o.radius
     }
 
     @Ignore
@@ -85,6 +93,7 @@ class Place : Serializable, Parcelable {
         color = parcel.readInt()
         icon = parcel.readInt()
         order = parcel.readInt()
+        radius = parcel.readInt()
     }
 
     fun getIcon(): Int = if (icon == -1) PLACE else icon
@@ -129,12 +138,15 @@ class Place : Serializable, Parcelable {
             writeInt(color)
             writeInt(icon)
             writeInt(order)
+            writeInt(radius)
         }
     }
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other !is Place) return false
+        if (javaClass != other?.javaClass) return false
+
+        other as Place
 
         if (id != other.id) return false
         if (uid != other.uid) return false
@@ -147,6 +159,7 @@ class Place : Serializable, Parcelable {
         if (color != other.color) return false
         if (icon != other.icon) return false
         if (order != other.order) return false
+        if (radius != other.radius) return false
 
         return true
     }
@@ -163,11 +176,13 @@ class Place : Serializable, Parcelable {
         result = 31 * result + color
         result = 31 * result + icon
         result = 31 * result + order
+        result = 31 * result + radius
         return result
     }
 
-    override fun toString(): String =
+    override fun toString(): String {
-            "Place(id=$id, uid=$uid, name=$name, address=$address, phone=$phone, url=$url, latitude=$latitude, longitude=$longitude, color=$color, icon=$icon, order=$order)"
+        return "Place(id=$id, uid=$uid, name=$name, address=$address, phone=$phone, url=$url, latitude=$latitude, longitude=$longitude, color=$color, icon=$icon, order=$order, radius=$radius)"
+    }
 
     companion object {
         const val KEY = "place"

app/src/main/java/org/tasks/db/Migrations.kt

@@ -1,6 +1,8 @@
 package org.tasks.db
 
 import android.database.sqlite.SQLiteException
+import androidx.room.DeleteColumn
+import androidx.room.migration.AutoMigrationSpec
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 import com.todoroo.astrid.api.FilterListItem.NO_ORDER
@@ -21,6 +23,12 @@ import java.io.File
 import java.util.concurrent.TimeUnit.HOURS
 
 object Migrations {
+
+    @DeleteColumn.Entries(
+        DeleteColumn(tableName = "geofences", columnName = "radius"),
+    )
+    class AutoMigrate82to83: AutoMigrationSpec
+
     private val MIGRATION_35_36: Migration = object : Migration(35, 36) {
         override fun migrate(database: SupportSQLiteDatabase) {
             database.execSQL("ALTER TABLE `tagdata` ADD COLUMN `color` INTEGER DEFAULT -1")

app/src/main/java/org/tasks/dialogs/GeofenceDialog.java

@@ -14,14 +14,12 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.DialogFragment;
 
-import com.google.android.material.slider.Slider;
 import com.google.android.material.switchmaterial.SwitchMaterial;
 
 import org.tasks.R;
 import org.tasks.data.Geofence;
 import org.tasks.data.Location;
 import org.tasks.databinding.LocationDetailsBinding;
-import org.tasks.locale.Locale;
 import org.tasks.preferences.PermissionChecker;
 
 import javax.inject.Inject;
@@ -33,18 +31,13 @@ public class GeofenceDialog extends DialogFragment {
 
   public static final String EXTRA_GEOFENCE = "extra_geofence";
   private static final String EXTRA_ORIGINAL = "extra_original";
-  private static final int MIN_RADIUS = 75;
-  private static final int MAX_RADIUS = 1000;
-  private static final int STEP = 25;
 
   @Inject DialogBuilder dialogBuilder;
   @Inject Activity context;
-  @Inject Locale locale;
   @Inject PermissionChecker permissionChecker;
 
   private SwitchMaterial arrivalView;
   private SwitchMaterial departureView;
-  private Slider slider;
 
   public static GeofenceDialog newGeofenceDialog(Location location) {
     GeofenceDialog dialog = new GeofenceDialog();
@@ -67,16 +60,8 @@ public class GeofenceDialog extends DialogFragment {
     LocationDetailsBinding binding = LocationDetailsBinding.inflate(layoutInflater);
     arrivalView = binding.locationArrival;
     departureView = binding.locationDeparture;
-    slider = binding.slider;
     arrivalView.setChecked(geofence.isArrival());
     departureView.setChecked(geofence.isDeparture());
-    slider.setLabelFormatter(
-        value -> getString(R.string.location_radius_meters, locale.formatNumber(value)));
-    slider.setValueTo(MAX_RADIUS);
-    slider.setValueFrom(MIN_RADIUS);
-    slider.setStepSize(STEP);
-    slider.setHaloRadius(0);
-    slider.setValue(Math.round((geofence.getRadius() / STEP) * STEP));
     return dialogBuilder
         .newDialog(original.getDisplayName())
         .setView(binding.getRoot())
@@ -95,7 +80,6 @@ public class GeofenceDialog extends DialogFragment {
     Geofence geofence = new Geofence();
     geofence.setArrival(arrivalView.isChecked());
     geofence.setDeparture(departureView.isChecked());
-    geofence.setRadius((int) slider.getValue());
     return geofence;
   }
 

app/src/main/java/org/tasks/ui/LocationControlSet.kt

@@ -28,7 +28,6 @@ import org.tasks.preferences.Device
 import org.tasks.preferences.FragmentPermissionRequestor
 import org.tasks.preferences.PermissionChecker
 import org.tasks.preferences.Preferences
-import java.util.*
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -175,8 +174,8 @@ class LocationControlSet : TaskEditControlFragment() {
                     Geofence(
                             place.uid,
                             existing.isArrival,
-                            existing.isDeparture,
+                            existing.isDeparture
-                            existing.radius)
+                    )
                 }
                 setLocation(Location(geofence, place))
             }

app/src/main/res/layout/activity_location_settings.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/root_layout"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:layout_width="match_parent"
+    android:id="@+id/root_layout"
-  android:layout_height="match_parent"
+    android:layout_width="match_parent"
-  android:descendantFocusability="beforeDescendants"
+    android:layout_height="match_parent"
-  android:focusableInTouchMode="true"
+    android:descendantFocusability="beforeDescendants"
-  android:orientation="vertical">
+    android:focusableInTouchMode="true"
+    android:orientation="vertical">
 
   <include layout="@layout/toolbar"/>
 
@@ -34,6 +35,27 @@
 
       <include layout="@layout/list_settings_icon"/>
 
+      <TextView
+          style="@style/TagSettingsRow"
+          android:text="@string/geofence_radius"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:paddingStart="@dimen/keyline_first"
+          android:paddingEnd="@dimen/keyline_first" />
+
+      <com.google.android.material.slider.Slider
+          android:id="@+id/slider"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:paddingStart="@dimen/keyline_first"
+          android:paddingEnd="@dimen/keyline_first"
+          app:trackColorActive="?attr/colorSecondary"
+          app:thumbColor="?attr/colorSecondary"
+          app:tickColorActive="?attr/colorOnSecondary"
+          app:tickColorInactive="?attr/colorSecondary"
+          app:tickColor="@android:color/transparent"
+          app:trackColorInactive="@color/text_tertiary"/>
+
       <FrameLayout
         android:id="@+id/map"
         android:padding="@dimen/keyline_first"

app/src/main/res/layout/location_details.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
-  android:layout_height="wrap_content"
+  android:layout_height="wrap_content">
-  xmlns:app="http://schemas.android.com/apk/res-auto">
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -24,25 +23,5 @@
       android:gravity="center_vertical"
       android:text="@string/location_remind_departure"
       android:textAppearance="?attr/textAppearanceListItemSmall"/>
-
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="?android:attr/listPreferredItemHeightSmall"
-        android:ellipsize="end"
-        android:gravity="center_vertical"
-        android:text="@string/geofence_radius"
-        android:textAppearance="?attr/textAppearanceListItem"/>
-
-      <com.google.android.material.slider.Slider
-        android:id="@+id/slider"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:trackColorActive="?attr/colorSecondary"
-        app:thumbColor="?attr/colorSecondary"
-        app:tickColorActive="?attr/colorOnSecondary"
-        app:tickColorInactive="?attr/colorSecondary"
-        app:tickColor="@android:color/transparent"
-        app:trackColorInactive="@color/text_tertiary"/>
-
   </LinearLayout>
 </ScrollView>

app/src/main/res/values-ar/strings.xml

@@ -318,7 +318,6 @@
     <string name="CFC_tag_contains_name">اسم العلامة يحتوي…</string>
     <string name="CFC_tag_name">علامة…</string>
     <string name="default_location">الموقع الافتراضي</string>
-    <string name="EPr_default_location_radius">نصف القطر الافتراضي</string>
     <string name="EPr_default_importance_title">الأولويّة الافتراضيّة</string>
     <string name="FLA_new_filter">أنشأ تصفيةً جديدة</string>
     <string name="sort_created">بتاريخ الإنشاء</string>

app/src/main/res/values-bg-rBG/strings.xml

@@ -92,7 +92,6 @@
     <string name="EPr_default_importance_title">Приоритет по подразбиране</string>
     <string name="EPr_default_reminders_title">Напомняния по подразбиране</string>
     <string name="EPr_default_location_reminder_title">Напомняния за място по подразбиране</string>
-    <string name="EPr_default_location_radius">Радиус по подразбиране</string>
     <string name="EPr_default_reminders_mode_title">Тон на звънене/вибрация по подразбиране</string>
     <string name="priority_high">Висок</string>
     <string name="priority_medium">Среден</string>

app/src/main/res/values-ca/strings.xml

@@ -164,7 +164,6 @@
     <string name="EPr_default_reminders_mode_title">So / vibració predeterminat</string>
     <string name="priority_medium">Mig</string>
     <string name="default_location_reminder_on_arrival">En arribar</string>
-    <string name="EPr_default_location_radius">Radi predeterminat</string>
     <string name="priority_low">Baix</string>
     <string name="no_reminders">Sense recordatoris</string>
     <string name="default_location_reminder_on_departure">A la sortida</string>

app/src/main/res/values-cs/strings.xml

@@ -213,7 +213,6 @@
     <string name="SSD_sort_my_order">Vlastní pořadí</string>
     <string name="TEA_add_subtask">Přidat podúkol</string>
     <string name="EPr_default_location_reminder_title">Výchozí upomínky podle polohy</string>
-    <string name="EPr_default_location_radius">Výchozí přesnost</string>
     <string name="default_location_reminder_on_arrival">Při příchodu</string>
     <string name="default_location_reminder_on_departure">Při odchodu</string>
     <string name="default_location_reminder_on_arrival_or_departure">Při příchodu a odchodu</string>

app/src/main/res/values-da/strings.xml

@@ -512,7 +512,6 @@
     <string name="priority_medium">Middel</string>
     <string name="priority_high">Høj</string>
     <string name="EPr_default_reminders_mode_title">Ring/vibrér som standard</string>
-    <string name="EPr_default_location_radius">Standardradius</string>
     <string name="EPr_default_location_reminder_title">Standard for placeringspåmindelser</string>
     <string name="task_defaults">Standardindstillinger for opgaver</string>
     <string name="EPr_manage_delete_all_gcal_message">Er du sikker på, at du vil slette alle dine begivenheder for opgaver\?</string>

app/src/main/res/values-de/strings.xml

@@ -89,7 +89,6 @@
     <string name="EPr_default_importance_title">Dringlichkeitsvorgabe</string>
     <string name="EPr_default_reminders_title">Standard-Erinnerungen</string>
     <string name="EPr_default_location_reminder_title">Standard-Standort-Erinnerungen</string>
-    <string name="EPr_default_location_radius">Standardbereich</string>
     <string name="EPr_default_reminders_mode_title">Alarm/Vibrationssignal</string>
     <string name="priority_high">Hoch</string>
     <string name="priority_medium">Mittel</string>

app/src/main/res/values-eo/strings.xml

@@ -348,7 +348,6 @@
     <string name="gcal_TEA_error">Eraro dum aldonado de tasko al kalendaro!</string>
     <string name="default_location">Defaŭlta loko</string>
     <string name="EPr_default_reminders_mode_title">Defaŭlta vokosono/vibrado</string>
-    <string name="EPr_default_location_radius">Defaŭlta radiuso</string>
     <string name="EPr_default_importance_title">Defaŭlta prioritato</string>
     <string name="EPr_manage_delete_all_gcal_message">Ĉu vi certe volas forigi viajn ĉiujn eventojn por taskoj\?</string>
     <string name="EPr_manage_delete_all_gcal">Forigi ĉiujn kalendarajn eventojn por taskoj</string>

app/src/main/res/values-es/strings.xml

@@ -89,7 +89,6 @@
     <string name="EPr_default_importance_title">Prioridad predeterminada</string>
     <string name="EPr_default_reminders_title">Recordatorios por defecto</string>
     <string name="EPr_default_location_reminder_title">Recordatorios de ubicación predeterminados</string>
-    <string name="EPr_default_location_radius">Radio predeterminado</string>
     <string name="EPr_default_reminders_mode_title">Tipo predeterminado de timbre/vibración</string>
     <string name="priority_high">Alta</string>
     <string name="priority_medium">Media</string>

app/src/main/res/values-et/strings.xml

@@ -66,7 +66,6 @@
     <string name="EPr_default_importance_title">Vaikimisi tähtsus</string>
     <string name="EPr_default_reminders_title">Vaikimisi meeldetuletused</string>
     <string name="EPr_default_location_reminder_title">Vaikimisi asukoha-põhised meeldetuletused</string>
-    <string name="EPr_default_location_radius">Vaikimisi raadius</string>
     <string name="priority_high">Kõrge</string>
     <string name="priority_medium">Keskmine</string>
     <string name="priority_low">Madal</string>

app/src/main/res/values-eu/strings.xml

@@ -90,7 +90,6 @@
     <string name="EPr_default_importance_title">Lehenetsitako lehentasuna</string>
     <string name="EPr_default_reminders_title">Lehenetsitako oroigarriak</string>
     <string name="EPr_default_location_reminder_title">Lehenetsitako kokaleku-oroigarriak</string>
-    <string name="EPr_default_location_radius">Lehenetsitako erradioa</string>
     <string name="EPr_default_reminders_mode_title">Lehenetsitako doinua/bibrazio mota</string>
     <string name="priority_high">Altua</string>
     <string name="priority_medium">Ertaina</string>

app/src/main/res/values-fi/strings.xml

@@ -461,7 +461,6 @@
     <string name="default_location_reminder_on_departure">Lähdettäessä</string>
     <string name="default_location_reminder_on_arrival">Saavuttaessa</string>
     <string name="no_reminders">Ei muistutuksia</string>
-    <string name="EPr_default_location_radius">Oletusetäisyys</string>
     <string name="EPr_default_location_reminder_title">Oletussijaintimuistutukset</string>
     <string name="TEA_control_location">Sijainti</string>
     <string name="TEA_add_subtask">Lisää alitehtävä</string>

app/src/main/res/values-fr/strings.xml

@@ -83,7 +83,6 @@
     <string name="EPr_default_importance_title">Priorité par défaut</string>
     <string name="EPr_default_reminders_title">Rappels par défaut</string>
     <string name="EPr_default_location_reminder_title">Rappels d\'emplacement par défaut</string>
-    <string name="EPr_default_location_radius">Rayon par défaut</string>
     <string name="EPr_default_reminders_mode_title">Type de sonnerie/vibration par défaut</string>
     <string name="priority_high">Haute</string>
     <string name="priority_medium">Moyenne</string>

app/src/main/res/values-hr/strings.xml

@@ -530,7 +530,6 @@
     <string name="priority_high">Visoki</string>
     <string name="default_location">Standardna lokacija</string>
     <string name="EPr_default_reminders_mode_title">Standardna vrsta zvona/vibracije</string>
-    <string name="EPr_default_location_radius">Standardni radijus</string>
     <string name="EPr_default_location_reminder_title">Standardni podsjetnici lokacija</string>
     <string name="EPr_default_reminders_title">Standardni podsjetnici</string>
     <string name="default_due_date">Standardni datum roka</string>

app/src/main/res/values-hu/strings.xml

@@ -88,7 +88,6 @@
     <string name="EPr_default_importance_title">Alapértelmezett prioritás</string>
     <string name="EPr_default_reminders_title">Alapértelmezett emlékeztetők</string>
     <string name="EPr_default_location_reminder_title">Alapértelmezett hely emlékeztetők</string>
-    <string name="EPr_default_location_radius">Alapértelmezett távolság</string>
     <string name="EPr_default_reminders_mode_title">Alapértelmezett csengetés/rezgés típusa</string>
     <string name="priority_high">Magas</string>
     <string name="priority_medium">Közepes</string>

app/src/main/res/values-id/strings.xml

@@ -625,7 +625,6 @@
     <string name="default_location_reminder_on_departure">Saat keberangkatan</string>
     <string name="default_location_reminder_on_arrival">Pada kedatangan</string>
     <string name="EPr_default_reminders_mode_title">Tipe dering/getar bawaan</string>
-    <string name="EPr_default_location_radius">Radius bawaan</string>
     <string name="default_due_date">Tanggal jatuh tempo bawaan</string>
     <string name="default_start_date">Tanggal mulai bawaan</string>
     <string name="always_display_full_date">Tampilkan tanggal penuh</string>

app/src/main/res/values-it/strings.xml

@@ -90,7 +90,6 @@
     <string name="EPr_default_importance_title">Priorità predefinita</string>
     <string name="EPr_default_reminders_title">Promemoria predefiniti</string>
     <string name="EPr_default_location_reminder_title">Posizione promemoria predefinita</string>
-    <string name="EPr_default_location_radius">Raggio predefinito</string>
     <string name="EPr_default_reminders_mode_title">Tipo di squillo/vibrazione predefinito</string>
     <string name="priority_high">Alta</string>
     <string name="priority_medium">Media</string>

app/src/main/res/values-iw/strings.xml

@@ -90,7 +90,6 @@
     <string name="EPr_default_importance_title">עדיפות מחדל</string>
     <string name="EPr_default_reminders_title">תזכורות ברירת מחדל</string>
     <string name="EPr_default_location_reminder_title">תזכורות מיקום ברירת מחדל</string>
-    <string name="EPr_default_location_radius">רדיוס ברירת מחדל</string>
     <string name="EPr_default_reminders_mode_title">ברירת מחדל לסוג צלצול/רטט</string>
     <string name="priority_high">גבוה</string>
     <string name="priority_medium">בינוני</string>

app/src/main/res/values-ja/strings.xml

@@ -87,7 +87,6 @@
     <string name="EPr_default_importance_title">デフォルトの優先順位</string>
     <string name="EPr_default_reminders_title">デフォルトのリマインダー</string>
     <string name="EPr_default_location_reminder_title">デフォルトの場所リマインダー</string>
-    <string name="EPr_default_location_radius">デフォルトの半径</string>
     <string name="EPr_default_reminders_mode_title">デフォルトの通知音、振動種類</string>
     <string name="priority_high">高</string>
     <string name="priority_medium">中</string>

app/src/main/res/values-ko/strings.xml

@@ -88,7 +88,6 @@
     <string name="EPr_default_importance_title">기본 우선순위</string>
     <string name="EPr_default_reminders_title">기본 알림</string>
     <string name="EPr_default_location_reminder_title">기본 위치 알림</string>
-    <string name="EPr_default_location_radius">기본 반경</string>
     <string name="EPr_default_reminders_mode_title">기본 벨소리/진동 형식</string>
     <string name="priority_high">높음</string>
     <string name="priority_medium">중간</string>

app/src/main/res/values-lt/strings.xml

@@ -92,7 +92,6 @@
     <string name="EPr_default_importance_title">Numatytasis prioritetas</string>
     <string name="EPr_default_reminders_title">Numatytieji priminimai</string>
     <string name="EPr_default_location_reminder_title">Numatytieji vietų priminimai</string>
-    <string name="EPr_default_location_radius">Numatytasis spindulys</string>
     <string name="EPr_default_reminders_mode_title">Numatytasis skambučio/vibracijos tipas</string>
     <string name="priority_high">Aukštas</string>
     <string name="priority_medium">Vidutinis</string>

app/src/main/res/values-nb/strings.xml

@@ -197,7 +197,6 @@
     <string name="EPr_manage_delete_all_gcal_message">Ønsker du virkelig å slette alle dine hendelser for gjøremål\?</string>
     <string name="task_defaults">Gjøremålsforvalg</string>
     <string name="EPr_default_location_reminder_title">Forvalgte stedspåminnelser</string>
-    <string name="EPr_default_location_radius">Forvalgt radius</string>
     <string name="EPr_default_reminders_mode_title">Forvalgt ringe/vibrasjonstype</string>
     <string name="priority_high">Høy</string>
     <string name="priority_medium">Middels</string>

app/src/main/res/values-nl/strings.xml

@@ -89,7 +89,6 @@
     <string name="EPr_default_importance_title">Prioriteit</string>
     <string name="EPr_default_reminders_title">Herinneringen</string>
     <string name="EPr_default_location_reminder_title">Locatie herinneringen</string>
-    <string name="EPr_default_location_radius">Locatie actieradius</string>
     <string name="EPr_default_reminders_mode_title">Beltoon/trillen</string>
     <string name="priority_high">Hoog</string>
     <string name="priority_medium">Gemiddeld</string>

app/src/main/res/values-pl/strings.xml

@@ -85,7 +85,6 @@
     <string name="EPr_default_importance_title">Domyślny priorytet</string>
     <string name="EPr_default_reminders_title">Przypomnienia (domyślnie)</string>
     <string name="EPr_default_location_reminder_title">Domyślne powiadomienia o lokalizacji</string>
-    <string name="EPr_default_location_radius">Domyślny promień</string>
     <string name="EPr_default_reminders_mode_title">Domyślny dzwonek/wibracja</string>
     <string name="priority_high">Ważne</string>
     <string name="priority_medium">Średnio ważne</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -86,7 +86,6 @@
     <string name="EPr_default_importance_title">Prioridade padrão</string>
     <string name="EPr_default_reminders_title">Lembretes padrões</string>
     <string name="EPr_default_location_reminder_title">Lembretes de localização padrão</string>
-    <string name="EPr_default_location_radius">Raio padrão</string>
     <string name="EPr_default_reminders_mode_title">Tipo de toque/vibração padrão</string>
     <string name="priority_high">Alta</string>
     <string name="priority_medium">Média</string>

app/src/main/res/values-pt/strings.xml

@@ -427,7 +427,6 @@
     <string name="default_location_reminder_on_departure">Ao sair</string>
     <string name="default_location_reminder_on_arrival">Ao chegar</string>
     <string name="no_reminders">Sem lembretes</string>
-    <string name="EPr_default_location_radius">Alcance predefinido</string>
     <string name="EPr_default_location_reminder_title">Lembretes de localização predefinidos</string>
     <string name="TEA_control_location">Localização</string>
     <string name="date_shortcut_tomorrow_night">Amanhã à noite</string>

app/src/main/res/values-ro/strings.xml

@@ -443,7 +443,6 @@
     <string name="priority_high">Mare</string>
     <string name="default_location">Locație implicită</string>
     <string name="EPr_default_reminders_mode_title">Tipul implicit de alarmă/vibrație</string>
-    <string name="EPr_default_location_radius">Raza implicită</string>
     <string name="EPr_default_location_reminder_title">Reamintiri de locație implicită</string>
     <string name="EPr_default_reminders_title">Reamintiri implicite</string>
     <string name="default_due_date">data scadentă implicită</string>

app/src/main/res/values-ru/strings.xml

@@ -90,7 +90,6 @@
     <string name="EPr_default_importance_title">Приоритет по умолчанию</string>
     <string name="EPr_default_reminders_title">Напоминания по умолчанию</string>
     <string name="EPr_default_location_reminder_title">Напоминания о месте по умолчанию</string>
-    <string name="EPr_default_location_radius">Радиус по умолчанию</string>
     <string name="EPr_default_reminders_mode_title">Тип звонка/вибрации по умолчанию</string>
     <string name="priority_high">Высокий</string>
     <string name="priority_medium">Средний</string>

app/src/main/res/values-si/strings.xml

@@ -63,7 +63,6 @@
     <string name="default_location_reminder_on_arrival_or_departure">පැමිණිවිට සහ පිටත්වනවිට</string>
     <string name="default_location_reminder_on_departure">පිටත්ව යන විට</string>
     <string name="default_location_reminder_on_arrival">පැමිණි විට</string>
-    <string name="EPr_default_location_radius">පෙරනිමි අරය</string>
     <string name="EPr_cal_start_at_due_time">නියමිත වේලාවට දින දර්ශන සිදුවීම් ආරම්භ කරන්න</string>
     <string name="TEA_control_timer">ටයිමර් පාලනය</string>
     <string name="action_call">අමතන්න</string>

app/src/main/res/values-sk/strings.xml

@@ -87,7 +87,6 @@
     <string name="EPr_default_importance_title">Predvolená dôležitosť</string>
     <string name="EPr_default_reminders_title">Predvolené pripomienky</string>
     <string name="EPr_default_location_reminder_title">Východzie upozornenia podľa polohy</string>
-    <string name="EPr_default_location_radius">Predvolený polomer</string>
     <string name="EPr_default_reminders_mode_title">Východzie vyzváňanie/vybrovanie</string>
     <string name="priority_high">Vysoká</string>
     <string name="priority_medium">Stredná</string>

app/src/main/res/values-sv/strings.xml

@@ -241,7 +241,6 @@
     <string name="action_open">Öppna</string>
     <string name="TEA_control_location">Plats</string>
     <string name="EPr_default_location_reminder_title">Standardplatspåminnelse</string>
-    <string name="EPr_default_location_radius">Standardavstånd</string>
     <string name="no_reminders">Inga påminnelser</string>
     <string name="default_location_reminder_on_arrival">Vid ankomst</string>
     <string name="default_location_reminder_on_departure">Vid avgång</string>

app/src/main/res/values-ta/strings.xml

@@ -6,7 +6,6 @@
     <string name="priority_low">குறைந்த</string>
     <string name="priority_medium">நடுத்தரமான</string>
     <string name="priority_high">உயரமான</string>
-    <string name="EPr_default_location_radius">இயல்புநிலை ஆரம்</string>
     <string name="EPr_default_location_reminder_title">இயல்புநிலை இருப்பிட நினைவூட்டல்கள்</string>
     <string name="EPr_default_reminders_title">இயல்புநிலை நினைவூட்டல்கள்</string>
     <string name="EPr_default_importance_title">இயல்புநிலை முன்னுரிமை</string>

app/src/main/res/values-th/strings.xml

@@ -545,7 +545,6 @@
     <string name="priority_low">ต่ํา</string>
     <string name="priority_medium">ปานกลาง</string>
     <string name="priority_high">สูง</string>
-    <string name="EPr_default_location_radius">รัศมีเริ่มต้น</string>
     <string name="EPr_default_reminders_title">ตัวเตือนเริ่มต้น</string>
     <string name="default_start_date">วันที่เริ่มต้นเริ่มต้น</string>
     <string name="account_not_included">ไม่รวมอยู่ในการสมัครสมาชิก \'ตั้งชื่อราคาของคุณ\'</string>

app/src/main/res/values-tr/strings.xml

@@ -90,7 +90,6 @@
     <string name="EPr_default_importance_title">Öntanımlı öncelik</string>
     <string name="EPr_default_reminders_title">Öntanımlı anımsatıcılar</string>
     <string name="EPr_default_location_reminder_title">Öntanımlı konum anımsatıcılar</string>
-    <string name="EPr_default_location_radius">Öntanımlı yarıçap</string>
     <string name="EPr_default_reminders_mode_title">Öntanımlı zil/titreşim türü</string>
     <string name="priority_high">Yüksek</string>
     <string name="priority_medium">Orta</string>

app/src/main/res/values-uk/strings.xml

@@ -90,7 +90,6 @@
     <string name="EPr_default_importance_title">Типовий пріоритет</string>
     <string name="EPr_default_reminders_title">Типові нагадування</string>
     <string name="EPr_default_location_reminder_title">Типові нагадування про розташування</string>
-    <string name="EPr_default_location_radius">Типовий радіус</string>
     <string name="EPr_default_reminders_mode_title">Типовий звук/вібраця</string>
     <string name="priority_high">Високий</string>
     <string name="priority_medium">Середній</string>

app/src/main/res/values-ur/strings.xml

@@ -75,7 +75,6 @@
     <string name="priority_high">ہائی</string>
     <string name="default_location">ڈیفالٹ لوکیشن</string>
     <string name="EPr_default_reminders_mode_title">ڈیفالٹ رنگ ٹون / وائبریشن ٹائپ</string>
-    <string name="EPr_default_location_radius">ڈیفالٹ رداس</string>
     <string name="EPr_default_location_reminder_title">ڈیفالٹ لوکیشن کی یاد دہانیاں</string>
     <string name="EPr_default_reminders_title">ڈیفالٹ یاددہانی</string>
     <string name="EPr_default_importance_title">ڈیفالٹ ترجیح</string>

app/src/main/res/values-vi/strings.xml

@@ -641,7 +641,6 @@
     <string name="priority_high">Cao</string>
     <string name="default_location">Vị trí mặc định</string>
     <string name="EPr_default_reminders_mode_title">Loại đổ chuông/rung mặc định</string>
-    <string name="EPr_default_location_radius">Bán kính mặc định</string>
     <string name="EPr_default_location_reminder_title">Lời nhắc vị trí mặc định</string>
     <string name="EPr_default_reminders_title">Lời nhắc mặc định</string>
     <string name="default_due_date">Ngày hạn mặc định</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -388,7 +388,6 @@
     <string name="linkify_description">增加链接至网站，地址，电话号码</string>
     <string name="TEA_control_location">位置</string>
     <string name="EPr_default_location_reminder_title">默认位置提醒</string>
-    <string name="EPr_default_location_radius">默认半径</string>
     <string name="no_reminders">无提醒</string>
     <string name="default_location_reminder_on_arrival">抵达时</string>
     <string name="default_location_reminder_on_departure">出发时</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -301,7 +301,6 @@
     <string name="default_location_reminder_on_arrival">到達時</string>
     <string name="no_reminders">沒有提醒</string>
     <string name="default_location">默認位置</string>
-    <string name="EPr_default_location_radius">默認半徑</string>
     <string name="EPr_default_location_reminder_title">默認位置提醒</string>
     <string name="always_display_full_date">顯示完整日期</string>
     <string name="tasks_org_account">Tasks.org 帳號</string>

app/src/main/res/values/keys.xml

@@ -216,7 +216,6 @@
   <!-- default reminders setting (corresponds to reminder flags) -->
   <string name="p_default_reminders_key">p_def_reminders_v2</string>
   <string name="p_default_location_reminder_key">p_def_location_reminders</string>
-  <string name="p_default_location_radius">p_def_location_radius</string>
 
   <!-- default reminder mode setting (corresponds to entry in TEA_reminder_mode_once, TEA_reminder_mode_five, TEA_reminder_mode_nonstop) -->
   <string name="p_default_reminders_mode_key">rmd_default_reminder_mode</string>

app/src/main/res/values/strings.xml

@@ -104,7 +104,6 @@ File %1$s contained %2$s.\n\n
   <string name="default_due_date">Default due date</string>
   <string name="EPr_default_reminders_title">Default reminders</string>
   <string name="EPr_default_location_reminder_title">Default location reminders</string>
-  <string name="EPr_default_location_radius">Default radius</string>
   <string name="EPr_default_reminders_mode_title">Default ring/vibrate type</string>
   <string name="default_location">Default location</string>
   <string name="priority_high">High</string>

app/src/main/res/xml/preferences_task_defaults.xml

@@ -110,13 +110,4 @@
     android:title="@string/EPr_default_location_reminder_title"
     app:singleLineTitle="false" />
 
-  <SeekBarPreference
-    android:defaultValue="250"
-    android:key="@string/p_default_location_radius"
-    android:max="1000"
-    android:title="@string/EPr_default_location_radius"
-    app:min="75"
-    app:seekBarIncrement="25"
-    app:showSeekBarValue="true" />
-
 </PreferenceScreen>