Range_Promotion and locked feature

app/src/main/java/com/cpm/lorealbaMabeline/constant/CommonString.java

@@ -119,6 +119,7 @@ public class CommonString {
     public static final String TABLE_COVERAGE_DATA = "COVERAGE_DATA";
     public static final String Key_Download_Status = "Download_Status";
     public static final String MESSAGE_CHANGED = "Invalid UserId Or Password / Password Has Been Changed.";
+    public static final String MESSAGE_LOCKED = "User ID is blocked. Please contact your supervisor";
     public static final String MESSAGE_LOGIN_NO_DATA = "Data mapping error.";
     public static final String Table_Sale_Tracking = "SALE_TRACKING_TABLE";
     public static final String Table_Applyeid_Promotion = "APPLYED_PROMOTION_TABLE";

app/src/main/java/com/cpm/lorealbaMabeline/consumeractivity/ConsumerUserDetailsActivity.java

@@ -48,9 +48,11 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.cardview.widget.CardView;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.cpm.lorealbaMabeline.gsonGetterSetter.PromotionMaster;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.gson.Gson;
 import com.google.zxing.integration.android.IntentIntegrator;
@@ -96,6 +98,7 @@ import okhttp3.ResponseBody;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
 
+
 public class ConsumerUserDetailsActivity extends AppCompatActivity implements View.OnClickListener, AdapterView.OnItemSelectedListener {
     String dialog_invoiceType = "Saleable", dialog_brand_Id = "", dialog_sub_brand_Id = "", dialog_reference_Id = "", product_name = "",
             product_Id = "0", product_mrp = "0", CounterId, visit_date,
@@ -266,7 +269,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
         if (flag_for_consumer_Update != null && flag_for_consumer_Update.equals("1")) {
             edt_mobile_no.setEnabled(false);
             mobile_checkbox.setEnabled(false);
-            rl_term_condition.setTextColor(getResources().getColor(com.androidbuts.multispinnerfilter.R.color.gray));
+            rl_term_condition.setTextColor(ContextCompat.getColor(context,R.color.gray));
             rl_term_condition.setEnabled(false);
             mobile_checkbox.setEnabled(false);
             edt_email_address.setEnabled(false);
@@ -304,55 +307,55 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
 
             //for demo perpose button
             if (!selected_list.get(0).getDemo_given_str().isEmpty() && selected_list.get(0).getDemo_given_str().equalsIgnoreCase("Yes")) {
-                promotion_btn_first.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+                promotion_btn_first.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-                promotion_btn_first.setTextColor(getResources().getColor(R.color.white));
+                promotion_btn_first.setTextColor(ContextCompat.getColor(context,R.color.white));
-                promotion_btn_second.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+                promotion_btn_second.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-                promotion_btn_second.setTextColor(getResources().getColor(R.color.grayfor_login));
+                promotion_btn_second.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
                 demo_given_str = "Yes";
             } else {
-                promotion_btn_second.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+                promotion_btn_second.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-                promotion_btn_second.setTextColor(getResources().getColor(R.color.white));
+                promotion_btn_second.setTextColor(ContextCompat.getColor(context,R.color.white));
-                promotion_btn_first.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+                promotion_btn_first.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-                promotion_btn_first.setTextColor(getResources().getColor(R.color.grayfor_login));
+                promotion_btn_first.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
                 demo_given_str = "No";
             }
 
             /////For Skin Genious
             if (!selected_list.get(0).getSkin_genius_str().isEmpty() && selected_list.get(0).getSkin_genius_str().equalsIgnoreCase("Yes")) {
-                skingn_btn_yes.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+                skingn_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-                skingn_btn_yes.setTextColor(getResources().getColor(R.color.white));
+                skingn_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.white));
-                skingn_btn_no.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+                skingn_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-                skingn_btn_no.setTextColor(getResources().getColor(R.color.grayfor_login));
+                skingn_btn_no.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
                 skin_genius_str = "Yes";
             } else {
-                skingn_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+                skingn_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-                skingn_btn_no.setTextColor(getResources().getColor(R.color.white));
+                skingn_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white));
-                skingn_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+                skingn_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-                skingn_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login));
+                skingn_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
                 skin_genius_str = "No";
             }
 
 /////For Maybelline VTO
             if (!selected_list.get(0).getMaybelline_vto_str().isEmpty() && selected_list.get(0).getMaybelline_vto_str().equalsIgnoreCase("Yes")) {
-                maybelline_btn_yes.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+                maybelline_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-                maybelline_btn_yes.setTextColor(getResources().getColor(R.color.white));
+                maybelline_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.white));
-                maybelline_btn_no.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+                maybelline_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-                maybelline_btn_no.setTextColor(getResources().getColor(R.color.grayfor_login));
+                maybelline_btn_no.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
                 maybelline_vto = "Yes";
             } else {
-                maybelline_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+                maybelline_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-                maybelline_btn_no.setTextColor(getResources().getColor(R.color.white));
+                maybelline_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white));
-                maybelline_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+                maybelline_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-                maybelline_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login));
+                maybelline_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
                 maybelline_vto = "No";
             }
 
 
             if (!selected_list.get(0).getProduct_sold_str().isEmpty() && selected_list.get(0).getProduct_sold_str().equalsIgnoreCase("Yes")) {
-                sale_btn_yes.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+                sale_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-                sale_btn_yes.setTextColor(getResources().getColor(R.color.white));
+                sale_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.white));
-                sale_btn_no.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+                sale_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-                sale_btn_no.setTextColor(getResources().getColor(R.color.grayfor_login));
+                sale_btn_no.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
                 card_layout_scan.setVisibility(View.VISIBLE);
                 card_layout_title.setVisibility(View.VISIBLE);
                 drawer_layout_recycle_store.setVisibility(View.VISIBLE);
@@ -361,10 +364,10 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                 img_visble.setVisibility(View.VISIBLE);
                 text_user_nm.setText(selected_list.get(0).getCustomer_name() + "  Customer - " + CommonFunctions.removed_special_char(edt_customer));
             } else {
-                sale_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+                sale_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-                sale_btn_no.setTextColor(getResources().getColor(R.color.white));
+                sale_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white));
-                sale_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+                sale_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-                sale_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login));
+                sale_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
                 card_layout_scan.setVisibility(View.GONE);
                 card_layout_title.setVisibility(View.GONE);
                 drawer_layout_recycle_store.setVisibility(View.GONE);
@@ -407,27 +410,27 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
             drawer_layout_recycle_store.setLayoutManager(new LinearLayoutManager(context));
         } else {
             selected_list = new ArrayList<>();
-            promotion_btn_second.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+            promotion_btn_second.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-            promotion_btn_second.setTextColor(getResources().getColor(R.color.white));
+            promotion_btn_second.setTextColor(ContextCompat.getColor(context,R.color.white));
-            promotion_btn_first.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+            promotion_btn_first.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-            promotion_btn_first.setTextColor(getResources().getColor(R.color.grayfor_login));
+            promotion_btn_first.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
 
-            sale_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+            sale_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-            sale_btn_no.setTextColor(getResources().getColor(R.color.white));
+            sale_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white));
-            sale_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+            sale_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-            sale_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login));
+            sale_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
 
             ///for Sale Genius
-            skingn_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+            skingn_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-            skingn_btn_no.setTextColor(getResources().getColor(R.color.white));
+            skingn_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white));
-            skingn_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+            skingn_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-            skingn_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login));
+            skingn_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
 
             ///for Maybelline VTO
-            maybelline_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+            maybelline_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-            maybelline_btn_no.setTextColor(getResources().getColor(R.color.white));
+            maybelline_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white));
-            maybelline_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+            maybelline_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-            maybelline_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login));
+            maybelline_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
 
             maybelline_vto = "No";
             skin_genius_str = "No";
@@ -508,7 +511,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
             mobile_checkbox.setEnabled(false);
             edt_email_address.setEnabled(false);
             edt_email_address.setText("");
-            rl_term_condition.setTextColor(getResources().getColor(com.androidbuts.multispinnerfilter.R.color.gray));
+            rl_term_condition.setTextColor(ContextCompat.getColor(context,R.color.gray));
             rl_term_condition.setEnabled(false);
 
         });
@@ -539,6 +542,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
         return super.onOptionsItemSelected(item);
     }
 
+    @SuppressLint("MissingSuperCall")
     @Override
     public void onBackPressed() {
         if (clicked_flag) {
@@ -700,12 +704,12 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                 edt_mobile_no.setText("0000000000");
                 rl_otp.setVisibility(View.GONE);
                 edt_mobile_no.setEnabled(false);
-                rl_term_condition.setTextColor(getResources().getColor(com.androidbuts.multispinnerfilter.R.color.gray));
+                rl_term_condition.setTextColor(ContextCompat.getColor(context,R.color.gray));
             } else {
                 edt_mobile_no.setText("");
                 no_mobile_no_flag = false;
                 edt_mobile_no.setEnabled(true);
-                rl_term_condition.setTextColor(getResources().getColor(R.color.blue));
+                rl_term_condition.setTextColor(ContextCompat.getColor(context,R.color.blue));
             }
 
         } else if (view.getId() == R.id.no_name_checkbox) {
@@ -912,10 +916,10 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
             } else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) {
                 AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
             } else {
-                promotion_btn_first.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+                promotion_btn_first.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-                promotion_btn_first.setTextColor(getResources().getColor(R.color.white));
+                promotion_btn_first.setTextColor(ContextCompat.getColor(context,R.color.white));
-                promotion_btn_second.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+                promotion_btn_second.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-                promotion_btn_second.setTextColor(getResources().getColor(R.color.grayfor_login));
+                promotion_btn_second.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
                 demo_given_str = "Yes";
                 if (response_term_condition.equals("1")) {
                     rl_demo_img.setVisibility(View.VISIBLE);
@@ -940,10 +944,10 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
             } else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) {
                 AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
             } else {
-                skingn_btn_yes.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+                skingn_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-                skingn_btn_yes.setTextColor(getResources().getColor(R.color.white));
+                skingn_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.white));
-                skingn_btn_no.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+                skingn_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-                skingn_btn_no.setTextColor(getResources().getColor(R.color.grayfor_login));
+                skingn_btn_no.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
                 skin_genius_str = "Yes";
             }
 
@@ -960,10 +964,10 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
             } else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) {
                 AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
             } else {
-                maybelline_btn_yes.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+                maybelline_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-                maybelline_btn_yes.setTextColor(getResources().getColor(R.color.white));
+                maybelline_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.white));
-                maybelline_btn_no.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+                maybelline_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-                maybelline_btn_no.setTextColor(getResources().getColor(R.color.grayfor_login));
+                maybelline_btn_no.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
                 maybelline_vto = "Yes";
             }
 
@@ -977,10 +981,10 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
             } else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) {
                 AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
             } else {
-                skingn_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+                skingn_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-                skingn_btn_no.setTextColor(getResources().getColor(R.color.white));
+                skingn_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white));
-                skingn_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+                skingn_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-                skingn_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login));
+                skingn_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
                 skin_genius_str = "No";
             }
 
@@ -997,10 +1001,10 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
             } else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) {
                 AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
             } else {
-                maybelline_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+                maybelline_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-                maybelline_btn_no.setTextColor(getResources().getColor(R.color.white));
+                maybelline_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white));
-                maybelline_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+                maybelline_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-                maybelline_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login));
+                maybelline_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
                 maybelline_vto = "No";
             }
 
@@ -1014,15 +1018,15 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
             } else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) {
                 AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
             } else {
-                promotion_btn_second.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+                promotion_btn_second.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-                promotion_btn_second.setTextColor(getResources().getColor(R.color.white));
+                promotion_btn_second.setTextColor(ContextCompat.getColor(context,R.color.white));
-                promotion_btn_first.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+                promotion_btn_first.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-                promotion_btn_first.setTextColor(getResources().getColor(R.color.grayfor_login));
+                promotion_btn_first.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
 
-                sale_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+                sale_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-                sale_btn_no.setTextColor(getResources().getColor(R.color.white));
+                sale_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white));
-                sale_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+                sale_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-                sale_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login));
+                sale_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
 
                 demo_given_str = "No";
                 str_img_demo_no_sale = "";
@@ -1040,10 +1044,10 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
             } else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) {
                 AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
             } else {
-                sale_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+                sale_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-                sale_btn_no.setTextColor(getResources().getColor(R.color.white));
+                sale_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white));
-                sale_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+                sale_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-                sale_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login));
+                sale_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
                 card_layout_scan.setVisibility(View.GONE);
                 card_layout_title.setVisibility(View.GONE);
                 drawer_layout_recycle_store.setVisibility(View.GONE);
@@ -1068,10 +1072,10 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                         }
                     }
                 }
-                sale_btn_yes.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+                sale_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-                sale_btn_yes.setTextColor(getResources().getColor(R.color.white));
+                sale_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.white));
-                sale_btn_no.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+                sale_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-                sale_btn_no.setTextColor(getResources().getColor(R.color.grayfor_login));
+                sale_btn_no.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
                 card_layout_scan.setVisibility(View.VISIBLE);
                 card_layout_title.setVisibility(View.VISIBLE);
                 drawer_layout_recycle_store.setVisibility(View.VISIBLE);
@@ -1552,7 +1556,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                     if (_pathforcheck != null && !_pathforcheck.isEmpty()) {
                         if (new File(CommonString.getImagesFolder(context) + _pathforcheck).exists()) {
                             convertBitmap(CommonString.getImagesFolder(context) + _pathforcheck);
-                            img_only_demo.setImageDrawable(getResources().getDrawable(R.mipmap.camera_bsd));
+                            img_only_demo.setImageDrawable(ContextCompat.getDrawable(context,R.mipmap.camera_bsd));
                             str_img_demo_no_sale = _pathforcheck;
                             _pathforcheck = "";
                         }
@@ -2581,12 +2585,12 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
             setProductSpinnerData(productList, dialog_product_spin);
             db.open();
             dialog_product_list = db.getproduct_masterlist("T_StockSummary", visit_date, CounterId, from);
-            btn_invoice_type_saleable.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+            btn_invoice_type_saleable.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-            btn_invoice_type_saleable.setTextColor(getResources().getColor(R.color.white));
+            btn_invoice_type_saleable.setTextColor(ContextCompat.getColor(context,R.color.white));
-            btn_invoice_type_sample.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+            btn_invoice_type_sample.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-            btn_invoice_type_sample.setTextColor(getResources().getColor(R.color.grayfor_login));
+            btn_invoice_type_sample.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
-            btn_invoice_type_gwp.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+            btn_invoice_type_gwp.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-            btn_invoice_type_gwp.setTextColor(getResources().getColor(R.color.grayfor_login));
+            btn_invoice_type_gwp.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
         });
 
         btn_invoice_type_sample.setOnClickListener(view -> {
@@ -2604,12 +2608,12 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
             setSubBrandSpinnerData(subbrandList, dialog_sub_brand_spin);
             setReferenceSpinnerData(referenceList, dialog_franchise_spin);
             setProductSpinnerData(productList, dialog_product_spin);
-            btn_invoice_type_sample.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+            btn_invoice_type_sample.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-            btn_invoice_type_sample.setTextColor(getResources().getColor(R.color.white));
+            btn_invoice_type_sample.setTextColor(ContextCompat.getColor(context,R.color.white));
-            btn_invoice_type_saleable.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+            btn_invoice_type_saleable.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-            btn_invoice_type_saleable.setTextColor(getResources().getColor(R.color.grayfor_login));
+            btn_invoice_type_saleable.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
-            btn_invoice_type_gwp.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+            btn_invoice_type_gwp.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-            btn_invoice_type_gwp.setTextColor(getResources().getColor(R.color.grayfor_login));
+            btn_invoice_type_gwp.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
             db.open();
             dialog_product_list = db.getproduct_masterlist(dialog_invoiceType, visit_date, CounterId, from);
 
@@ -2630,12 +2634,12 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
             setSubBrandSpinnerData(subbrandList, dialog_sub_brand_spin);
             setReferenceSpinnerData(referenceList, dialog_franchise_spin);
             setProductSpinnerData(productList, dialog_product_spin);
-            btn_invoice_type_gwp.setBackground(getResources().getDrawable(R.drawable.rouded_corner));
+            btn_invoice_type_gwp.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner));
-            btn_invoice_type_gwp.setTextColor(getResources().getColor(R.color.white));
+            btn_invoice_type_gwp.setTextColor(ContextCompat.getColor(context,R.color.white));
-            btn_invoice_type_saleable.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+            btn_invoice_type_saleable.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-            btn_invoice_type_saleable.setTextColor(getResources().getColor(R.color.grayfor_login));
+            btn_invoice_type_saleable.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
-            btn_invoice_type_sample.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary));
+            btn_invoice_type_sample.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary));
-            btn_invoice_type_sample.setTextColor(getResources().getColor(R.color.grayfor_login));
+            btn_invoice_type_sample.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login));
             db.open();
             dialog_product_list = db.getproduct_masterlist(dialog_invoiceType, visit_date, CounterId, from);
         });
@@ -3149,7 +3153,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                         response_term_condition = "0";
                     }
                 } else {
-                    rl_term_condition.setTextColor(getResources().getColor(R.color.blue));
+                    rl_term_condition.setTextColor(ContextCompat.getColor(context,R.color.blue));
                     rl_term_condition.setEnabled(true);
                 }
             }
@@ -3180,7 +3184,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                                     List<ConsumerTermsConditionAccept> dataresponce = reportbaAvailabilityGetterSetter.getConsumerTermsConditionAccept();
                                     if (dataresponce.get(0).getTermsConditionAccept()) {
                                         response_term_condition = "1";
-                                        rl_term_condition.setTextColor(getResources().getColor(com.androidbuts.multispinnerfilter.R.color.gray));
+                                        rl_term_condition.setTextColor(ContextCompat.getColor(context,R.color.gray));
                                         rl_term_condition.setEnabled(false);
 
                                     } else {
@@ -3214,7 +3218,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
     protected void onResume() {
         super.onResume();
         if (!response_term_condition.isEmpty() && !response_term_condition.equals("0")) {
-            rl_term_condition.setTextColor(getResources().getColor(R.color.gray));
+            rl_term_condition.setTextColor(ContextCompat.getColor(context,R.color.gray));
             rl_term_condition.setEnabled(false);
         }
 
@@ -3363,10 +3367,10 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
 
         if (flag_worth) {
             header_txt.setText("Applicable Worth Promotions");
-            rl_changes_color.setBackgroundColor(getResources().getColor(R.color.dashboard_less_ach));
+            rl_changes_color.setBackgroundColor(ContextCompat.getColor(context,R.color.dashboard_less_ach));
         } else {
             header_txt.setText("Applicable Product Promotions");
-            rl_changes_color.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+            rl_changes_color.setBackgroundColor(ContextCompat.getColor(context,R.color.colorPrimary));
         }
 
         ////show product selected
@@ -3374,7 +3378,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
         recycl_promotion.setLayoutManager(new LinearLayoutManager(context));
 
         cancet_btn.setOnClickListener(view -> {
-            purposeDialog.dismiss();
             added_prmo_products.clear();
             if (purposeDialog != null && purposeDialog.isShowing()) {
                 purposeDialog.dismiss();
@@ -3383,11 +3386,9 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
 
         btn_add.setOnClickListener(view -> {
             try {
-                purposeDialog.dismiss();
                 if (purposeDialog != null && purposeDialog.isShowing()) {
                     purposeDialog.dismiss();
                 }
-
                 if (flag_worth) {
                     if (!added_prmo_products.isEmpty()) {
                         selected_list.addAll(added_prmo_products);
@@ -3795,7 +3796,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                                         }
                                         invoiceGetterSetter.setDiscounted_value_productwise(new DecimalFormat("##.##").format(calculate_per_productwise));
                                         invoiceGetterSetter.setScan_ean_code_or_enterd_ean_code(qualified_products1.get(l).getScan_ean_code_or_enterd_ean_code());
-
                                         applyeid_products.add(invoiceGetterSetter);
                                     }
                                 }
@@ -3895,7 +3895,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                                                     } else {
                                                         calculate_per_productwise = (total_valueper_productwise * getentityValue) / 100;
                                                     }
-                                                    //test("promodata", String.valueOf(calculate_per_productwise));
                                                 } catch (NumberFormatException e) {
                                                     e.fillInStackTrace();
                                                 }
@@ -4283,14 +4282,8 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
     protected void remove_added_promo_index() {
         try {
             if (!selected_list.isEmpty()) {
-                Iterator<InvoiceGetterSetter> it = selected_list.iterator();
+                // Do something
-                while (it.hasNext()) {
+                selected_list.removeIf(InvoiceGetterSetter::isPromo_flag);
-                    InvoiceGetterSetter name = it.next();
-                    if (name.isPromo_flag()) {
-                        it.remove();
-                    }
-                    // Do something
-                }
             }
         } catch (Exception e) {
             e.fillInStackTrace();
@@ -4300,14 +4293,8 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
     protected void remove_added_promo_fromtemp(String promoId) {
         try {
             if (!added_prmo_products.isEmpty()) {
-                Iterator<InvoiceGetterSetter> it = added_prmo_products.iterator();
+                // Do something
-                while (it.hasNext()) {
+                added_prmo_products.removeIf(name -> promoId.equals(name.getPromotion_Id()));
-                    InvoiceGetterSetter name = it.next();
-                    if (promoId.equals(name.getPromotion_Id())) {
-                        it.remove();
-                    }
-                    // Do something
-                }
             }
         } catch (Exception e) {
             e.fillInStackTrace();
@@ -4362,7 +4349,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
         }
 
         close_white.setOnClickListener(view -> {
-            purposeDialog.dismiss();
             if (purposeDialog != null && purposeDialog.isShowing()) {
                 purposeDialog.dismiss();
             }
@@ -4514,8 +4500,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
             ////for product promotion
             db.open();
             ArrayList<MasterPromotion> promoMaster = db.getPromotionMaster(true);
-            // //test("promosize", String.valueOf(promoMaster.size()));
-
             if (!promoMaster.isEmpty()) {
                 final ArrayList<MasterPromotion> validPromoList = new ArrayList<>();
                 for (int x = 0; x < promoMaster.size(); x++) {
@@ -4528,13 +4512,11 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                             boolean flag_for_and = true;
                             for (int q = 0; q < promoAndList.size(); q++) {
                                 db.open();
-                                int product_countfor_and = db.getPromotiongetProductforAndPromo(promoAndList.get(q).getId(),
+                                int product_countfor_and = db.getPromotiongetProductforAndPromo(promoAndList.get(q).getId(), promoAndList.get(q).getPromoId().toString(), true, username, visit_date, CounterId);
-                                        promoAndList.get(q).getPromoId().toString(), true, username, visit_date, CounterId);
                                 ////checking AND promo itemcount
                                 if (product_countfor_and >= promoAndList.get(q).getItemCount()) {
                                     db.open();
-                                    db.update_temp_promo_apply_definitionfor_andpromo(promoAndList.get(q).getId(), CounterId, username,
+                                    db.update_temp_promo_apply_definitionfor_andpromo(promoAndList.get(q).getId(), CounterId, username, promoAndList.get(q).getPromoId(), visit_date);
-                                            promoAndList.get(q).getPromoId(), visit_date);
                                 } else {
                                     db.open();
                                     flag_for_and = false;
@@ -4542,7 +4524,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                                     break;
                                 }
                             }
-
                             if (flag_for_and) {
                                 //////--------insert all AND Promo data to Apply Definition.Table...-----------
                                 db.open();
@@ -4553,17 +4534,22 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                     } else {
                         db.open();
                         int product_count = db.getPromotiongetProductall(promoMaster.get(x), true, username, visit_date, CounterId);
-                        //test("product_count", String.valueOf(product_count));
+                        String promoSetEntityValues = promoMaster.get(x).getPromotionSetEntityValue();
                         if (product_count > 0) {
-                            if (product_count >= Integer.parseInt(promoMaster.get(x).getPromotionSetEntityValue())) {
+                            if (promoSetEntityValues.contains("|") && promoSetEntityValues.split("\\|").length == 2 && isCostInRange(promoSetEntityValues, product_count, promoMaster.get(x))) {
                                 db.open();
                                 db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date);
                                 validPromoList.add(promoMaster.get(x));
+                            } else {
+                                if (!promoSetEntityValues.contains("|") && product_count >= Integer.parseInt(promoSetEntityValues)) {
+                                    db.open();
+                                    db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date);
+                                    validPromoList.add(promoMaster.get(x));
+                                }
                             }
                         }
                     }
                 }
-
                 if (!validPromoList.isEmpty()) {
                     runOnUiThread(() -> {
                         if (dialog != null && dialog.isShowing()) {
@@ -4571,7 +4557,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                         }
                         show_promotion_skuwise_dialog(context, selected_list, validPromoList, false);
                     });
-
                 } else {
                     ///finish
                     checkPromoWorth(promoMaster);
@@ -4606,7 +4591,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                                         break;
                                     }
                                 }
-
                                 if (flag_for_and) {
                                     //////--------insert all AND Promo data to Apply Definition.Table...-----------
                                     db.open();
@@ -4617,12 +4601,19 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                         } else {
                             db.open();
                             int product_count = db.getPromotiongetProductall(promoMaster.get(x), false, username, visit_date, CounterId);
-                            //test("product_count", String.valueOf(product_count));
+                            //Log.e("product_count", String.valueOf(product_count));
+                            String promoSetEntityValues = promoMaster.get(x).getPromotionSetEntityValue();
                             if (product_count > 0) {
-                                if (product_count >= Integer.parseInt(promoMaster.get(x).getPromotionSetEntityValue())) {
+                                if (promoSetEntityValues.contains("|") && promoSetEntityValues.split("\\|").length == 2 && isCostInRange(promoSetEntityValues, product_count, promoMaster.get(x))) {
                                     db.open();
                                     db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date);
                                     validPromoList.add(promoMaster.get(x));
+                                } else {
+                                    if (!promoSetEntityValues.contains("|") && product_count >= Integer.parseInt(promoSetEntityValues)) {
+                                        db.open();
+                                        db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date);
+                                        validPromoList.add(promoMaster.get(x));
+                                    }
                                 }
                             }
                         }
@@ -4717,11 +4708,18 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                 } else {
                     db.open();
                     int product_count = db.getPromotiongetProductall(promoMaster.get(x), false, username, visit_date, CounterId);
+                    String promoSetEntityValues = promoMaster.get(x).getPromotionSetEntityValue();
                     if (product_count > 0) {
-                        if (product_count >= Integer.parseInt(promoMaster.get(x).getPromotionSetEntityValue())) {
+                        if (promoSetEntityValues.contains("|") && promoSetEntityValues.split("\\|").length == 2 && isCostInRange(promoSetEntityValues, product_count, promoMaster.get(x))) {
                             db.open();
                             db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date);
                             validPromoList.add(promoMaster.get(x));
+                        } else {
+                            if (!promoSetEntityValues.contains("|") && product_count >= Integer.parseInt(promoSetEntityValues)) {
+                                db.open();
+                                db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date);
+                                validPromoList.add(promoMaster.get(x));
+                            }
                         }
                     }
                 }
@@ -4813,12 +4811,18 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
                     } else {
                         db.open();
                         int product_count = db.getPromotiongetProductall(promoMaster.get(x), false, username, visit_date, CounterId);
-                        //test("Productcount", String.valueOf(product_count));
+                        String promoSetEntityValues = promoMaster.get(x).getPromotionSetEntityValue();
                         if (product_count > 0) {
-                            if (product_count >= Integer.parseInt(promoMaster.get(x).getPromotionSetEntityValue())) {
+                            if (promoSetEntityValues.contains("|") && promoSetEntityValues.split("\\|").length == 2 && isCostInRange(promoSetEntityValues, product_count, promoMaster.get(x))) {
                                 db.open();
                                 db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date);
                                 validPromoList.add(promoMaster.get(x));
+                            } else {
+                                if (!promoSetEntityValues.contains("|") && product_count >= Integer.parseInt(promoSetEntityValues)) {
+                                    db.open();
+                                    db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date);
+                                    validPromoList.add(promoMaster.get(x));
+                                }
                             }
                         }
                     }
@@ -4907,5 +4911,27 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
 
         return object;
     }
+
+    private boolean isCostInRange(String range, int totalCost, MasterPromotion promo) {
+        if (range == null || range.trim().isEmpty()) {
+            return false; // No range provided
+        }
+
+        String[] parts = range.split("\\|");
+        if (parts.length != 2) {
+            return false; // Invalid format
+        }
+        try {
+            int min = Integer.parseInt(parts[0].trim());
+            int max = Integer.parseInt(parts[1].trim());
+            boolean flg = totalCost >= min && totalCost <= max;
+            Log.e("Testing------1", min + " -- " + max + "\n" + flg);
+            return flg;
+        } catch (NumberFormatException e) {
+            e.fillInStackTrace();
+            return false; // Invalid number format
+        }
+    }
+
 }
 

app/src/main/java/com/cpm/lorealbaMabeline/dailyactivity/BAProfileActivity.java

@@ -968,7 +968,6 @@ public class BAProfileActivity extends AppCompatActivity implements View.OnClick
             AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
             status = false;
         }
-
         return status;
     }
 
@@ -1046,7 +1045,7 @@ public class BAProfileActivity extends AppCompatActivity implements View.OnClick
                 round_img_pic.setImageBitmap(bitmp);
             }
         } else if (!baProfileListData.isEmpty() && baProfileListData.get(0).getProfilePic() != null && !baProfileListData.get(0).getProfilePic().isEmpty()) {
-            Picasso.with(context).load(baProfileListData.get(0).getProfilePic()).networkPolicy(NetworkPolicy.NO_CACHE).into(round_img_pic);
+            Picasso.with(context).load(baProfileListData.get(0).getProfilePic()).networkPolicy(NetworkPolicy.NO_CACHE).placeholder(R.mipmap.profile_image).into(round_img_pic);
         } else {
             bitmp = BitmapFactory.decodeResource(getResources(), R.mipmap.profile_image);
             round_img_pic.setImageBitmap(bitmp);

app/src/main/java/com/cpm/lorealbaMabeline/dailyactivity/CounterImageActivity.java

@@ -91,6 +91,10 @@ public class CounterImageActivity extends AppCompatActivity implements
         db = new Lorealba_Database(context);
         db.open();
         validateuidata();
+        if (!db.isBaProfileFilled(counter_id, username, user_type) && db.getSaveServerData(null, username).isEmpty()) {
+            // Only show if BOTH are false
+            showAlertProfile(context);
+        }
     }
 
     private void getLastLocation() {
@@ -456,11 +460,7 @@ public class CounterImageActivity extends AppCompatActivity implements
         super.onResume();
         db.open();
         checkgpsEnableDevice();
-        if (!db.isBaProfileFilled(counter_id, username, user_type)) {
+
-            showAlertProfile(context);
-        } else if (db.getSaveServerData(null, username).isEmpty()) {
-            showAlertProfile(context);
-        }
     }
 
     private void checkgpsEnableDevice() {

app/src/main/java/com/cpm/lorealbaMabeline/dailyactivity/CounterProfileActivity.java

@@ -380,7 +380,6 @@ public class CounterProfileActivity extends AppCompatActivity implements View.On
                     image2.setImageDrawable(getResources().getDrawable(R.mipmap.camera_bsd));
                 }
 
-
                 //////////parshing date and counter agaiging.......
                 if (!storelist.get(0).getSetupDate().isEmpty()) {
                     counterimg_object.setSetupDate(storelist.get(0).getSetupDate());

app/src/main/java/com/cpm/lorealbaMabeline/dailyactivity/TabLoginActivity.java

@@ -377,10 +377,16 @@ public class TabLoginActivity extends AppCompatActivity implements View.OnClickL
                                 if (data != null && data.equalsIgnoreCase(CommonString.KEY_FAILURE)) {
                                     AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.KEY_FAILURE + " Please try again");
                                     loading.dismiss();
-                                } else if (data != null && data.contains("Changed")) {
+                                }
+                                else if (data != null && data.contains("Changed")) {
                                     loading.dismiss();
                                     AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.MESSAGE_CHANGED);
-                                } else if (data != null && data.contains("No data")) {
+                                }
+                                else if (data != null && data.contains("Lockout")) {
+                                    loading.dismiss();
+                                    AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.MESSAGE_LOCKED);
+                                }
+                                else if (data != null && data.contains("No data")) {
                                     loading.dismiss();
                                     AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.MESSAGE_LOGIN_NO_DATA);
                                 } else {

app/src/main/java/com/cpm/lorealbaMabeline/pinviewactivity/PinViewActivity.java

@@ -33,6 +33,7 @@ import androidx.cardview.widget.CardView;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
+import com.cpm.lorealbaMabeline.dailyactivity.TabLoginActivity;
 import com.goodiebag.pinview.Pinview;
 import com.google.android.gms.common.api.ResolvableApiException;
 import com.google.android.gms.location.FusedLocationProviderClient;
@@ -539,7 +540,12 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
                                 if (data_Login.contains("Changed")) {
                                     loading.dismiss();
                                     AlertandMessages.showAlertlogin((Activity) context, CommonString.MESSAGE_CHANGED);
-                                } else if (data_Login.contains("No data")) {
+                                }
+                                else if (data_Login.contains("Lockout")) {
+                                    loading.dismiss();
+                                    AlertandMessages.showAlertlogin((Activity) context, CommonString.MESSAGE_LOCKED);
+                                }
+                                else if (data_Login.contains("No data")) {
                                     loading.dismiss();
                                     AlertandMessages.showAlertlogin((Activity) context, CommonString.MESSAGE_LOGIN_NO_DATA);
                                 } else if (data_Login.equalsIgnoreCase(CommonString.KEY_FAILURE)) {

app/src/main/java/com/cpm/lorealbaMabeline/retrofit/DownloadAllDatawithRetro.java

@@ -89,7 +89,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
         this.context = context;
         this.db = db;
         this.pd = pd;
-       preferences = PrefHelper.getPrefs(context);
+        preferences = PrefHelper.getPrefs(context);
         editor = preferences.edit();
         date = preferences.getString(CommonString.KEY_DATE, "");
         counterId = preferences.getString(CommonString.KEY_COUNTER_ID, "");
@@ -144,7 +144,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
                                 } else {
                                     editor.putInt(CommonString.KEY_DOWNLOAD_INDEX, finalJsonIndex[0]);
                                     editor.apply();
-                                    Log.d("JSON_DATA",data);
+                                    Log.d("JSON_DATA", data);
                                     new MyLoader(context, finalKeyName, data).execute();
                                 }
                             }
@@ -336,7 +336,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
 
                     case "Mapping_JourneyPlan":
                         if (!data.contains("No Data")) {
-                            Log.d("JSON_DATA",data);
+                            Log.d("JSON_DATA", data);
                             jcpObject = new Gson().fromJson(data, JCPGetterSetter.class);
                             db.open();
                             if (jcpObject != null && !db.insertJCPData(jcpObject)) {
@@ -425,6 +425,9 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
                                 pd.dismiss();
                                 AlertandMessages.showToastMsg(context, "Master_Posm data not saved");
                             }
+                        } else {
+                            db.open();
+                            db.delete_table_data("Master_Posm");
                         }
 
                         break;
@@ -438,6 +441,9 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
                                 pd.dismiss();
                                 AlertandMessages.showToastMsg(context, "InwardSales PO Data not saved");
                             }
+                        } else {
+                            db.open();
+                            db.delete_table_data("InwardSales_PO");
                         }
 
 
@@ -490,6 +496,8 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
                             } catch (Exception e) {
                                 throw new java.lang.Exception();
                             }
+                        } else {
+                            db.delete_table_data("T_StockSummary");
                         }
 
                         break;
@@ -506,8 +514,6 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
                             db.open();
                             db.delete_table_data("T_CounterInvoice");
                         }
-
-
                         break;
 
                     case "Master_NonVisibility":
@@ -526,7 +532,6 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
 
                         break;
 
-
                     case "Master_NonStockReason":
                         if (!data.contains("No Data")) {
                             masterNonStockReasonObj = new Gson().fromJson(data, MasterNonStockReasonGetterSetter.class);
@@ -540,7 +545,6 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
                             db.delete_table_data("Master_NonStockReason");
                         }
 
-
                         break;
                     //jp
                     case "Master_SkinType":
@@ -579,6 +583,9 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
                                 pd.dismiss();
                                 AlertandMessages.showToastMsg(context, "Master_Profile not saved");
                             }
+                        } else {
+                            db.open();
+                            db.delete_table_data("Master_Profile");
                         }
 
 
@@ -609,10 +616,8 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
                             throw new java.lang.Exception();
                         }
 
-
                         break;
 
-
                     case "Master_TermsCondition":
                         if (!data.contains("No Data")) {
                             termConditionObject = new Gson().fromJson(data, MasterProfileQuestionGetterSetter.class);
@@ -834,7 +839,6 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
                             db.delete_table_data("Report_Top10Volume");
                         }
 
-
                         break;
 
                     case "Report_Top10Value":
@@ -1600,7 +1604,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
                         if (!data.contains("No Data")) {
                             TesterCounter testerCounter = new Gson().fromJson(data, TesterCounter.class);
                             db.open();
-                            if (testerCounter != null && testerCounter.getReportTesterCounter()!=null && !db.insertTesterCounter(testerCounter)) {
+                            if (testerCounter != null && testerCounter.getReportTesterCounter() != null && !db.insertTesterCounter(testerCounter)) {
                                 pd.dismiss();
                                 AlertandMessages.showToastMsg(context, "Report_TesterCounter not saved");
                             }
@@ -1806,7 +1810,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
 
                         break;
 
-                        case "T_LeaveLedgerSummary":
+                    case "T_LeaveLedgerSummary":
                         if (!data.contains("No Data")) {
                             ResponseResult leaveLedger = new Gson().fromJson(data, ResponseResult.class);
                             db.open();
@@ -1823,7 +1827,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
 
                     case "Mapping_AppRestrictedKPI":
                         if (!data.contains("No Data")) {
-                            MasterBAProfileGetterSetter  mappingAppRestrictedKPIGetterSetter = new Gson().fromJson(data, MasterBAProfileGetterSetter.class);
+                            MasterBAProfileGetterSetter mappingAppRestrictedKPIGetterSetter = new Gson().fromJson(data, MasterBAProfileGetterSetter.class);
                             db.open();
                             if (mappingAppRestrictedKPIGetterSetter != null && !db.insertMappingAppRestrictedKPI(mappingAppRestrictedKPIGetterSetter)) {
                                 AlertandMessages.showToastMsg(context, "Mapping_AppRestrictedKPI data not saved");
@@ -1963,7 +1967,6 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
                     }
                 }
             }
-
         } catch (Exception e) {
             e.fillInStackTrace();
         }
@@ -1987,12 +1990,10 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
                     int bytes = 0;
                     byte[] buffer = new byte[1024];
                     int len1 = 0;
-
                     while ((len1 = is1.read(buffer)) != -1) {
                         bytes = (bytes + len1);
                         fos.write(buffer, 0, len1);
                     }
-
                     fos.close();
                     is1.close();
                 }
@@ -2058,7 +2059,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
                             } else {
                                 data_global[0] = data;
                                 if (finalKeyName.equalsIgnoreCase("Table_Structure")) {
-                                    Log.d("JSON_DATA",data);
+                                    Log.d("JSON_DATA", data);
                                     editor.putInt(CommonString.KEY_DOWNLOAD_INDEX, finalJsonIndex[0]);
                                     editor.apply();
                                     tableStructureObj = new Gson().fromJson(data, TableStructureGetterSetter.class);

app/src/main/res/layout-sw600dp/content_baprofile.xml

@@ -33,6 +33,7 @@
                     android:layout_width="@dimen/hieght_180dp"
                     android:layout_height="@dimen/hieght_180dp"
                     android:layout_centerInParent="true"
+                    android:visibility="visible"
                     android:layout_gravity="center"
                     android:layout_margin="@dimen/custom_margin"
                     android:adjustViewBounds="true"

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

@@ -36,6 +36,7 @@
                     android:layout_height="@dimen/hieght_130dp"
                     android:layout_centerInParent="true"
                     android:layout_gravity="center"
+                    android:visibility="visible"
                     android:layout_margin="@dimen/custom_margin"
                     android:adjustViewBounds="true"
                     android:src="@mipmap/profile_image" />

library/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Wed Aug 06 13:34:25 IST 2025
+#Thu Aug 28 16:11:54 IST 2025
 com.androidbuts.multispinnerfilter.library-main-5\:/layout/textview_for_spinner.xml=D\:\\LorealBa-Latest-MNY-July-2025\\library\\build\\intermediates\\packaged_res\\release\\layout\\textview_for_spinner.xml
 com.androidbuts.multispinnerfilter.library-main-5\:/layout/activity_main.xml=D\:\\LorealBa-Latest-MNY-July-2025\\library\\build\\intermediates\\packaged_res\\release\\layout\\activity_main.xml
 com.androidbuts.multispinnerfilter.library-main-5\:/layout/alert_dialog_listview_search.xml=D\:\\LorealBa-Latest-MNY-July-2025\\library\\build\\intermediates\\packaged_res\\release\\layout\\alert_dialog_listview_search.xml

library/build/intermediates/lint-cache/lintVitalAnalyzeRelease/maven.google/com/google/android/material/group-index.xml

@@ -3,5 +3,5 @@
   <compose-theme-adapter versions="0.1.0-dev16,0.1.0-dev17,1.0.0-alpha01,1.0.0-alpha02,1.0.0-alpha03,1.0.0-alpha04,1.0.0-alpha05,1.0.0-alpha06,1.0.0-alpha07,1.0.0-alpha08,1.0.0-alpha09,1.0.0-alpha10,1.0.0-alpha11,1.0.0-alpha12,1.0.0-beta01,1.0.0-beta02,1.0.0-beta03,1.0.0-beta04,1.0.0-beta05,1.0.0-beta06,1.0.0-beta07,1.0.0-beta08,1.0.0-beta09,1.0.0-rc01,1.0.0-rc02,1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,1.1.0,1.1.1,1.1.2,1.1.3,1.1.4,1.1.5,1.1.6,1.1.7,1.1.8,1.1.9,1.1.10,1.1.11,1.1.12,1.1.13,1.1.14,1.1.15,1.1.16,1.1.17,1.1.18,1.1.19,1.1.20,1.1.21,1.1.22,1.2.0,1.2.1"/>
   <compose-theme-adapter-3 versions="1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,1.0.6,1.0.7,1.0.8,1.0.9,1.0.10,1.0.11,1.0.12,1.0.13,1.0.14,1.0.15,1.0.16,1.0.17,1.0.18,1.0.19,1.0.20,1.0.21,1.0.22,1.1.0,1.1.1"/>
   <compose-theme-adapter-core versions="1.0.0,1.0.1"/>
-  <material versions="1.0.0-alpha1,1.0.0-alpha3,1.0.0-beta01,1.0.0-rc01,1.0.0-rc02,1.0.0,1.1.0-alpha01,1.1.0-alpha02,1.1.0-alpha03,1.1.0-alpha04,1.1.0-alpha05,1.1.0-alpha06,1.1.0-alpha07,1.1.0-alpha08,1.1.0-alpha09,1.1.0-alpha10,1.1.0-beta01,1.1.0-beta02,1.1.0-rc01,1.1.0-rc02,1.1.0,1.2.0-alpha01,1.2.0-alpha02,1.2.0-alpha03,1.2.0-alpha04,1.2.0-alpha05,1.2.0-alpha06,1.2.0-beta01,1.2.0-rc01,1.2.0,1.2.1,1.3.0-alpha01,1.3.0-alpha02,1.3.0-alpha03,1.3.0-alpha04,1.3.0-beta01,1.3.0-rc01,1.3.0,1.4.0-alpha01,1.4.0-alpha02,1.4.0-beta01,1.4.0-rc01,1.4.0,1.5.0-alpha01,1.5.0-alpha02,1.5.0-alpha03,1.5.0-alpha04,1.5.0-alpha05,1.5.0-beta01,1.5.0-rc01,1.5.0,1.6.0-alpha01,1.6.0-alpha02,1.6.0-alpha03,1.6.0-beta01,1.6.0-rc01,1.6.0,1.6.1,1.7.0-alpha01,1.7.0-alpha02,1.7.0-alpha03,1.7.0-beta01,1.7.0-rc01,1.7.0,1.8.0-alpha01,1.8.0-alpha02,1.8.0-alpha03,1.8.0-beta01,1.8.0-rc01,1.8.0,1.9.0-alpha01,1.9.0-alpha02,1.9.0-beta01,1.9.0-rc01,1.9.0,1.10.0-alpha01,1.10.0-alpha02,1.10.0-alpha03,1.10.0-alpha04,1.10.0-alpha05,1.10.0-alpha06,1.10.0-beta01,1.10.0-rc01,1.10.0,1.11.0-alpha01,1.11.0-alpha02,1.11.0-alpha03,1.11.0-beta01,1.11.0-rc01,1.11.0,1.12.0-alpha01,1.12.0-alpha02,1.12.0-alpha03,1.12.0-beta01,1.12.0-rc01,1.12.0,1.13.0-alpha01,1.13.0-alpha02,1.13.0-alpha03,1.13.0-alpha04,1.13.0-alpha05,1.13.0-alpha06,1.13.0-alpha07,1.13.0-alpha08,1.13.0-alpha09,1.13.0-alpha10,1.13.0-alpha11,1.13.0-alpha12,1.13.0-alpha13,1.13.0-alpha14,1.13.0-beta01,1.13.0-rc01,1.14.0-alpha01,1.14.0-alpha02,1.14.0-alpha03"/>
+  <material versions="1.0.0-alpha1,1.0.0-alpha3,1.0.0-beta01,1.0.0-rc01,1.0.0-rc02,1.0.0,1.1.0-alpha01,1.1.0-alpha02,1.1.0-alpha03,1.1.0-alpha04,1.1.0-alpha05,1.1.0-alpha06,1.1.0-alpha07,1.1.0-alpha08,1.1.0-alpha09,1.1.0-alpha10,1.1.0-beta01,1.1.0-beta02,1.1.0-rc01,1.1.0-rc02,1.1.0,1.2.0-alpha01,1.2.0-alpha02,1.2.0-alpha03,1.2.0-alpha04,1.2.0-alpha05,1.2.0-alpha06,1.2.0-beta01,1.2.0-rc01,1.2.0,1.2.1,1.3.0-alpha01,1.3.0-alpha02,1.3.0-alpha03,1.3.0-alpha04,1.3.0-beta01,1.3.0-rc01,1.3.0,1.4.0-alpha01,1.4.0-alpha02,1.4.0-beta01,1.4.0-rc01,1.4.0,1.5.0-alpha01,1.5.0-alpha02,1.5.0-alpha03,1.5.0-alpha04,1.5.0-alpha05,1.5.0-beta01,1.5.0-rc01,1.5.0,1.6.0-alpha01,1.6.0-alpha02,1.6.0-alpha03,1.6.0-beta01,1.6.0-rc01,1.6.0,1.6.1,1.7.0-alpha01,1.7.0-alpha02,1.7.0-alpha03,1.7.0-beta01,1.7.0-rc01,1.7.0,1.8.0-alpha01,1.8.0-alpha02,1.8.0-alpha03,1.8.0-beta01,1.8.0-rc01,1.8.0,1.9.0-alpha01,1.9.0-alpha02,1.9.0-beta01,1.9.0-rc01,1.9.0,1.10.0-alpha01,1.10.0-alpha02,1.10.0-alpha03,1.10.0-alpha04,1.10.0-alpha05,1.10.0-alpha06,1.10.0-beta01,1.10.0-rc01,1.10.0,1.11.0-alpha01,1.11.0-alpha02,1.11.0-alpha03,1.11.0-beta01,1.11.0-rc01,1.11.0,1.12.0-alpha01,1.12.0-alpha02,1.12.0-alpha03,1.12.0-beta01,1.12.0-rc01,1.12.0,1.13.0-alpha01,1.13.0-alpha02,1.13.0-alpha03,1.13.0-alpha04,1.13.0-alpha05,1.13.0-alpha06,1.13.0-alpha07,1.13.0-alpha08,1.13.0-alpha09,1.13.0-alpha10,1.13.0-alpha11,1.13.0-alpha12,1.13.0-alpha13,1.13.0-alpha14,1.13.0-beta01,1.13.0-rc01,1.14.0-alpha01,1.14.0-alpha02,1.14.0-alpha03,1.14.0-alpha04"/>
 </com.google.android.material>

library/build/intermediates/lint-cache/lintVitalAnalyzeRelease/maven.google/master-index.xml

@@ -130,6 +130,7 @@
   <androidx.test.janktesthelper/>
   <androidx.test.services/>
   <androidx.test.uiautomator/>
+  <androidx.text/>
   <androidx.textclassifier/>
   <androidx.tracing/>
   <androidx.transition/>
@@ -244,6 +245,7 @@
   <com.google.android.flexbox/>
   <com.google.android.games/>
   <com.google.android.gms/>
+  <com.google.android.gms.oss-licenses-plugin/>
   <com.google.android.gms.strict-version-matcher-plugin/>
   <com.google.android.instantapps/>
   <com.google.android.instantapps.thirdpartycompat/>