From 432cbb6460ef1735a34685fe009bcc3d9cf5cea0 Mon Sep 17 00:00:00 2001
From: igor <irigm@mail.ru>
Date: Fri, 2 Aug 2024 07:05:44 +0500
Subject: [PATCH] =?UTF-8?q?+=D0=9F=D0=BE=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            |  4 +--
 .../java/kz/istt/locust/LocustActivity.java   | 23 ++-------------
 .../kz/istt/locust/LocustDelActivity.java     | 18 ++----------
 .../kz/istt/locust/LocustHealthActivity.java  | 28 ++-----------------
 ...ime2.java => OnClickListenerDateTime.java} |  9 ++----
 .../layout-land/activity_locust_health.xml    | 13 ++++++---
 .../layout-large/activity_locust_health.xml   | 11 ++++----
 7 files changed, 26 insertions(+), 80 deletions(-)
 rename app/src/main/java/tools/{OnClickListenerDateTime2.java => OnClickListenerDateTime.java} (92%)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index a9defa4..2cc1613 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-08-01T07:51:45.210388Z">
+        <DropdownSelection timestamp="2024-08-02T01:17:10.757633800Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\ivanov.i\.android\avd\Pixel_Tablet_API_33.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\igor\.android\avd\Pixel_Tablet_API_34.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/java/kz/istt/locust/LocustActivity.java b/app/src/main/java/kz/istt/locust/LocustActivity.java
index 0508ddf..b97e767 100644
--- a/app/src/main/java/kz/istt/locust/LocustActivity.java
+++ b/app/src/main/java/kz/istt/locust/LocustActivity.java
@@ -3,11 +3,6 @@ package kz.istt.locust;
 import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.DatePickerDialog;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.app.TimePickerDialog;
-import android.app.TimePickerDialog.OnTimeSetListener;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -26,7 +21,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.os.Parcelable;
 import android.provider.MediaStore;
 import android.provider.Settings;
 import android.provider.Settings.Secure;
@@ -35,41 +29,28 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.CheckBox;
-import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.TimePicker;
 import android.widget.Toast;
 
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.FileProvider;
-import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
-import com.google.android.gms.maps.model.LatLng;
-
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.Serializable;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.Locale;
 import java.util.zip.CRC32;
 
@@ -78,7 +59,7 @@ import dbfields.StringDB;
 import dbfields.fieldDB;
 import dbfields.selectDB;
 import tools.LatLonListener;
-import tools.OnClickListenerDateTime2;
+import tools.OnClickListenerDateTime;
 
 public class LocustActivity extends FragmentActivity implements LocationListener, LatLonListener {
 	private LocationManager lm;
@@ -337,7 +318,7 @@ public class LocustActivity extends FragmentActivity implements LocationListener
 		guiTable.add(edtDate, "date"); //Обязательное поле!
 
 		View btnGetDate = (View) findViewById(R.id.btnGetDate);
-		btnGetDate.setOnClickListener(new OnClickListenerDateTime2((fieldDB)edtDate,this));
+		btnGetDate.setOnClickListener(new OnClickListenerDateTime((fieldDB)edtDate,this));
 
 //Закоментил так как создал отдельный класс: OnClickListenerDateTime2
 //		View.OnClickListener clk0 = new View.OnClickListener() {
diff --git a/app/src/main/java/kz/istt/locust/LocustDelActivity.java b/app/src/main/java/kz/istt/locust/LocustDelActivity.java
index ea09b0e..e160518 100644
--- a/app/src/main/java/kz/istt/locust/LocustDelActivity.java
+++ b/app/src/main/java/kz/istt/locust/LocustDelActivity.java
@@ -3,9 +3,6 @@ package kz.istt.locust;
 import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.DatePickerDialog;
-import android.app.TimePickerDialog;
-import android.app.TimePickerDialog.OnTimeSetListener;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -29,23 +26,18 @@ import android.provider.Settings;
 import android.provider.Settings.Secure;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.TimePicker;
 import android.widget.Toast;
 
 import androidx.core.app.ActivityCompat;
@@ -60,24 +52,18 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.Locale;
 import java.util.zip.CRC32;
 
 import dbfields.AutoCompleteTextViewDB;
-import dbfields.DateTimeText;
-import dbfields.SpinnerDB;
 import dbfields.StringDB;
 import dbfields.fieldDB;
 import dbfields.selectDB;
 import tools.LatLonListener;
-import tools.OnClickListenerDateTime2;
+import tools.OnClickListenerDateTime;
 
 public class LocustDelActivity extends FragmentActivity implements LocationListener, LatLonListener
 {
@@ -368,7 +354,7 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
 		guiTable.add(edtDate, "date");
 
 		View btnGetDate = (View) findViewById(R.id.btnGetDate);
-		btnGetDate.setOnClickListener(new OnClickListenerDateTime2((fieldDB)edtDate,this));
+		btnGetDate.setOnClickListener(new OnClickListenerDateTime((fieldDB)edtDate,this));
 //Закоментил так как создал отдельный класс: OnClickListenerDateTime2
 //        View.OnClickListener clk0 = new View.OnClickListener() {
 //            public void onClick(View v)
diff --git a/app/src/main/java/kz/istt/locust/LocustHealthActivity.java b/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
index 438bc0e..a006378 100644
--- a/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
+++ b/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
@@ -1,16 +1,10 @@
 package kz.istt.locust;
 
-import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.DatePickerDialog;
-import android.app.TimePickerDialog;
-import android.app.TimePickerDialog.OnTimeSetListener;
-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.database.sqlite.SQLiteStatement;
@@ -21,10 +15,8 @@ import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.provider.MediaStore;
 import android.provider.Settings.Secure;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -34,18 +26,12 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.ScrollView;
-import android.widget.TimePicker;
 import android.widget.Toast;
 
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.FileProvider;
 import androidx.fragment.app.FragmentActivity;
 
 import java.io.BufferedInputStream;
@@ -54,25 +40,17 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.List;
-import java.util.Locale;
 import java.util.zip.CRC32;
 
 import dbfields.AutoCompleteTextViewDB;
-import dbfields.DateTimeTM;
 import dbfields.StringDB;
 import dbfields.fieldDB;
 import dbfields.selectDB;
 import tools.LatLonListener;
-import tools.OnClickListenerDateTime2;
+import tools.OnClickListenerDateTime;
 
 public class LocustHealthActivity extends FragmentActivity implements LocationListener, LatLonListener
 {
@@ -483,7 +461,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 		edtMonitoringTimeZone = (EditText) findViewById(R.id.edtMonitoringTimeZone);
 		guiTableHealth.add(edtMonitoringTimeZone,"timezone");
 		View btnMonitoringGetDate = (View) findViewById(R.id.btnMonitoringGetDate);
-		btnMonitoringGetDate.setOnClickListener(new OnClickListenerDateTime2((fieldDB)edtMonitoringDate,this));
+		btnMonitoringGetDate.setOnClickListener(new OnClickListenerDateTime((fieldDB)edtMonitoringDate,this));
 
 
 		//**********Бригада по обработке**********
@@ -554,7 +532,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 		edtInsManufacturedDate = (EditText) findViewById(R.id.edtInsManufacturedDate);
 		guiTableHealth.add(edtInsManufacturedDate, "insecticide_manufactured_date");
 		View btnInsManufacturedDate = (View) findViewById(R.id.btnInsManufacturedDate);
-		btnInsManufacturedDate.setOnClickListener(new OnClickListenerDateTime2((fieldDB)edtInsManufacturedDate,this));
+		btnInsManufacturedDate.setOnClickListener(new OnClickListenerDateTime((fieldDB)edtInsManufacturedDate,this));
 
 		// Наименование активного вещества отравы
 		edtInsActiveSubstance = (EditText) findViewById(R.id.edtInsActiveSubstance);
diff --git a/app/src/main/java/tools/OnClickListenerDateTime2.java b/app/src/main/java/tools/OnClickListenerDateTime.java
similarity index 92%
rename from app/src/main/java/tools/OnClickListenerDateTime2.java
rename to app/src/main/java/tools/OnClickListenerDateTime.java
index ca14ea9..c300a9b 100644
--- a/app/src/main/java/tools/OnClickListenerDateTime2.java
+++ b/app/src/main/java/tools/OnClickListenerDateTime.java
@@ -5,27 +5,22 @@ import android.app.TimePickerDialog;
 import android.content.Context;
 import android.view.View;
 import android.widget.DatePicker;
-import android.widget.EditText;
 import android.widget.TimePicker;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 
-import dbfields.DateTimeTM;
 import dbfields.fieldDB;
-import kz.istt.locust.LocustActivity;
 import kz.istt.locust.R;
 
 
-public class OnClickListenerDateTime2 implements View.OnClickListener {
+public class OnClickListenerDateTime implements View.OnClickListener {
 
     private fieldDB edtDate=null;
     private Context context=null;
 
-    public OnClickListenerDateTime2(fieldDB edtDate, Context context){
+    public OnClickListenerDateTime(fieldDB edtDate, Context context){
         this.edtDate = edtDate;
         this.context = context;
     }
diff --git a/app/src/main/res/layout-land/activity_locust_health.xml b/app/src/main/res/layout-land/activity_locust_health.xml
index 8dee451..c5cbb3f 100644
--- a/app/src/main/res/layout-land/activity_locust_health.xml
+++ b/app/src/main/res/layout-land/activity_locust_health.xml
@@ -24,6 +24,12 @@
             android:showDividers="middle"
             android:paddingRight="@dimen/activity_vertical_margin">
 
+            <TextView
+                android:id="@+id/textView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="spiEffTypeImpact" />
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -2343,9 +2349,8 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:hint="@string/Type_of_assessed_biological_impact">
-
                     <dbfields.AutoCompleteTextViewDB
-                        android:id="@+id/spiTypeImpact"
+                        android:id="@+id/spiEffTypeImpact"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:enabled="false"
@@ -2474,7 +2479,7 @@
                         android:layout_height="wrap_content"
                         android:hint="@string/Control_efficacy_conducted_monitoring_team">
                         <dbfields.AutoCompleteTextViewDB
-                            android:id="@+id/spiEffControll"
+                            android:id="@+id/spiEffControl2"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content" />
                     </com.google.android.material.textfield.TextInputLayout>
@@ -2511,7 +2516,7 @@
                         android:layout_height="wrap_content"
                         android:hint="@string/Type_of_assessed_biological_impact">
                         <dbfields.AutoCompleteTextViewDB
-                            android:id="@+id/spiEffImpactType"
+                            android:id="@+id/spiEffTypeImpact2"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"/>
                     </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout-large/activity_locust_health.xml b/app/src/main/res/layout-large/activity_locust_health.xml
index c28a9f3..3262011 100644
--- a/app/src/main/res/layout-large/activity_locust_health.xml
+++ b/app/src/main/res/layout-large/activity_locust_health.xml
@@ -6,7 +6,7 @@
     android:background="@drawable/gradient_example"
     android:paddingBottom="@dimen/activity_vertical_margin"
 
-    android:paddingRight="@dimen/activity_horizontal_margin"
+
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context=".LocustHealthActivity">
 
@@ -18,6 +18,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:paddingRight="@dimen/activity_horizontal_margin"
             android:orientation="vertical"
             android:divider="@drawable/spacer_medium"
             android:showDividers="middle">
@@ -1850,7 +1851,7 @@
                         android:text="@string/Type_of_assessed_biological_impact"
                         android:textAppearance="?android:attr/textAppearanceSmall" />
                     <dbfields.SpinnerDB
-                        android:id="@+id/spiTypeImpact"
+                        android:id="@+id/spiEffTypeImpact"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </LinearLayout>
@@ -1934,7 +1935,7 @@
                         android:text="@string/Control_efficacy_conducted_monitoring_team"
                         android:textAppearance="?android:attr/textAppearanceSmall" />
                     <dbfields.SpinnerDB
-                        android:id="@+id/spiEffControll"
+                        android:id="@+id/spiEffControl2"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -1967,7 +1968,7 @@
                         android:text="@string/Type_of_assessed_biological_impact"
                         android:textAppearance="?android:attr/textAppearanceSmall" />
                     <dbfields.SpinnerDB
-                        android:id="@+id/spiEffImpactType"
+                        android:id="@+id/spiEffTypeImpact2"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </LinearLayout>
@@ -2159,7 +2160,7 @@
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
                 <dbfields.SpinnerDB
-                    android:id="@+id/spiProtectiveClothingClean"
+                    android:id="@+id/spiHlthProtectiveClothingClean"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </LinearLayout>