lockedUser
This commit is contained in:
Generated
-1
@@ -1,4 +1,3 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="ms-17" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="ms-17" project-jdk-type="JavaSDK">
|
||||||
|
|||||||
+1
-1
@@ -34,7 +34,7 @@ android {
|
|||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
buildConfigField "boolean", "LOG_ENABLED", "true"
|
buildConfigField "boolean", "LOG_ENABLED", "true"
|
||||||
debuggable false
|
debuggable true
|
||||||
minifyEnabled true
|
minifyEnabled true
|
||||||
shrinkResources true
|
shrinkResources true
|
||||||
signingConfig signingConfigs.config
|
signingConfig signingConfigs.config
|
||||||
|
|||||||
Binary file not shown.
BIN
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@@ -266,7 +266,6 @@ public class IMEILoginActivity extends AppCompatActivity implements GoogleApiCli
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@SuppressLint("ObsoleteSdkInt")
|
@SuppressLint("ObsoleteSdkInt")
|
||||||
private void AttempLogin() {
|
private void AttempLogin() {
|
||||||
try {
|
try {
|
||||||
@@ -280,7 +279,6 @@ public class IMEILoginActivity extends AppCompatActivity implements GoogleApiCli
|
|||||||
loading = ProgressDialog.show(IMEILoginActivity.this, "Processing", "Please wait...", false, false);
|
loading = ProgressDialog.show(IMEILoginActivity.this, "Processing", "Please wait...", false, false);
|
||||||
versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
|
versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
|
||||||
JSONObject jsonObject = new JSONObject();
|
JSONObject jsonObject = new JSONObject();
|
||||||
|
|
||||||
jsonObject.put("OSVersion", os_version);
|
jsonObject.put("OSVersion", os_version);
|
||||||
jsonObject.put("Manufacturer", manufacturer);
|
jsonObject.put("Manufacturer", manufacturer);
|
||||||
jsonObject.put("ModelNumber", model);
|
jsonObject.put("ModelNumber", model);
|
||||||
@@ -302,9 +300,7 @@ public class IMEILoginActivity extends AppCompatActivity implements GoogleApiCli
|
|||||||
jsonObject.put("IMEINumber1", "0");
|
jsonObject.put("IMEINumber1", "0");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
String jsonString = jsonObject.toString();
|
String jsonString = jsonObject.toString();
|
||||||
Log.e("jsonlogindata", jsonString);
|
|
||||||
try {
|
try {
|
||||||
final OkHttpClient okHttpClient = new OkHttpClient.Builder().readTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).writeTimeout
|
final OkHttpClient okHttpClient = new OkHttpClient.Builder().readTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).writeTimeout
|
||||||
(CommonString.TIMEOUT, TimeUnit.SECONDS).connectTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).build();
|
(CommonString.TIMEOUT, TimeUnit.SECONDS).connectTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).build();
|
||||||
|
|||||||
@@ -119,6 +119,7 @@ public class CommonString {
|
|||||||
public static final String TABLE_COVERAGE_DATA = "COVERAGE_DATA";
|
public static final String TABLE_COVERAGE_DATA = "COVERAGE_DATA";
|
||||||
public static final String Key_Download_Status = "Download_Status";
|
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_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 MESSAGE_LOGIN_NO_DATA = "Data mapping error.";
|
||||||
public static final String Table_Sale_Tracking = "SALE_TRACKING_TABLE";
|
public static final String Table_Sale_Tracking = "SALE_TRACKING_TABLE";
|
||||||
public static final String Table_Applyeid_Promotion = "APPLYED_PROMOTION_TABLE";
|
public static final String Table_Applyeid_Promotion = "APPLYED_PROMOTION_TABLE";
|
||||||
|
|||||||
+177
-151
@@ -48,9 +48,11 @@ import androidx.annotation.NonNull;
|
|||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.appcompat.widget.Toolbar;
|
import androidx.appcompat.widget.Toolbar;
|
||||||
import androidx.cardview.widget.CardView;
|
import androidx.cardview.widget.CardView;
|
||||||
|
import androidx.core.content.ContextCompat;
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import com.cpm.lorealbaautomation.gsonGetterSetter.PromotionMaster;
|
||||||
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.google.zxing.integration.android.IntentIntegrator;
|
import com.google.zxing.integration.android.IntentIntegrator;
|
||||||
@@ -96,6 +98,7 @@ import okhttp3.ResponseBody;
|
|||||||
import retrofit2.Retrofit;
|
import retrofit2.Retrofit;
|
||||||
import retrofit2.converter.gson.GsonConverterFactory;
|
import retrofit2.converter.gson.GsonConverterFactory;
|
||||||
|
|
||||||
|
|
||||||
public class ConsumerUserDetailsActivity extends AppCompatActivity implements View.OnClickListener, AdapterView.OnItemSelectedListener {
|
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 = "",
|
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,
|
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")) {
|
if (flag_for_consumer_Update != null && flag_for_consumer_Update.equals("1")) {
|
||||||
edt_mobile_no.setEnabled(false);
|
edt_mobile_no.setEnabled(false);
|
||||||
mobile_checkbox.setEnabled(false);
|
mobile_checkbox.setEnabled(false);
|
||||||
rl_term_condition.setTextColor(getResources().getColor(R.color.gray));
|
rl_term_condition.setTextColor(ContextCompat.getColor(context,R.color.gray));
|
||||||
rl_term_condition.setEnabled(false);
|
rl_term_condition.setEnabled(false);
|
||||||
mobile_checkbox.setEnabled(false);
|
mobile_checkbox.setEnabled(false);
|
||||||
edt_email_address.setEnabled(false);
|
edt_email_address.setEnabled(false);
|
||||||
@@ -304,55 +307,55 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
|
|
||||||
//for demo perpose button
|
//for demo perpose button
|
||||||
if (!selected_list.get(0).getDemo_given_str().isEmpty() && selected_list.get(0).getDemo_given_str().equalsIgnoreCase("Yes")) {
|
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";
|
demo_given_str = "Yes";
|
||||||
} else {
|
} 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";
|
demo_given_str = "No";
|
||||||
}
|
}
|
||||||
|
|
||||||
/////For Skin Genious
|
/////For Skin Genious
|
||||||
if (!selected_list.get(0).getSkin_genius_str().isEmpty() && selected_list.get(0).getSkin_genius_str().equalsIgnoreCase("Yes")) {
|
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";
|
skin_genius_str = "Yes";
|
||||||
} else {
|
} 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";
|
skin_genius_str = "No";
|
||||||
}
|
}
|
||||||
|
|
||||||
/////For Maybelline VTO
|
/////For Maybelline VTO
|
||||||
if (!selected_list.get(0).getMaybelline_vto_str().isEmpty() && selected_list.get(0).getMaybelline_vto_str().equalsIgnoreCase("Yes")) {
|
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";
|
maybelline_vto = "Yes";
|
||||||
} else {
|
} 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";
|
maybelline_vto = "No";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (!selected_list.get(0).getProduct_sold_str().isEmpty() && selected_list.get(0).getProduct_sold_str().equalsIgnoreCase("Yes")) {
|
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_scan.setVisibility(View.VISIBLE);
|
||||||
card_layout_title.setVisibility(View.VISIBLE);
|
card_layout_title.setVisibility(View.VISIBLE);
|
||||||
drawer_layout_recycle_store.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);
|
img_visble.setVisibility(View.VISIBLE);
|
||||||
text_user_nm.setText(selected_list.get(0).getCustomer_name() + " Customer - " + CommonFunctions.removed_special_char(edt_customer));
|
text_user_nm.setText(selected_list.get(0).getCustomer_name() + " Customer - " + CommonFunctions.removed_special_char(edt_customer));
|
||||||
} else {
|
} 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_scan.setVisibility(View.GONE);
|
||||||
card_layout_title.setVisibility(View.GONE);
|
card_layout_title.setVisibility(View.GONE);
|
||||||
drawer_layout_recycle_store.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));
|
drawer_layout_recycle_store.setLayoutManager(new LinearLayoutManager(context));
|
||||||
} else {
|
} else {
|
||||||
selected_list = new ArrayList<>();
|
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
|
///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
|
///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";
|
maybelline_vto = "No";
|
||||||
skin_genius_str = "No";
|
skin_genius_str = "No";
|
||||||
@@ -508,7 +511,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
mobile_checkbox.setEnabled(false);
|
mobile_checkbox.setEnabled(false);
|
||||||
edt_email_address.setEnabled(false);
|
edt_email_address.setEnabled(false);
|
||||||
edt_email_address.setText("");
|
edt_email_address.setText("");
|
||||||
rl_term_condition.setTextColor(getResources().getColor(R.color.gray));
|
rl_term_condition.setTextColor(ContextCompat.getColor(context,R.color.gray));
|
||||||
rl_term_condition.setEnabled(false);
|
rl_term_condition.setEnabled(false);
|
||||||
|
|
||||||
});
|
});
|
||||||
@@ -539,6 +542,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressLint("MissingSuperCall")
|
||||||
@Override
|
@Override
|
||||||
public void onBackPressed() {
|
public void onBackPressed() {
|
||||||
if (clicked_flag) {
|
if (clicked_flag) {
|
||||||
@@ -700,12 +704,12 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
edt_mobile_no.setText("0000000000");
|
edt_mobile_no.setText("0000000000");
|
||||||
rl_otp.setVisibility(View.GONE);
|
rl_otp.setVisibility(View.GONE);
|
||||||
edt_mobile_no.setEnabled(false);
|
edt_mobile_no.setEnabled(false);
|
||||||
rl_term_condition.setTextColor(getResources().getColor(R.color.gray));
|
rl_term_condition.setTextColor(ContextCompat.getColor(context,R.color.gray));
|
||||||
} else {
|
} else {
|
||||||
edt_mobile_no.setText("");
|
edt_mobile_no.setText("");
|
||||||
no_mobile_no_flag = false;
|
no_mobile_no_flag = false;
|
||||||
edt_mobile_no.setEnabled(true);
|
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) {
|
} 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())) {
|
} else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) {
|
||||||
AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
|
AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
|
||||||
} else {
|
} 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";
|
demo_given_str = "Yes";
|
||||||
if (response_term_condition.equals("1")) {
|
if (response_term_condition.equals("1")) {
|
||||||
rl_demo_img.setVisibility(View.VISIBLE);
|
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())) {
|
} else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) {
|
||||||
AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
|
AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
|
||||||
} else {
|
} 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";
|
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())) {
|
} else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) {
|
||||||
AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
|
AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
|
||||||
} else {
|
} 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";
|
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())) {
|
} else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) {
|
||||||
AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
|
AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
|
||||||
} else {
|
} 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";
|
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())) {
|
} else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) {
|
||||||
AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
|
AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
|
||||||
} else {
|
} 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";
|
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())) {
|
} else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) {
|
||||||
AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
|
AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
|
||||||
} else {
|
} 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";
|
demo_given_str = "No";
|
||||||
str_img_demo_no_sale = "";
|
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())) {
|
} else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) {
|
||||||
AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
|
AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id ");
|
||||||
} else {
|
} 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_scan.setVisibility(View.GONE);
|
||||||
card_layout_title.setVisibility(View.GONE);
|
card_layout_title.setVisibility(View.GONE);
|
||||||
drawer_layout_recycle_store.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_scan.setVisibility(View.VISIBLE);
|
||||||
card_layout_title.setVisibility(View.VISIBLE);
|
card_layout_title.setVisibility(View.VISIBLE);
|
||||||
drawer_layout_recycle_store.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 (_pathforcheck != null && !_pathforcheck.isEmpty()) {
|
||||||
if (new File(CommonString.getImagesFolder(context) + _pathforcheck).exists()) {
|
if (new File(CommonString.getImagesFolder(context) + _pathforcheck).exists()) {
|
||||||
convertBitmap(CommonString.getImagesFolder(context) + _pathforcheck);
|
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;
|
str_img_demo_no_sale = _pathforcheck;
|
||||||
_pathforcheck = "";
|
_pathforcheck = "";
|
||||||
}
|
}
|
||||||
@@ -2581,12 +2585,12 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
setProductSpinnerData(productList, dialog_product_spin);
|
setProductSpinnerData(productList, dialog_product_spin);
|
||||||
db.open();
|
db.open();
|
||||||
dialog_product_list = db.getproduct_masterlist("T_StockSummary", visit_date, CounterId, from);
|
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 -> {
|
btn_invoice_type_sample.setOnClickListener(view -> {
|
||||||
@@ -2604,12 +2608,12 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
setSubBrandSpinnerData(subbrandList, dialog_sub_brand_spin);
|
setSubBrandSpinnerData(subbrandList, dialog_sub_brand_spin);
|
||||||
setReferenceSpinnerData(referenceList, dialog_franchise_spin);
|
setReferenceSpinnerData(referenceList, dialog_franchise_spin);
|
||||||
setProductSpinnerData(productList, dialog_product_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();
|
db.open();
|
||||||
dialog_product_list = db.getproduct_masterlist(dialog_invoiceType, visit_date, CounterId, from);
|
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);
|
setSubBrandSpinnerData(subbrandList, dialog_sub_brand_spin);
|
||||||
setReferenceSpinnerData(referenceList, dialog_franchise_spin);
|
setReferenceSpinnerData(referenceList, dialog_franchise_spin);
|
||||||
setProductSpinnerData(productList, dialog_product_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();
|
db.open();
|
||||||
dialog_product_list = db.getproduct_masterlist(dialog_invoiceType, visit_date, CounterId, from);
|
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";
|
response_term_condition = "0";
|
||||||
}
|
}
|
||||||
} else {
|
} 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);
|
rl_term_condition.setEnabled(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3180,7 +3184,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
List<ConsumerTermsConditionAccept> dataresponce = reportbaAvailabilityGetterSetter.getConsumerTermsConditionAccept();
|
List<ConsumerTermsConditionAccept> dataresponce = reportbaAvailabilityGetterSetter.getConsumerTermsConditionAccept();
|
||||||
if (dataresponce.get(0).getTermsConditionAccept()) {
|
if (dataresponce.get(0).getTermsConditionAccept()) {
|
||||||
response_term_condition = "1";
|
response_term_condition = "1";
|
||||||
rl_term_condition.setTextColor(getResources().getColor(R.color.gray));
|
rl_term_condition.setTextColor(ContextCompat.getColor(context,R.color.gray));
|
||||||
rl_term_condition.setEnabled(false);
|
rl_term_condition.setEnabled(false);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
@@ -3214,7 +3218,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
protected void onResume() {
|
protected void onResume() {
|
||||||
super.onResume();
|
super.onResume();
|
||||||
if (!response_term_condition.isEmpty() && !response_term_condition.equals("0")) {
|
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);
|
rl_term_condition.setEnabled(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3363,10 +3367,10 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
|
|
||||||
if (flag_worth) {
|
if (flag_worth) {
|
||||||
header_txt.setText("Applicable Worth Promotions");
|
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 {
|
} else {
|
||||||
header_txt.setText("Applicable Product Promotions");
|
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
|
////show product selected
|
||||||
@@ -3374,7 +3378,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
recycl_promotion.setLayoutManager(new LinearLayoutManager(context));
|
recycl_promotion.setLayoutManager(new LinearLayoutManager(context));
|
||||||
|
|
||||||
cancet_btn.setOnClickListener(view -> {
|
cancet_btn.setOnClickListener(view -> {
|
||||||
purposeDialog.dismiss();
|
|
||||||
added_prmo_products.clear();
|
added_prmo_products.clear();
|
||||||
if (purposeDialog != null && purposeDialog.isShowing()) {
|
if (purposeDialog != null && purposeDialog.isShowing()) {
|
||||||
purposeDialog.dismiss();
|
purposeDialog.dismiss();
|
||||||
@@ -3383,11 +3386,9 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
|
|
||||||
btn_add.setOnClickListener(view -> {
|
btn_add.setOnClickListener(view -> {
|
||||||
try {
|
try {
|
||||||
purposeDialog.dismiss();
|
|
||||||
if (purposeDialog != null && purposeDialog.isShowing()) {
|
if (purposeDialog != null && purposeDialog.isShowing()) {
|
||||||
purposeDialog.dismiss();
|
purposeDialog.dismiss();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flag_worth) {
|
if (flag_worth) {
|
||||||
if (!added_prmo_products.isEmpty()) {
|
if (!added_prmo_products.isEmpty()) {
|
||||||
selected_list.addAll(added_prmo_products);
|
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.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());
|
invoiceGetterSetter.setScan_ean_code_or_enterd_ean_code(qualified_products1.get(l).getScan_ean_code_or_enterd_ean_code());
|
||||||
|
|
||||||
applyeid_products.add(invoiceGetterSetter);
|
applyeid_products.add(invoiceGetterSetter);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3895,7 +3895,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
} else {
|
} else {
|
||||||
calculate_per_productwise = (total_valueper_productwise * getentityValue) / 100;
|
calculate_per_productwise = (total_valueper_productwise * getentityValue) / 100;
|
||||||
}
|
}
|
||||||
//test("promodata", String.valueOf(calculate_per_productwise));
|
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
e.fillInStackTrace();
|
e.fillInStackTrace();
|
||||||
}
|
}
|
||||||
@@ -4283,14 +4282,8 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
protected void remove_added_promo_index() {
|
protected void remove_added_promo_index() {
|
||||||
try {
|
try {
|
||||||
if (!selected_list.isEmpty()) {
|
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) {
|
} catch (Exception e) {
|
||||||
e.fillInStackTrace();
|
e.fillInStackTrace();
|
||||||
@@ -4300,14 +4293,8 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
protected void remove_added_promo_fromtemp(String promoId) {
|
protected void remove_added_promo_fromtemp(String promoId) {
|
||||||
try {
|
try {
|
||||||
if (!added_prmo_products.isEmpty()) {
|
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) {
|
} catch (Exception e) {
|
||||||
e.fillInStackTrace();
|
e.fillInStackTrace();
|
||||||
@@ -4362,7 +4349,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
}
|
}
|
||||||
|
|
||||||
close_white.setOnClickListener(view -> {
|
close_white.setOnClickListener(view -> {
|
||||||
purposeDialog.dismiss();
|
|
||||||
if (purposeDialog != null && purposeDialog.isShowing()) {
|
if (purposeDialog != null && purposeDialog.isShowing()) {
|
||||||
purposeDialog.dismiss();
|
purposeDialog.dismiss();
|
||||||
}
|
}
|
||||||
@@ -4514,8 +4500,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
////for product promotion
|
////for product promotion
|
||||||
db.open();
|
db.open();
|
||||||
ArrayList<MasterPromotion> promoMaster = db.getPromotionMaster(true);
|
ArrayList<MasterPromotion> promoMaster = db.getPromotionMaster(true);
|
||||||
// //test("promosize", String.valueOf(promoMaster.size()));
|
|
||||||
|
|
||||||
if (!promoMaster.isEmpty()) {
|
if (!promoMaster.isEmpty()) {
|
||||||
final ArrayList<MasterPromotion> validPromoList = new ArrayList<>();
|
final ArrayList<MasterPromotion> validPromoList = new ArrayList<>();
|
||||||
for (int x = 0; x < promoMaster.size(); x++) {
|
for (int x = 0; x < promoMaster.size(); x++) {
|
||||||
@@ -4528,13 +4512,11 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
boolean flag_for_and = true;
|
boolean flag_for_and = true;
|
||||||
for (int q = 0; q < promoAndList.size(); q++) {
|
for (int q = 0; q < promoAndList.size(); q++) {
|
||||||
db.open();
|
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
|
////checking AND promo itemcount
|
||||||
if (product_countfor_and >= promoAndList.get(q).getItemCount()) {
|
if (product_countfor_and >= promoAndList.get(q).getItemCount()) {
|
||||||
db.open();
|
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 {
|
} else {
|
||||||
db.open();
|
db.open();
|
||||||
flag_for_and = false;
|
flag_for_and = false;
|
||||||
@@ -4542,7 +4524,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flag_for_and) {
|
if (flag_for_and) {
|
||||||
//////--------insert all AND Promo data to Apply Definition.Table...-----------
|
//////--------insert all AND Promo data to Apply Definition.Table...-----------
|
||||||
db.open();
|
db.open();
|
||||||
@@ -4553,17 +4534,22 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
} else {
|
} else {
|
||||||
db.open();
|
db.open();
|
||||||
int product_count = db.getPromotiongetProductall(promoMaster.get(x), true, username, visit_date, CounterId);
|
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 > 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.open();
|
||||||
db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date);
|
db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date);
|
||||||
validPromoList.add(promoMaster.get(x));
|
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()) {
|
if (!validPromoList.isEmpty()) {
|
||||||
runOnUiThread(() -> {
|
runOnUiThread(() -> {
|
||||||
if (dialog != null && dialog.isShowing()) {
|
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);
|
show_promotion_skuwise_dialog(context, selected_list, validPromoList, false);
|
||||||
});
|
});
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
///finish
|
///finish
|
||||||
checkPromoWorth(promoMaster);
|
checkPromoWorth(promoMaster);
|
||||||
@@ -4606,7 +4591,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flag_for_and) {
|
if (flag_for_and) {
|
||||||
//////--------insert all AND Promo data to Apply Definition.Table...-----------
|
//////--------insert all AND Promo data to Apply Definition.Table...-----------
|
||||||
db.open();
|
db.open();
|
||||||
@@ -4617,12 +4601,19 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
|
|||||||
} else {
|
} else {
|
||||||
db.open();
|
db.open();
|
||||||
int product_count = db.getPromotiongetProductall(promoMaster.get(x), false, username, visit_date, CounterId);
|
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 > 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.open();
|
||||||
db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date);
|
db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date);
|
||||||
validPromoList.add(promoMaster.get(x));
|
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 {
|
} else {
|
||||||
db.open();
|
db.open();
|
||||||
int product_count = db.getPromotiongetProductall(promoMaster.get(x), false, username, visit_date, CounterId);
|
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 > 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.open();
|
||||||
db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date);
|
db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date);
|
||||||
validPromoList.add(promoMaster.get(x));
|
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 {
|
} else {
|
||||||
db.open();
|
db.open();
|
||||||
int product_count = db.getPromotiongetProductall(promoMaster.get(x), false, username, visit_date, CounterId);
|
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 > 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.open();
|
||||||
db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date);
|
db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date);
|
||||||
validPromoList.add(promoMaster.get(x));
|
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;
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1047,7 +1047,7 @@ public class BAProfileActivity extends AppCompatActivity implements View.OnClick
|
|||||||
round_img_pic.setImageBitmap(bitmp);
|
round_img_pic.setImageBitmap(bitmp);
|
||||||
}
|
}
|
||||||
} else if (!baProfileListData.isEmpty() && baProfileListData.get(0).getProfilePic() != null && !baProfileListData.get(0).getProfilePic().isEmpty()) {
|
} 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 {
|
} else {
|
||||||
bitmp = BitmapFactory.decodeResource(getResources(), R.mipmap.profile_image);
|
bitmp = BitmapFactory.decodeResource(getResources(), R.mipmap.profile_image);
|
||||||
round_img_pic.setImageBitmap(bitmp);
|
round_img_pic.setImageBitmap(bitmp);
|
||||||
|
|||||||
+6
-2
@@ -91,6 +91,10 @@ public class CounterImageActivity extends AppCompatActivity implements
|
|||||||
db = new Lorealba_Database(context);
|
db = new Lorealba_Database(context);
|
||||||
db.open();
|
db.open();
|
||||||
validateuidata();
|
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() {
|
private void getLastLocation() {
|
||||||
@@ -456,11 +460,11 @@ public class CounterImageActivity extends AppCompatActivity implements
|
|||||||
super.onResume();
|
super.onResume();
|
||||||
db.open();
|
db.open();
|
||||||
checkgpsEnableDevice();
|
checkgpsEnableDevice();
|
||||||
if (!db.isBaProfileFilled(counter_id, username, user_type)) {
|
/*if (!db.isBaProfileFilled(counter_id, username, user_type)) {
|
||||||
showAlertProfile(context);
|
showAlertProfile(context);
|
||||||
} else if (db.getSaveServerData(null, username).isEmpty()) {
|
} else if (db.getSaveServerData(null, username).isEmpty()) {
|
||||||
showAlertProfile(context);
|
showAlertProfile(context);
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
|
|
||||||
private void checkgpsEnableDevice() {
|
private void checkgpsEnableDevice() {
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import android.os.Bundle;
|
|||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
import android.text.InputFilter;
|
import android.text.InputFilter;
|
||||||
import android.text.Spanned;
|
import android.text.Spanned;
|
||||||
|
import android.util.Log;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.WindowManager;
|
import android.view.WindowManager;
|
||||||
import android.widget.AdapterView;
|
import android.widget.AdapterView;
|
||||||
@@ -355,9 +356,9 @@ public class TabLoginActivity extends AppCompatActivity implements View.OnClickL
|
|||||||
jsonObject.put("IMEINumber1", "0");
|
jsonObject.put("IMEINumber1", "0");
|
||||||
jsonObject.put("IMEINumber2", "0");
|
jsonObject.put("IMEINumber2", "0");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
String jsonString = jsonObject.toString();
|
String jsonString = jsonObject.toString();
|
||||||
|
// Log.e("loginjson", jsonString);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
OkHttpClient okHttpClient = new OkHttpClient.Builder().readTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).writeTimeout(CommonString.TIMEOUT,
|
OkHttpClient okHttpClient = new OkHttpClient.Builder().readTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).writeTimeout(CommonString.TIMEOUT,
|
||||||
@@ -379,13 +380,20 @@ public class TabLoginActivity extends AppCompatActivity implements View.OnClickL
|
|||||||
if (data != null && data.equalsIgnoreCase(CommonString.KEY_FAILURE)) {
|
if (data != null && data.equalsIgnoreCase(CommonString.KEY_FAILURE)) {
|
||||||
AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.KEY_FAILURE + " Please try again");
|
AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.KEY_FAILURE + " Please try again");
|
||||||
loading.dismiss();
|
loading.dismiss();
|
||||||
} else if (data != null && data.contains("Changed")) {
|
}
|
||||||
|
else if (data != null && data.contains("Changed")) {
|
||||||
loading.dismiss();
|
loading.dismiss();
|
||||||
AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.MESSAGE_CHANGED);
|
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();
|
loading.dismiss();
|
||||||
AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.MESSAGE_LOGIN_NO_DATA);
|
AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.MESSAGE_LOGIN_NO_DATA);
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
JSONObject obj = new JSONObject();
|
JSONObject obj = new JSONObject();
|
||||||
obj.put("Downloadtype", "LoginTime");
|
obj.put("Downloadtype", "LoginTime");
|
||||||
obj.put("Username", userId);
|
obj.put("Username", userId);
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import android.location.LocationManager;
|
|||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
|
import android.util.Log;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.WindowManager;
|
import android.view.WindowManager;
|
||||||
import android.view.inputmethod.InputMethodManager;
|
import android.view.inputmethod.InputMethodManager;
|
||||||
@@ -33,6 +34,7 @@ import androidx.cardview.widget.CardView;
|
|||||||
import androidx.core.app.ActivityCompat;
|
import androidx.core.app.ActivityCompat;
|
||||||
import androidx.core.content.ContextCompat;
|
import androidx.core.content.ContextCompat;
|
||||||
|
|
||||||
|
import com.cpm.lorealbaautomation.dailyactivity.TabLoginActivity;
|
||||||
import com.goodiebag.pinview.Pinview;
|
import com.goodiebag.pinview.Pinview;
|
||||||
import com.google.android.gms.common.api.ResolvableApiException;
|
import com.google.android.gms.common.api.ResolvableApiException;
|
||||||
import com.google.android.gms.location.FusedLocationProviderClient;
|
import com.google.android.gms.location.FusedLocationProviderClient;
|
||||||
@@ -482,7 +484,6 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
|
|||||||
|
|
||||||
private void AttempLogin() {
|
private void AttempLogin() {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
loading = ProgressDialog.show(context, "Processing", "Please wait...", false, false);
|
loading = ProgressDialog.show(context, "Processing", "Please wait...", false, false);
|
||||||
versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
|
versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
|
||||||
JSONObject jsonObject = new JSONObject();
|
JSONObject jsonObject = new JSONObject();
|
||||||
@@ -518,6 +519,7 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
String jsonString = jsonObject.toString();
|
String jsonString = jsonObject.toString();
|
||||||
|
Log.d("pinviewjson",jsonString);
|
||||||
try {
|
try {
|
||||||
final OkHttpClient okHttpClient = new OkHttpClient.Builder().readTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).
|
final OkHttpClient okHttpClient = new OkHttpClient.Builder().readTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).
|
||||||
writeTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).connectTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).build();
|
writeTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).connectTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).build();
|
||||||
@@ -542,7 +544,12 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
|
|||||||
} else if (data_Login.contains("No data")) {
|
} else if (data_Login.contains("No data")) {
|
||||||
loading.dismiss();
|
loading.dismiss();
|
||||||
AlertandMessages.showAlertlogin((Activity) context, CommonString.MESSAGE_LOGIN_NO_DATA);
|
AlertandMessages.showAlertlogin((Activity) context, CommonString.MESSAGE_LOGIN_NO_DATA);
|
||||||
} else if (data_Login.equalsIgnoreCase(CommonString.KEY_FAILURE)) {
|
}
|
||||||
|
else if (data_Login.contains("Lockout")) {
|
||||||
|
loading.dismiss();
|
||||||
|
AlertandMessages.showAlertlogin((Activity) context, CommonString.MESSAGE_LOCKED);
|
||||||
|
}
|
||||||
|
else if (data_Login.equalsIgnoreCase(CommonString.KEY_FAILURE)) {
|
||||||
AlertandMessages.showAlertlogin((Activity) context, CommonString.KEY_FAILURE + " Please try again");
|
AlertandMessages.showAlertlogin((Activity) context, CommonString.KEY_FAILURE + " Please try again");
|
||||||
loading.dismiss();
|
loading.dismiss();
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
+18
-17
@@ -89,7 +89,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
|
|||||||
this.context = context;
|
this.context = context;
|
||||||
this.db = db;
|
this.db = db;
|
||||||
this.pd = pd;
|
this.pd = pd;
|
||||||
preferences = PrefHelper.getPrefs(context);
|
preferences = PrefHelper.getPrefs(context);
|
||||||
editor = preferences.edit();
|
editor = preferences.edit();
|
||||||
date = preferences.getString(CommonString.KEY_DATE, "");
|
date = preferences.getString(CommonString.KEY_DATE, "");
|
||||||
counterId = preferences.getString(CommonString.KEY_COUNTER_ID, "");
|
counterId = preferences.getString(CommonString.KEY_COUNTER_ID, "");
|
||||||
@@ -144,7 +144,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
|
|||||||
} else {
|
} else {
|
||||||
editor.putInt(CommonString.KEY_DOWNLOAD_INDEX, finalJsonIndex[0]);
|
editor.putInt(CommonString.KEY_DOWNLOAD_INDEX, finalJsonIndex[0]);
|
||||||
editor.apply();
|
editor.apply();
|
||||||
Log.d("JSON_DATA",data);
|
Log.d("JSON_DATA", data);
|
||||||
new MyLoader(context, finalKeyName, data).execute();
|
new MyLoader(context, finalKeyName, data).execute();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -336,7 +336,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
|
|||||||
|
|
||||||
case "Mapping_JourneyPlan":
|
case "Mapping_JourneyPlan":
|
||||||
if (!data.contains("No Data")) {
|
if (!data.contains("No Data")) {
|
||||||
Log.d("JSON_DATA",data);
|
Log.d("JSON_DATA", data);
|
||||||
jcpObject = new Gson().fromJson(data, JCPGetterSetter.class);
|
jcpObject = new Gson().fromJson(data, JCPGetterSetter.class);
|
||||||
db.open();
|
db.open();
|
||||||
if (jcpObject != null && !db.insertJCPData(jcpObject)) {
|
if (jcpObject != null && !db.insertJCPData(jcpObject)) {
|
||||||
@@ -425,6 +425,9 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
|
|||||||
pd.dismiss();
|
pd.dismiss();
|
||||||
AlertandMessages.showToastMsg(context, "Master_Posm data not saved");
|
AlertandMessages.showToastMsg(context, "Master_Posm data not saved");
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
db.open();
|
||||||
|
db.delete_table_data("Master_Posm");
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
@@ -438,6 +441,9 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
|
|||||||
pd.dismiss();
|
pd.dismiss();
|
||||||
AlertandMessages.showToastMsg(context, "InwardSales PO Data not saved");
|
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) {
|
} catch (Exception e) {
|
||||||
throw new java.lang.Exception();
|
throw new java.lang.Exception();
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
db.delete_table_data("T_StockSummary");
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
@@ -506,8 +514,6 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
|
|||||||
db.open();
|
db.open();
|
||||||
db.delete_table_data("T_CounterInvoice");
|
db.delete_table_data("T_CounterInvoice");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "Master_NonVisibility":
|
case "Master_NonVisibility":
|
||||||
@@ -526,7 +532,6 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
||||||
case "Master_NonStockReason":
|
case "Master_NonStockReason":
|
||||||
if (!data.contains("No Data")) {
|
if (!data.contains("No Data")) {
|
||||||
masterNonStockReasonObj = new Gson().fromJson(data, MasterNonStockReasonGetterSetter.class);
|
masterNonStockReasonObj = new Gson().fromJson(data, MasterNonStockReasonGetterSetter.class);
|
||||||
@@ -540,7 +545,6 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
|
|||||||
db.delete_table_data("Master_NonStockReason");
|
db.delete_table_data("Master_NonStockReason");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
//jp
|
//jp
|
||||||
case "Master_SkinType":
|
case "Master_SkinType":
|
||||||
@@ -579,6 +583,9 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
|
|||||||
pd.dismiss();
|
pd.dismiss();
|
||||||
AlertandMessages.showToastMsg(context, "Master_Profile not saved");
|
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();
|
throw new java.lang.Exception();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
||||||
case "Master_TermsCondition":
|
case "Master_TermsCondition":
|
||||||
if (!data.contains("No Data")) {
|
if (!data.contains("No Data")) {
|
||||||
termConditionObject = new Gson().fromJson(data, MasterProfileQuestionGetterSetter.class);
|
termConditionObject = new Gson().fromJson(data, MasterProfileQuestionGetterSetter.class);
|
||||||
@@ -834,7 +839,6 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
|
|||||||
db.delete_table_data("Report_Top10Volume");
|
db.delete_table_data("Report_Top10Volume");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "Report_Top10Value":
|
case "Report_Top10Value":
|
||||||
@@ -1600,7 +1604,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
|
|||||||
if (!data.contains("No Data")) {
|
if (!data.contains("No Data")) {
|
||||||
TesterCounter testerCounter = new Gson().fromJson(data, TesterCounter.class);
|
TesterCounter testerCounter = new Gson().fromJson(data, TesterCounter.class);
|
||||||
db.open();
|
db.open();
|
||||||
if (testerCounter != null && testerCounter.getReportTesterCounter()!=null && !db.insertTesterCounter(testerCounter)) {
|
if (testerCounter != null && testerCounter.getReportTesterCounter() != null && !db.insertTesterCounter(testerCounter)) {
|
||||||
pd.dismiss();
|
pd.dismiss();
|
||||||
AlertandMessages.showToastMsg(context, "Report_TesterCounter not saved");
|
AlertandMessages.showToastMsg(context, "Report_TesterCounter not saved");
|
||||||
}
|
}
|
||||||
@@ -1806,7 +1810,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "T_LeaveLedgerSummary":
|
case "T_LeaveLedgerSummary":
|
||||||
if (!data.contains("No Data")) {
|
if (!data.contains("No Data")) {
|
||||||
ResponseResult leaveLedger = new Gson().fromJson(data, ResponseResult.class);
|
ResponseResult leaveLedger = new Gson().fromJson(data, ResponseResult.class);
|
||||||
db.open();
|
db.open();
|
||||||
@@ -1823,7 +1827,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
|
|||||||
|
|
||||||
case "Mapping_AppRestrictedKPI":
|
case "Mapping_AppRestrictedKPI":
|
||||||
if (!data.contains("No Data")) {
|
if (!data.contains("No Data")) {
|
||||||
MasterBAProfileGetterSetter mappingAppRestrictedKPIGetterSetter = new Gson().fromJson(data, MasterBAProfileGetterSetter.class);
|
MasterBAProfileGetterSetter mappingAppRestrictedKPIGetterSetter = new Gson().fromJson(data, MasterBAProfileGetterSetter.class);
|
||||||
db.open();
|
db.open();
|
||||||
if (mappingAppRestrictedKPIGetterSetter != null && !db.insertMappingAppRestrictedKPI(mappingAppRestrictedKPIGetterSetter)) {
|
if (mappingAppRestrictedKPIGetterSetter != null && !db.insertMappingAppRestrictedKPI(mappingAppRestrictedKPIGetterSetter)) {
|
||||||
AlertandMessages.showToastMsg(context, "Mapping_AppRestrictedKPI data not saved");
|
AlertandMessages.showToastMsg(context, "Mapping_AppRestrictedKPI data not saved");
|
||||||
@@ -1963,7 +1967,6 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.fillInStackTrace();
|
e.fillInStackTrace();
|
||||||
}
|
}
|
||||||
@@ -1987,12 +1990,10 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
|
|||||||
int bytes = 0;
|
int bytes = 0;
|
||||||
byte[] buffer = new byte[1024];
|
byte[] buffer = new byte[1024];
|
||||||
int len1 = 0;
|
int len1 = 0;
|
||||||
|
|
||||||
while ((len1 = is1.read(buffer)) != -1) {
|
while ((len1 = is1.read(buffer)) != -1) {
|
||||||
bytes = (bytes + len1);
|
bytes = (bytes + len1);
|
||||||
fos.write(buffer, 0, len1);
|
fos.write(buffer, 0, len1);
|
||||||
}
|
}
|
||||||
|
|
||||||
fos.close();
|
fos.close();
|
||||||
is1.close();
|
is1.close();
|
||||||
}
|
}
|
||||||
@@ -2058,7 +2059,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
|
|||||||
} else {
|
} else {
|
||||||
data_global[0] = data;
|
data_global[0] = data;
|
||||||
if (finalKeyName.equalsIgnoreCase("Table_Structure")) {
|
if (finalKeyName.equalsIgnoreCase("Table_Structure")) {
|
||||||
Log.d("JSON_DATA",data);
|
Log.d("JSON_DATA", data);
|
||||||
editor.putInt(CommonString.KEY_DOWNLOAD_INDEX, finalJsonIndex[0]);
|
editor.putInt(CommonString.KEY_DOWNLOAD_INDEX, finalJsonIndex[0]);
|
||||||
editor.apply();
|
editor.apply();
|
||||||
tableStructureObj = new Gson().fromJson(data, TableStructureGetterSetter.class);
|
tableStructureObj = new Gson().fromJson(data, TableStructureGetterSetter.class);
|
||||||
|
|||||||
@@ -34,6 +34,7 @@
|
|||||||
android:layout_height="@dimen/hieght_180dp"
|
android:layout_height="@dimen/hieght_180dp"
|
||||||
android:layout_centerInParent="true"
|
android:layout_centerInParent="true"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
|
android:visibility="visible"
|
||||||
android:layout_margin="@dimen/custom_margin"
|
android:layout_margin="@dimen/custom_margin"
|
||||||
android:adjustViewBounds="true"
|
android:adjustViewBounds="true"
|
||||||
android:src="@mipmap/profile_image" />
|
android:src="@mipmap/profile_image" />
|
||||||
|
|||||||
@@ -36,6 +36,7 @@
|
|||||||
android:layout_height="@dimen/hieght_130dp"
|
android:layout_height="@dimen/hieght_130dp"
|
||||||
android:layout_centerInParent="true"
|
android:layout_centerInParent="true"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
|
android:visibility="visible"
|
||||||
android:layout_margin="@dimen/custom_margin"
|
android:layout_margin="@dimen/custom_margin"
|
||||||
android:adjustViewBounds="true"
|
android:adjustViewBounds="true"
|
||||||
android:src="@mipmap/profile_image" />
|
android:src="@mipmap/profile_image" />
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
i/debug_dex
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
i/
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
o/debug
|
||||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
@@ -0,0 +1 @@
|
|||||||
|
o/classes
|
||||||
BIN
Binary file not shown.
@@ -0,0 +1 @@
|
|||||||
|
i/
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
i/classes_global-synthetics
|
||||||
+10
@@ -0,0 +1,10 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="com.androidbuts.multispinnerfilter" >
|
||||||
|
|
||||||
|
<uses-sdk android:minSdkVersion="24" />
|
||||||
|
|
||||||
|
<application android:allowBackup="true" >
|
||||||
|
</application>
|
||||||
|
|
||||||
|
</manifest>
|
||||||
+18
@@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"version": 3,
|
||||||
|
"artifactType": {
|
||||||
|
"type": "AAPT_FRIENDLY_MERGED_MANIFESTS",
|
||||||
|
"kind": "Directory"
|
||||||
|
},
|
||||||
|
"applicationId": "com.androidbuts.multispinnerfilter",
|
||||||
|
"variantName": "debug",
|
||||||
|
"elements": [
|
||||||
|
{
|
||||||
|
"type": "SINGLE",
|
||||||
|
"filters": [],
|
||||||
|
"attributes": [],
|
||||||
|
"outputFile": "AndroidManifest.xml"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"elementType": "File"
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
aarFormatVersion=1.0
|
||||||
|
aarMetadataVersion=1.0
|
||||||
|
minCompileSdk=1
|
||||||
|
minCompileSdkExtension=0
|
||||||
|
minAndroidGradlePluginVersion=1.0.0
|
||||||
|
coreLibraryDesugaringEnabled=false
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{}
|
||||||
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,45 @@
|
|||||||
|
int attr hintText 0x0
|
||||||
|
int color ColorPrimary 0x0
|
||||||
|
int color ColorPrimaryDark 0x0
|
||||||
|
int color android_text_color 0x0
|
||||||
|
int color app_topbar_color 0x0
|
||||||
|
int color background_color 0x0
|
||||||
|
int color black 0x0
|
||||||
|
int color blue 0x0
|
||||||
|
int color cyan 0x0
|
||||||
|
int color gray 0x0
|
||||||
|
int color lightBlue 0x0
|
||||||
|
int color list_background 0x0
|
||||||
|
int color list_even 0x0
|
||||||
|
int color list_header 0x0
|
||||||
|
int color list_odd 0x0
|
||||||
|
int color list_selected 0x0
|
||||||
|
int color primary 0x0
|
||||||
|
int color primary_dark 0x0
|
||||||
|
int color primary_pressed 0x0
|
||||||
|
int color red 0x0
|
||||||
|
int color ripple 0x0
|
||||||
|
int color text_color 0x0
|
||||||
|
int color white 0x0
|
||||||
|
int dimen activity_horizontal_margin 0x0
|
||||||
|
int dimen activity_vertical_margin 0x0
|
||||||
|
int id alertCheckbox 0x0
|
||||||
|
int id alertSearchEditText 0x0
|
||||||
|
int id alertSearchListView 0x0
|
||||||
|
int id alertTextView 0x0
|
||||||
|
int id empty 0x0
|
||||||
|
int id listTextViewSpinner 0x0
|
||||||
|
int id searchMultiSpinner 0x0
|
||||||
|
int id simpleMultiSpinner 0x0
|
||||||
|
int layout activity_main 0x0
|
||||||
|
int layout alert_dialog_listview_search 0x0
|
||||||
|
int layout item_listview_multiple 0x0
|
||||||
|
int layout item_listview_single 0x0
|
||||||
|
int layout textview_for_spinner 0x0
|
||||||
|
int string type_to_search 0x0
|
||||||
|
int style DialogWindowTitle 0x0
|
||||||
|
int style MaterialSpinner 0x0
|
||||||
|
int style myDialog 0x0
|
||||||
|
int style myDialogTitle 0x0
|
||||||
|
int[] styleable MultiSpinnerSearch { 0x0 }
|
||||||
|
int styleable MultiSpinnerSearch_hintText 0
|
||||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
+6
@@ -0,0 +1,6 @@
|
|||||||
|
#Mon Sep 08 18:14:48 IST 2025
|
||||||
|
com.androidbuts.multispinnerfilter.library-main-6\:/layout/activity_main.xml=D\:\\LorealBa-LP-July-2025\\library\\build\\intermediates\\packaged_res\\debug\\layout\\activity_main.xml
|
||||||
|
com.androidbuts.multispinnerfilter.library-main-6\:/layout/alert_dialog_listview_search.xml=D\:\\LorealBa-LP-July-2025\\library\\build\\intermediates\\packaged_res\\debug\\layout\\alert_dialog_listview_search.xml
|
||||||
|
com.androidbuts.multispinnerfilter.library-main-6\:/layout/item_listview_single.xml=D\:\\LorealBa-LP-July-2025\\library\\build\\intermediates\\packaged_res\\debug\\layout\\item_listview_single.xml
|
||||||
|
com.androidbuts.multispinnerfilter.library-main-6\:/layout/textview_for_spinner.xml=D\:\\LorealBa-LP-July-2025\\library\\build\\intermediates\\packaged_res\\debug\\layout\\textview_for_spinner.xml
|
||||||
|
com.androidbuts.multispinnerfilter.library-main-6\:/layout/item_listview_multiple.xml=D\:\\LorealBa-LP-July-2025\\library\\build\\intermediates\\packaged_res\\debug\\layout\\item_listview_multiple.xml
|
||||||
+25
@@ -0,0 +1,25 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<style name="DialogWindowTitle">
|
||||||
|
<item name="android:maxLines">1</item>
|
||||||
|
<item name="android:scrollHorizontally">true</item>
|
||||||
|
<item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
|
||||||
|
</style>
|
||||||
|
<style name="MaterialSpinner" parent="Material.Widget.Spinner">
|
||||||
|
<item name="rd_style">@style/Material.Drawable.Ripple.Wave.Light</item>
|
||||||
|
<item name="spn_labelEnable">true</item>
|
||||||
|
<item name="spn_labelTextSize">18sp</item>
|
||||||
|
<item name="spn_arrowSwitchMode">true</item>
|
||||||
|
<item name="spn_arrowAnimDuration">@android:integer/config_shortAnimTime</item>
|
||||||
|
<item name="spn_arrowInterpolator">@android:anim/decelerate_interpolator</item>
|
||||||
|
</style>
|
||||||
|
<style name="myDialog" parent="@android:style/Theme.Holo.Light.Dialog">
|
||||||
|
<item name="android:windowTitleStyle">@style/myDialogTitle</item>
|
||||||
|
</style>
|
||||||
|
<style name="myDialogTitle" parent="@android:style/TextAppearance.DialogWindowTitle">
|
||||||
|
<item name="android:gravity">center_horizontal</item>
|
||||||
|
</style>
|
||||||
|
<declare-styleable name="MultiSpinnerSearch">
|
||||||
|
<attr format="string" name="hintText"/>
|
||||||
|
</declare-styleable>
|
||||||
|
</resources>
|
||||||
+47
@@ -0,0 +1,47 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<color name="ColorPrimary">#29CA97</color>
|
||||||
|
<color name="ColorPrimaryDark">#06ACE4</color>
|
||||||
|
<color name="android_text_color">#747474</color>
|
||||||
|
<color name="app_topbar_color">#AAAAAA</color>
|
||||||
|
<color name="background_color">#E1E2E2</color>
|
||||||
|
<color name="black">#000000</color>
|
||||||
|
<color name="blue">#1589FF</color>
|
||||||
|
<color name="cyan">#00FFFF</color>
|
||||||
|
<color name="gray">#D1D0CE</color>
|
||||||
|
<color name="lightBlue">#ADD8E6</color>
|
||||||
|
<color name="list_background">#06ACE4</color>
|
||||||
|
<color name="list_even">#AAAAAA</color>
|
||||||
|
<color name="list_header">#99979C</color>
|
||||||
|
<color name="list_odd">#E1E2E2</color>
|
||||||
|
<color name="list_selected">#455FB6</color>
|
||||||
|
<color name="primary">#3f51b5</color>
|
||||||
|
<color name="primary_dark">#303f9f</color>
|
||||||
|
<color name="primary_pressed">#E1E2E2</color>
|
||||||
|
<color name="red">#FF0000</color>
|
||||||
|
<color name="ripple">#F06292</color>
|
||||||
|
<color name="text_color">#686868</color>
|
||||||
|
<color name="white">#FFFFFF</color>
|
||||||
|
<dimen name="activity_horizontal_margin">16dp</dimen>
|
||||||
|
<dimen name="activity_vertical_margin">16dp</dimen>
|
||||||
|
<string name="type_to_search">Type to Search</string>
|
||||||
|
<style name="DialogWindowTitle">
|
||||||
|
<item name="android:maxLines">1</item>
|
||||||
|
<item name="android:scrollHorizontally">true</item>
|
||||||
|
<item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
|
||||||
|
</style>
|
||||||
|
<style name="MaterialSpinner" parent="Widget.AppCompat.Spinner">
|
||||||
|
<item name="rd_style">@style/Material.Drawable.Ripple.Wave.Light</item>
|
||||||
|
<item name="spn_labelEnable">true</item>
|
||||||
|
<item name="spn_labelTextSize">18sp</item>
|
||||||
|
<item name="spn_arrowSwitchMode">true</item>
|
||||||
|
<item name="spn_arrowAnimDuration">@android:integer/config_shortAnimTime</item>
|
||||||
|
<item name="spn_arrowInterpolator">@android:anim/decelerate_interpolator</item>
|
||||||
|
</style>
|
||||||
|
<style name="myDialog" parent="@android:style/Theme.Holo.Light.Dialog">
|
||||||
|
<item name="android:windowTitleStyle">@style/myDialogTitle</item>
|
||||||
|
</style>
|
||||||
|
<style name="myDialogTitle" parent="@android:style/TextAppearance.DialogWindowTitle">
|
||||||
|
<item name="android:gravity">center_horizontal</item>
|
||||||
|
</style>
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-LP-July-2025\library\src\main\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-LP-July-2025\library\src\main\res"><file name="activity_main" path="D:\LorealBa-LP-July-2025\library\src\main\res\layout\activity_main.xml" qualifiers="" type="layout"/><file name="alert_dialog_listview_search" path="D:\LorealBa-LP-July-2025\library\src\main\res\layout\alert_dialog_listview_search.xml" qualifiers="" type="layout"/><file name="item_listview_multiple" path="D:\LorealBa-LP-July-2025\library\src\main\res\layout\item_listview_multiple.xml" qualifiers="" type="layout"/><file name="item_listview_single" path="D:\LorealBa-LP-July-2025\library\src\main\res\layout\item_listview_single.xml" qualifiers="" type="layout"/><file name="textview_for_spinner" path="D:\LorealBa-LP-July-2025\library\src\main\res\layout\textview_for_spinner.xml" qualifiers="" type="layout"/><file path="D:\LorealBa-LP-July-2025\library\src\main\res\values\colors.xml" qualifiers=""><color name="ColorPrimary">#29CA97</color><color name="ColorPrimaryDark">#06ACE4</color><color name="list_background">#06ACE4</color><color name="blue">#1589FF</color><color name="white">#FFFFFF</color><color name="black">#000000</color><color name="gray">#D1D0CE</color><color name="background_color">#E1E2E2</color><color name="primary">#3f51b5</color><color name="primary_pressed">#E1E2E2</color><color name="primary_dark">#303f9f</color><color name="ripple">#F06292</color><color name="red">#FF0000</color><color name="cyan">#00FFFF</color><color name="lightBlue">#ADD8E6</color><color name="text_color">#686868</color><color name="android_text_color">#747474</color><color name="app_topbar_color">#AAAAAA</color><color name="list_even">#AAAAAA</color><color name="list_odd">#E1E2E2</color><color name="list_selected">#455FB6</color><color name="list_header">#99979C</color></file><file path="D:\LorealBa-LP-July-2025\library\src\main\res\values\dimens.xml" qualifiers=""><dimen name="activity_horizontal_margin">16dp</dimen><dimen name="activity_vertical_margin">16dp</dimen></file><file path="D:\LorealBa-LP-July-2025\library\src\main\res\values\strings.xml" qualifiers=""><string name="type_to_search">Type to Search</string></file><file path="D:\LorealBa-LP-July-2025\library\src\main\res\values\styles.xml" qualifiers=""><style name="MaterialSpinner" parent="Widget.AppCompat.Spinner">
|
||||||
|
<item name="rd_style">@style/Material.Drawable.Ripple.Wave.Light</item>
|
||||||
|
<item name="spn_labelEnable">true</item>
|
||||||
|
<item name="spn_labelTextSize">18sp</item>
|
||||||
|
<item name="spn_arrowSwitchMode">true</item>
|
||||||
|
<item name="spn_arrowAnimDuration">@android:integer/config_shortAnimTime</item>
|
||||||
|
<item name="spn_arrowInterpolator">@android:anim/decelerate_interpolator</item>
|
||||||
|
</style><style name="myDialog" parent="@android:style/Theme.Holo.Light.Dialog">
|
||||||
|
<item name="android:windowTitleStyle">@style/myDialogTitle</item>
|
||||||
|
</style><style name="myDialogTitle" parent="@android:style/TextAppearance.DialogWindowTitle">
|
||||||
|
<item name="android:gravity">center_horizontal</item>
|
||||||
|
</style><style name="DialogWindowTitle">
|
||||||
|
<item name="android:maxLines">1</item>
|
||||||
|
<item name="android:scrollHorizontally">true</item>
|
||||||
|
<item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
|
||||||
|
</style></file><file path="D:\LorealBa-LP-July-2025\library\src\main\res\values-v21\attrs.xml" qualifiers="v21"><declare-styleable name="MultiSpinnerSearch">
|
||||||
|
<attr format="string" name="hintText"/>
|
||||||
|
</declare-styleable></file><file path="D:\LorealBa-LP-July-2025\library\src\main\res\values-v21\styles.xml" qualifiers="v21"><style name="MaterialSpinner" parent="Material.Widget.Spinner">
|
||||||
|
<item name="rd_style">@style/Material.Drawable.Ripple.Wave.Light</item>
|
||||||
|
<item name="spn_labelEnable">true</item>
|
||||||
|
<item name="spn_labelTextSize">18sp</item>
|
||||||
|
<item name="spn_arrowSwitchMode">true</item>
|
||||||
|
<item name="spn_arrowAnimDuration">@android:integer/config_shortAnimTime</item>
|
||||||
|
<item name="spn_arrowInterpolator">@android:anim/decelerate_interpolator</item>
|
||||||
|
</style><style name="myDialog" parent="@android:style/Theme.Holo.Light.Dialog">
|
||||||
|
<item name="android:windowTitleStyle">@style/myDialogTitle</item>
|
||||||
|
</style><style name="myDialogTitle" parent="@android:style/TextAppearance.DialogWindowTitle">
|
||||||
|
<item name="android:gravity">center_horizontal</item>
|
||||||
|
</style><style name="DialogWindowTitle">
|
||||||
|
<item name="android:maxLines">1</item>
|
||||||
|
<item name="android:scrollHorizontally">true</item>
|
||||||
|
<item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
|
||||||
|
</style></file></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-LP-July-2025\library\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-LP-July-2025\library\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-LP-July-2025\library\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-LP-July-2025\library\build\generated\res\resValues\debug"/></dataSet><mergedItems/></merger>
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-LP-July-2025\library\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-LP-July-2025\library\src\debug\jniLibs"/></dataSet></merger>
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-LP-July-2025\library\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-LP-July-2025\library\src\debug\shaders"/></dataSet></merger>
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-LP-July-2025\library\src\main\assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-LP-July-2025\library\src\debug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-LP-July-2025\library\build\intermediates\shader_assets\debug\out"/></dataSet></merger>
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
#Wed Aug 06 13:23:11 IST 2025
|
#Thu Aug 28 15:55:24 IST 2025
|
||||||
com.androidbuts.multispinnerfilter.library-main-5\:/layout/textview_for_spinner.xml=D\:\\LorealBa-LP-July-2025\\library\\build\\intermediates\\packaged_res\\release\\layout\\textview_for_spinner.xml
|
com.androidbuts.multispinnerfilter.library-main-5\:/layout/textview_for_spinner.xml=D\:\\LorealBa-LP-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-LP-July-2025\\library\\build\\intermediates\\packaged_res\\release\\layout\\activity_main.xml
|
com.androidbuts.multispinnerfilter.library-main-5\:/layout/activity_main.xml=D\:\\LorealBa-LP-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-LP-July-2025\\library\\build\\intermediates\\packaged_res\\release\\layout\\alert_dialog_listview_search.xml
|
com.androidbuts.multispinnerfilter.library-main-5\:/layout/alert_dialog_listview_search.xml=D\:\\LorealBa-LP-July-2025\\library\\build\\intermediates\\packaged_res\\release\\layout\\alert_dialog_listview_search.xml
|
||||||
|
|||||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
+1
-1
@@ -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 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-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"/>
|
<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>
|
</com.google.android.material>
|
||||||
|
|||||||
+2
@@ -130,6 +130,7 @@
|
|||||||
<androidx.test.janktesthelper/>
|
<androidx.test.janktesthelper/>
|
||||||
<androidx.test.services/>
|
<androidx.test.services/>
|
||||||
<androidx.test.uiautomator/>
|
<androidx.test.uiautomator/>
|
||||||
|
<androidx.text/>
|
||||||
<androidx.textclassifier/>
|
<androidx.textclassifier/>
|
||||||
<androidx.tracing/>
|
<androidx.tracing/>
|
||||||
<androidx.transition/>
|
<androidx.transition/>
|
||||||
@@ -244,6 +245,7 @@
|
|||||||
<com.google.android.flexbox/>
|
<com.google.android.flexbox/>
|
||||||
<com.google.android.games/>
|
<com.google.android.games/>
|
||||||
<com.google.android.gms/>
|
<com.google.android.gms/>
|
||||||
|
<com.google.android.gms.oss-licenses-plugin/>
|
||||||
<com.google.android.gms.strict-version-matcher-plugin/>
|
<com.google.android.gms.strict-version-matcher-plugin/>
|
||||||
<com.google.android.instantapps/>
|
<com.google.android.instantapps/>
|
||||||
<com.google.android.instantapps.thirdpartycompat/>
|
<com.google.android.instantapps.thirdpartycompat/>
|
||||||
|
|||||||
Binary file not shown.
@@ -0,0 +1,46 @@
|
|||||||
|
R_DEF: Internal format may change without notice
|
||||||
|
local
|
||||||
|
attr? hintText
|
||||||
|
color ColorPrimary
|
||||||
|
color ColorPrimaryDark
|
||||||
|
color android_text_color
|
||||||
|
color app_topbar_color
|
||||||
|
color background_color
|
||||||
|
color black
|
||||||
|
color blue
|
||||||
|
color cyan
|
||||||
|
color gray
|
||||||
|
color lightBlue
|
||||||
|
color list_background
|
||||||
|
color list_even
|
||||||
|
color list_header
|
||||||
|
color list_odd
|
||||||
|
color list_selected
|
||||||
|
color primary
|
||||||
|
color primary_dark
|
||||||
|
color primary_pressed
|
||||||
|
color red
|
||||||
|
color ripple
|
||||||
|
color text_color
|
||||||
|
color white
|
||||||
|
dimen activity_horizontal_margin
|
||||||
|
dimen activity_vertical_margin
|
||||||
|
id alertCheckbox
|
||||||
|
id alertSearchEditText
|
||||||
|
id alertSearchListView
|
||||||
|
id alertTextView
|
||||||
|
id empty
|
||||||
|
id listTextViewSpinner
|
||||||
|
id searchMultiSpinner
|
||||||
|
id simpleMultiSpinner
|
||||||
|
layout activity_main
|
||||||
|
layout alert_dialog_listview_search
|
||||||
|
layout item_listview_multiple
|
||||||
|
layout item_listview_single
|
||||||
|
layout textview_for_spinner
|
||||||
|
string type_to_search
|
||||||
|
style DialogWindowTitle
|
||||||
|
style MaterialSpinner
|
||||||
|
style myDialog
|
||||||
|
style myDialogTitle
|
||||||
|
styleable MultiSpinnerSearch hintText
|
||||||
+12
@@ -0,0 +1,12 @@
|
|||||||
|
1<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
3 package="com.androidbuts.multispinnerfilter" >
|
||||||
|
4
|
||||||
|
5 <uses-sdk android:minSdkVersion="24" />
|
||||||
|
6
|
||||||
|
7 <application android:allowBackup="true" >
|
||||||
|
7-->D:\LorealBa-LP-July-2025\library\src\main\AndroidManifest.xml:5:5-7:19
|
||||||
|
7-->D:\LorealBa-LP-July-2025\library\src\main\AndroidManifest.xml:5:18-44
|
||||||
|
8 </application>
|
||||||
|
9
|
||||||
|
10</manifest>
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="com.androidbuts.multispinnerfilter" >
|
||||||
|
|
||||||
|
<uses-sdk android:minSdkVersion="24" />
|
||||||
|
|
||||||
|
<application android:allowBackup="true" >
|
||||||
|
</application>
|
||||||
|
|
||||||
|
</manifest>
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
[]
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user