From 2e0893bac41b23c586afc3261ebec03eaaca4ffd Mon Sep 17 00:00:00 2001
From: Igor I <ivanov.i@istt.kz>
Date: Mon, 25 Aug 2025 18:46:38 +0500
Subject: [PATCH] Order by distance

---
 .idea/caches/deviceStreaming.xml              |  75 ++++++++++-
 .../kz/istt/locust/LocustDelListActivity.java |   8 +-
 .../istt/locust/LocustHealthListActivity.java | 126 +++++++++++++++---
 .../kz/istt/locust/LocustListActivity.java    |   8 +-
 .../java/kz/istt/locust/SetupActivity.java    |  33 ++++-
 app/src/main/res/layout/activity_setup.xml    |   5 +
 app/src/main/res/values-az/strings.xml        |   1 +
 app/src/main/res/values-hy/strings.xml        |   1 +
 app/src/main/res/values-ka/strings.xml        |   1 +
 app/src/main/res/values-kg/strings.xml        |   1 +
 app/src/main/res/values-kk/strings.xml        |   1 +
 app/src/main/res/values-ps/strings.xml        |   3 +-
 app/src/main/res/values-ru/strings.xml        |   1 +
 app/src/main/res/values-tg/strings.xml        |   1 +
 app/src/main/res/values-tk/strings.xml        |   1 +
 app/src/main/res/values-uz/strings.xml        |   1 +
 app/src/main/res/values/strings.xml           |   1 +
 17 files changed, 235 insertions(+), 33 deletions(-)

diff --git a/.idea/caches/deviceStreaming.xml b/.idea/caches/deviceStreaming.xml
index 8178718..528f19e 100644
--- a/.idea/caches/deviceStreaming.xml
+++ b/.idea/caches/deviceStreaming.xml
@@ -75,6 +75,18 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2160" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a14m" />
+          <option name="id" value="a14m" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-A145R" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2408" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="samsung" />
@@ -124,19 +136,19 @@
           <option name="screenY" value="2340" />
         </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="a51" />
-          <option name="id" value="a51" />
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="akita" />
+          <option name="id" value="akita" />
           <option name="labId" value="google" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy A51" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8a" />
           <option name="screenDensity" value="420" />
           <option name="screenX" value="1080" />
           <option name="screenY" value="2400" />
         </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
+          <option name="api" value="35" />
           <option name="brand" value="google" />
           <option name="codename" value="akita" />
           <option name="id" value="akita" />
@@ -342,6 +354,18 @@
           <option name="screenX" value="384" />
           <option name="screenY" value="384" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="eqe" />
+          <option name="id" value="eqe" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="edge 50 pro" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1220" />
+          <option name="screenY" value="2712" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
@@ -548,6 +572,18 @@
           <option name="screenX" value="1008" />
           <option name="screenY" value="2244" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="lion" />
+          <option name="id" value="lion" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto g04" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1612" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
@@ -560,6 +596,18 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2400" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="lyriq" />
+          <option name="id" value="lyriq" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="edge 40" />
+          <option name="screenDensity" value="400" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="motorola" />
@@ -769,6 +817,19 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2424" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tokay" />
+          <option name="default" value="true" />
+          <option name="id" value="tokay" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2424" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="samsung" />
diff --git a/app/src/main/java/kz/istt/locust/LocustDelListActivity.java b/app/src/main/java/kz/istt/locust/LocustDelListActivity.java
index ee0f106..75c3014 100644
--- a/app/src/main/java/kz/istt/locust/LocustDelListActivity.java
+++ b/app/src/main/java/kz/istt/locust/LocustDelListActivity.java
@@ -606,16 +606,16 @@ public class LocustDelListActivity extends AppCompatActivity
 			switch (spiList.getSelectedItemPosition())
 			{
 				case 0:
-					cursor = rdb.rawQuery("select uid, coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocustdel where del=0 and filled!=1 and device_id='" + android_id + "'", null); //Не отправленные
+					cursor = rdb.rawQuery("select uid, coalesce(area,'') || ' ' || coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocustdel where del=0 and filled!=1 and device_id='" + android_id + "'", null); //Не отправленные
 				break;
 				case 1:
-					cursor = rdb.rawQuery("select uid, coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocustdel where del=0 and send=0 and filled=1 and device_id='"+android_id+"'", null); //Не отправленные
+					cursor = rdb.rawQuery("select uid, coalesce(area,'') || ' ' || coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocustdel where del=0 and send=0 and filled=1 and device_id='"+android_id+"'", null); //Не отправленные
 					break;
 				case 2:
-					cursor = rdb.rawQuery("select uid, coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocustdel where del=0 and send=1 and device_id='"+android_id+"'", null); //Отправленные
+					cursor = rdb.rawQuery("select uid, coalesce(area,'') || ' ' || coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocustdel where del=0 and send=1 and device_id='"+android_id+"'", null); //Отправленные
 					break;
 				default:
-					cursor = rdb.rawQuery("select uid, coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocustdel where del=0 and device_id='"+android_id+"'", null); //Все
+					cursor = rdb.rawQuery("select uid, coalesce(area,'') || ' ' || coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocustdel where del=0 and device_id='"+android_id+"'", null); //Все
 					//cursor = rdb.rawQuery("select uid, coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocustdel where del=0", null); //Все
 					break;
 			}
diff --git a/app/src/main/java/kz/istt/locust/LocustHealthListActivity.java b/app/src/main/java/kz/istt/locust/LocustHealthListActivity.java
index 5e5157e..f42aa9e 100644
--- a/app/src/main/java/kz/istt/locust/LocustHealthListActivity.java
+++ b/app/src/main/java/kz/istt/locust/LocustHealthListActivity.java
@@ -1,12 +1,20 @@
 package kz.istt.locust;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Color;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -26,6 +34,7 @@ import android.widget.Spinner;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
 
 import java.io.File;
 import java.text.ParseException;
@@ -35,8 +44,14 @@ import java.util.Date;
 import java.util.Timer;
 import java.util.TimerTask;
 
-public class LocustHealthListActivity extends AppCompatActivity
+import dbfields.selectDB;
+import tools.LatLonListener;
+
+public class LocustHealthListActivity extends AppCompatActivity implements LocationListener, LatLonListener
 {
+	private LocationManager _lm;
+	private double			_lat							= 0;					// c GPS приёмника
+	private double			_lon							= 0;					// c GPS приёмника
 
 	public LinearLayout llList;
 	public MyButton		btn;
@@ -122,6 +137,13 @@ public class LocustHealthListActivity extends AppCompatActivity
 
 		//Чтоб список обновлялся раз в минуту в соответствии с текущем фильтром (для наглядности отправки данных)
 		handler.post(runnable); // Начинаем выполнение задачи
+
+		// Чтоб слушать GPS (в конце метода чтобы успели присвоиться  GUI компоненты локальным переменным)
+		_lm = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
+		if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+			return;
+		}
+		_lm.requestLocationUpdates(LocationManager.GPS_PROVIDER, 500, 1, this);
 	}
 
 	@Override
@@ -601,14 +623,28 @@ public class LocustHealthListActivity extends AppCompatActivity
 		try {
 			rdb = dboh.getReadableDatabase();
 
+
+
+/*
+_lat = location.getLatitude();
+_lon = location.getLongitude();
+
+SELECT *,
+		((latitude - ?) * (latitude - ?) + (longitude - ?) * (longitude - ?)) AS distance
+FROM locations
+ORDER BY distance ASC;
+*/
+
+
 			switch (spiList.getSelectedItemPosition())
 			{
 				case 0:
 					cursor = rdb.rawQuery("""
 								select
+									ld.seq,
 									ld.uid as frmlocustdel_uid,
 									lh.uid as frmlocusthealth_uid,
-									coalesce(ld.district,'') || ' ' || coalesce(ld.terrain,'') terrain,
+									coalesce(ld.area,'') || ' ' || coalesce(ld.district,'') || ' ' || coalesce(ld.terrain,'') terrain,
 									lh.date,
 									EXISTS(select 1 from frmlocusthealth where frmlocustdel_uid=ld.uid) as health
 								from
@@ -617,14 +653,16 @@ public class LocustHealthListActivity extends AppCompatActivity
 								where
 									lh.del=0
 									and lh.filled!=1
+								order by ld.seq desc
 							""", null); //Не отправленные
 					break;
 				case 1:
 					cursor = rdb.rawQuery("""
 							select
+								ld.seq,
 								ld.uid as frmlocustdel_uid,
 								lh.uid as frmlocusthealth_uid,
-								coalesce(ld.district,'') || ' ' || coalesce(ld.terrain,'') terrain,
+								coalesce(ld.area,'') || ' ' || coalesce(ld.district,'') || ' ' || coalesce(ld.terrain,'') terrain,
 								lh.date,
 								EXISTS(select 1 from frmlocusthealth where frmlocustdel_uid=ld.uid) as health
 							from
@@ -634,14 +672,16 @@ public class LocustHealthListActivity extends AppCompatActivity
 								lh.del=0
 								and lh.send=0
 								and lh.filled=1
+							order by ld.seq desc
 						""", null); //Не отправленные
 					break;
 				case 2:
 					cursor = rdb.rawQuery("""
 							select
+								ld.seq,
 								ld.uid as frmlocustdel_uid,
 								lh.uid as frmlocusthealth_uid,
-								coalesce(ld.district,'') || ' ' || coalesce(ld.terrain,'') terrain,
+								coalesce(ld.area,'') || ' ' || coalesce(ld.district,'') || ' ' || coalesce(ld.terrain,'') terrain,
 								lh.date,
 								EXISTS(select 1 from frmlocusthealth where frmlocustdel_uid=ld.uid) as health
 							from
@@ -650,21 +690,58 @@ public class LocustHealthListActivity extends AppCompatActivity
 							where
 								lh.del=0
 								and lh.send=1
+							order by ld.seq desc
 						""", null); //Отправленные
 					break;
-				default:
-					cursor = rdb.rawQuery("""
-							select
-								ld.uid as frmlocustdel_uid,
-								lh.uid as frmlocusthealth_uid,
-								coalesce(ld.district,'') || ' ' || coalesce(ld.terrain,'') terrain,
-								coalesce(lh.date,ld.date) as date,
-								EXISTS(select 1 from frmlocusthealth where frmlocustdel_uid=ld.uid) as health
-							from
-								frmlocustdel ld
-								left join frmlocusthealth lh on lh.frmlocustdel_uid=ld.uid
-							where ld.del=0 and ld.filled=1
+				default: {
+
+					String prefName = "Distance";
+					SharedPreferences prefs = getSharedPreferences("CommonPrefs", Activity.MODE_PRIVATE);
+					String checked = prefs.getString(prefName, "");
+					if(checked.isEmpty() || checked.equals("1")) {
+						String[] selectionArgs = new String[]{
+								String.valueOf(_lat),
+								String.valueOf(_lat),
+								String.valueOf(_lon),
+								String.valueOf(_lon)
+						};
+						cursor = rdb.rawQuery("""
+
+								select
+									ld.seq,
+									ld.uid as frmlocustdel_uid,
+									lh.uid as frmlocusthealth_uid,
+									coalesce(ld.area,'') || ' ' || coalesce(ld.district,'') || ' ' || coalesce(ld.terrain,'') terrain,
+									coalesce(lh.date,ld.date) as date,
+									EXISTS(select 1 from frmlocusthealth where frmlocustdel_uid=ld.uid) as health,
+									((ld.lat_center - ?) * (ld.lat_center - ?) + (ld.lon_center - ?) * (ld.lon_center - ?)) AS distance
+								from
+									frmlocustdel ld
+									left join frmlocusthealth lh on lh.frmlocustdel_uid=ld.uid
+								where
+									ld.del=0
+									and ld.filled=1
+							order by distance, ld.seq desc
+						""", selectionArgs); //Все
+					}else{
+						cursor = rdb.rawQuery("""
+								select
+									ld.seq,
+									ld.uid as frmlocustdel_uid,
+									lh.uid as frmlocusthealth_uid,
+									coalesce(ld.area,'') || ' ' || coalesce(ld.district,'') || ' ' || coalesce(ld.terrain,'') terrain,
+									coalesce(lh.date,ld.date) as date,
+									EXISTS(select 1 from frmlocusthealth where frmlocustdel_uid=ld.uid) as health
+								from
+									frmlocustdel ld
+									left join frmlocusthealth lh on lh.frmlocustdel_uid=ld.uid
+								where
+									ld.del=0
+									and ld.filled=1
+							order by ld.seq desc
 						""", null); //Все
+					}
+				}
 					break;
 			}
 
@@ -779,4 +856,21 @@ public class LocustHealthListActivity extends AppCompatActivity
 		dboh.close();
 	}
 
+	@Override
+	public void onLocationChanged(Location location)
+	{
+		_lat = location.getLatitude(); // от устройства
+		_lon = location.getLongitude(); // от устройства
+	}
+
+	@Override
+	public double getLat() {
+		return this._lat;
+	}
+
+	@Override
+	public double getLon() {
+		return this._lon;
+	}
+
 }
diff --git a/app/src/main/java/kz/istt/locust/LocustListActivity.java b/app/src/main/java/kz/istt/locust/LocustListActivity.java
index e0a4bcd..b3b95ad 100644
--- a/app/src/main/java/kz/istt/locust/LocustListActivity.java
+++ b/app/src/main/java/kz/istt/locust/LocustListActivity.java
@@ -583,19 +583,19 @@ public class LocustListActivity extends AppCompatActivity
 			switch (spiList.getSelectedItemPosition())
 			{
 				case 0:
-					sql = "select uid, coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocust where del=0 and filled!=1";
+					sql = "select uid, coalesce(area,'') || ' ' || coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocust where del=0 and filled!=1";
 					cursor = rdb.rawQuery(sql, null); //Не заполненые
 					break;
 				case 1:
-					sql = "select uid, coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocust where del=0 and send=0 and filled=1";
+					sql = "select uid, coalesce(area,'') || ' ' || coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocust where del=0 and send=0 and filled=1";
 					cursor = rdb.rawQuery(sql, null); //Не отправленные
 					break;
 				case 2:
-					sql = "select uid, coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocust where del=0 and send=1";
+					sql = "select uid, coalesce(area,'') || ' ' || coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocust where del=0 and send=1";
 					cursor = rdb.rawQuery(sql, null); //Отправленные
 					break;
 				default:
-					sql = "select uid, coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocust where del=0";
+					sql = "select uid, coalesce(area,'') || ' ' || coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocust where del=0";
 					cursor = rdb.rawQuery(sql, null); //Все
 					break;
 			}
diff --git a/app/src/main/java/kz/istt/locust/SetupActivity.java b/app/src/main/java/kz/istt/locust/SetupActivity.java
index 1a0b89c..8694a93 100644
--- a/app/src/main/java/kz/istt/locust/SetupActivity.java
+++ b/app/src/main/java/kz/istt/locust/SetupActivity.java
@@ -66,6 +66,8 @@ public class SetupActivity extends Activity {
 	public EditText edtURL = null;
 	public EditText edtSyncDays = null;
 	public CheckBox cbIdentifyCountryRegion = null;
+	public CheckBox cbOrderByDistance = null;
+
 	public CheckBox cbShowAdvancedSettings = null;
 
 	public final static int TASK1_CODE = 1;
@@ -292,11 +294,40 @@ public class SetupActivity extends Activity {
 					editor.putString(prefName, "1"); //Default value
 				else
 					editor.putString(prefName, "0");
-				editor.commit();
+				editor.apply();
 			}
 		};
 		cbIdentifyCountryRegion.setOnClickListener(oclBtnId);
 
+
+
+		cbOrderByDistance = (CheckBox) findViewById(R.id.cbOrderByDistance);
+
+		prefName = "Distance";
+		prefs = getSharedPreferences("CommonPrefs", Activity.MODE_PRIVATE);
+		checked = prefs.getString(prefName, "");
+		if(checked.equals("") || checked.equals("1"))
+			cbOrderByDistance.setChecked(true);
+		else
+			cbOrderByDistance.setChecked(false);
+
+		oclBtnId = new OnClickListener()
+		{
+			@Override
+			public void onClick(View v)
+			{
+				String prefName = "Distance";
+				SharedPreferences prefs = getSharedPreferences("CommonPrefs", Activity.MODE_PRIVATE);
+				SharedPreferences.Editor editor = prefs.edit();
+				if(cbOrderByDistance.isChecked())
+					editor.putString(prefName, "1"); //Default value
+				else
+					editor.putString(prefName, "0");
+				editor.apply();
+			}
+		};
+		cbOrderByDistance.setOnClickListener(oclBtnId);
+
 		//Кнопка для сканирования QR кода
 		btnQR = (Button) findViewById(R.id.btnQR);
 		OnClickListener oclBtnQR = new OnClickListener()
diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index b0526ec..343b558 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -201,6 +201,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/Identify_country_region" />
+            <CheckBox
+                android:id="@+id/cbOrderByDistance"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/Sort_lists_by_distance" />
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 7a92a11..961f128 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -311,6 +311,7 @@
 	<string name="Egg_pods_density_m2_to">Küpəciklərin sıxlığı/m² əvvəl</string>
 	<string name="Hopper_density_m2_from">Sürfələrin sıxlığı/m² ilə</string>
 	<string name="Hopper_density_m2_to">Sürfələrin sıxlığı/m²</string>
+    <string name="Sort_lists_by_distance">Siyahıları məsafəyə görə sıralayın</string>
     <string name="Please_activate_GPS">Zəhmət olmasa GPS-i aktivləşdirin</string>
     <string name="Authorize_the_tablet_by_QR_code">Planşetə QR kodu ilə icazə verin</string>
     <string name="Responsible_person_inspector">Planşet üzrə məsul şəxs-müfəttiş</string>
diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml
index 968e7fb..a574184 100644
--- a/app/src/main/res/values-hy/strings.xml
+++ b/app/src/main/res/values-hy/strings.xml
@@ -322,6 +322,7 @@
 	<string name="Egg_pods_density_m2_to">"Ձվապարկեր (խտություն /մ2) նախքան "</string>
 	<string name="Hopper_density_m2_from">թրթուրների խտությունը (/մ²) հետ</string>
 	<string name="Hopper_density_m2_to">թրթուրների խտությունը (/մ²) հետ</string>
+    <string name="Sort_lists_by_distance">Դասավորել ցուցակները հեռավորության համաձայն</string>
     <string name="Please_activate_GPS">"Խնդրում ենք ակտիվացնել GPS-ը "</string>
     <string name="Authorize_the_tablet_by_QR_code">Լիազորեք պլանշետը QR կոդով</string>
     <string name="Responsible_person_inspector">Պատասխանատու անձ (պլանշետի համար)</string>
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index c57aa49..811bf6c 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -313,6 +313,7 @@
 	<string name="Egg_pods_density_m2_to">"პარკუჭანები (სიმჭიდროვე/მ²) ადრე "</string>
 	<string name="Hopper_density_m2_from">მატლების სიმჭიდროვე (მ²) თან</string>
 	<string name="Hopper_density_m2_to">მატლების სიმჭიდროვე (მ²) ადრე</string>
+    <string name="Sort_lists_by_distance">სიების დახარისხება მანძილის მიხედვით</string>
     <string name="Please_activate_GPS">"გთხოვთ გააქტიუროთ GPS "</string>
     <string name="Authorize_the_tablet_by_QR_code">ტაბლეტის ავტორიზაცია QR კოდით</string>
     <string name="Responsible_person_inspector">პასუხისმგებელი პირის ინსპექტორი</string>
diff --git a/app/src/main/res/values-kg/strings.xml b/app/src/main/res/values-kg/strings.xml
index 28b830c..eb5ae70 100644
--- a/app/src/main/res/values-kg/strings.xml
+++ b/app/src/main/res/values-kg/strings.xml
@@ -316,6 +316,7 @@
 	<string name="Egg_pods_density_m2_to">Кубышкалар жыштыгы (/м²) мурун</string>
 	<string name="Hopper_density_m2_from">Личинкалардын жыштыгы (/м²) менен</string>
 	<string name="Hopper_density_m2_to">"Личинкалардын жыштыгы (/м²) мурун "</string>
+    <string name="Sort_lists_by_distance">Тизмелерди аралыктары боюнча иреттөө</string>
     <string name="Please_activate_GPS">GPSти иштетиңиз</string>
     <string name="Authorize_the_tablet_by_QR_code">Планшетке QR коду аркылуу уруксат бериңиз</string>
     <string name="Responsible_person_inspector">Планшет үчүн жооптуу (инспектор)</string>
diff --git a/app/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml
index 21e7be8..61a214b 100644
--- a/app/src/main/res/values-kk/strings.xml
+++ b/app/src/main/res/values-kk/strings.xml
@@ -320,6 +320,7 @@
 	<string name="Egg_pods_density_m2_to">Күбіршектер (тығыздығы/м²) бұрын</string>
 	<string name="Hopper_density_m2_from">Дернәсілдердің тығыздығы (/м²) бірге</string>
 	<string name="Hopper_density_m2_to">"Дернәсілдердің тығыздығы (/м²) бұрын "</string>
+    <string name="Sort_lists_by_distance">Тізімдерді қашықтық бойынша сұрыптау</string>
     <string name="Please_activate_GPS">GPS-ті іске қосыңыз</string>
     <string name="Authorize_the_tablet_by_QR_code">Планшетке QR коды арқылы рұқсат беріңіз</string>
     <string name="Responsible_person_inspector">Планшетке жауапты тұлға (инспектор)</string>
diff --git a/app/src/main/res/values-ps/strings.xml b/app/src/main/res/values-ps/strings.xml
index 12e7f11..3ac6ede 100644
--- a/app/src/main/res/values-ps/strings.xml
+++ b/app/src/main/res/values-ps/strings.xml
@@ -291,7 +291,8 @@
 	<string name="Egg_pods_density_m2_to">تعداد زه ملخ (نیچه) در متر مربع از</string>
 	<string name="Hopper_density_m2_from">تراکم مچک ( / متر مربع ) سره</string>
 	<string name="Hopper_density_m2_to">"تراکم مچک ( / متر مربع ) مخکې "</string>
-	<string name="Please_activate_GPS">مهرباني وکړئ GPS فعال کړئ</string>
+    <string name="Sort_lists_by_distance">لیستونه د واټن له مخې ترتیب کړئ</string>
+    <string name="Please_activate_GPS">مهرباني وکړئ GPS فعال کړئ</string>
 	<string name="Authorize_the_tablet_by_QR_code">تابلیت تان را ذریعه کیوآر کود اختیار نمائید</string>
 	<string name="Responsible_person_inspector">شخص مسئول تفتیش</string>
 	<string name="Organization">سازمان ها</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ad94e60..460c9dd 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -333,6 +333,7 @@
 	<string name="Egg_pods_density_m2_to">Плотность кубышек (/м²) до</string>
 	<string name="Hopper_density_m2_from">Плотность личинок (/м²) от</string>
 	<string name="Hopper_density_m2_to">Плотность личинок (/м²) до</string>
+    <string name="Sort_lists_by_distance">Сортировать списки по расстоянию</string>
     <string name="Please_activate_GPS">Пожалуйста активируйте GPS</string>
     <string name="Authorize_the_tablet_by_QR_code">Авторизовать планшет по QR коду</string>
 
diff --git a/app/src/main/res/values-tg/strings.xml b/app/src/main/res/values-tg/strings.xml
index c9182d5..398270d 100644
--- a/app/src/main/res/values-tg/strings.xml
+++ b/app/src/main/res/values-tg/strings.xml
@@ -324,6 +324,7 @@
 	<string name="Egg_pods_density_m2_to">Кузачаҳо ( зиччи м2) пеш</string>
 	<string name="Hopper_density_m2_from">Зичии кирминаҳо (/м2) бо</string>
 	<string name="Hopper_density_m2_to">Зичии кирминаҳо (/м2) пеш</string>
+    <string name="Sort_lists_by_distance">Рӯйхатҳоро аз рӯи масофа ҷудо кунед</string>
     <string name="Please_activate_GPS">Лутфан GPS-ро фаъол созед</string>
     <string name="Authorize_the_tablet_by_QR_code">Ба планшет тавассути рамзи QR иҷозат диҳед</string>
     <string name="Responsible_person_inspector">Шахси масъули планшет</string>
diff --git a/app/src/main/res/values-tk/strings.xml b/app/src/main/res/values-tk/strings.xml
index 6038654..6d891fe 100644
--- a/app/src/main/res/values-tk/strings.xml
+++ b/app/src/main/res/values-tk/strings.xml
@@ -324,6 +324,7 @@
     <string name="Egg_pods_density_m2_to">Ýumurtgaly küýzejikler ýada kubyşkalar (gürlügi/m²) çenli</string>
 	<string name="Hopper_density_m2_from">Liçinkalaryň gürlügi (/m²) dan</string>
 	<string name="Hopper_density_m2_to">Liçinkalaryň gürlügi (/m²) çenli</string>
+    <string name="Sort_lists_by_distance">Sanawlary uzaklyk boýunça tertipläň</string>
     <string name="Please_activate_GPS">GPS-i işjeňleşdirmegiňizi haýyş edýäris</string>
     <string name="Authorize_the_tablet_by_QR_code">Planşedi QR kody bilen ygtyýarlandyryň</string>
     <string name="Responsible_person_inspector">Planşet boýunça jogapkär adam</string>
diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml
index f9034f1..467c231 100644
--- a/app/src/main/res/values-uz/strings.xml
+++ b/app/src/main/res/values-uz/strings.xml
@@ -325,6 +325,7 @@
 	<string name="Egg_pods_density_m2_to">Ko\'zachalar zichligi (ta/m²) oldin</string>
 	<string name="Hopper_density_m2_from">Lichinkalar zichligi (ta/m²) bilan</string>
 	<string name="Hopper_density_m2_to">Lichinkalar zichligi (ta/m²) oldin</string>
+    <string name="Sort_lists_by_distance">Roʻyxatlarni masofa boʻyicha tartiblang</string>
     <string name="Please_activate_GPS">Iltimos, GPSni faollashtiring</string>
     <string name="Authorize_the_tablet_by_QR_code">Planshetga QR kod orqali avtorizatsiya qiling</string>
     <string name="Responsible_person_inspector">Planshet uchun javobgar shaxs</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5e01afb..d9f1fd6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -332,6 +332,7 @@
     <string name="title_activity_maps">Map</string>
     <string name="Show_map">Show map</string>
     <string name="Identify_country_region">Locate your country and region by GPS</string>
+    <string name="Sort_lists_by_distance">Sort lists by distance</string>
     <string name="Please_activate_GPS">Please activate GPS</string>
     <string name="Authorize_the_tablet_by_QR_code">Authorize the tablet by QR code</string>
     <string name="Responsible_person_inspector">Responsible person for the tablet (inspector)</string>