diff --git a/.idea/misc.xml b/.idea/misc.xml index 976cf21..31e5cb0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/app/build.gradle b/app/build.gradle index 9cdf445..cd355ca 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,7 +34,7 @@ android { buildTypes { release { buildConfigField "boolean", "LOG_ENABLED", "true" - debuggable false + debuggable true minifyEnabled true shrinkResources true signingConfig signingConfigs.config diff --git a/app/lba_src.zip b/app/lba_src.zip new file mode 100644 index 0000000..5a5bbf8 Binary files /dev/null and b/app/lba_src.zip differ diff --git a/app/release/LorealBa-LP-FixGeotag-release.apk b/app/release/LorealBa-LP-280825-release.apk similarity index 83% rename from app/release/LorealBa-LP-FixGeotag-release.apk rename to app/release/LorealBa-LP-280825-release.apk index e4d496f..47839e9 100644 Binary files a/app/release/LorealBa-LP-FixGeotag-release.apk and b/app/release/LorealBa-LP-280825-release.apk differ diff --git a/app/src/main/java/com/cpm/lorealbaautomation/Database/Lorealba_Database.java b/app/src/main/java/com/cpm/lorealbaautomation/Database/Lorealba_Database.java index 304fd05..2235a7c 100644 --- a/app/src/main/java/com/cpm/lorealbaautomation/Database/Lorealba_Database.java +++ b/app/src/main/java/com/cpm/lorealbaautomation/Database/Lorealba_Database.java @@ -294,11 +294,15 @@ public class Lorealba_Database extends SQLiteOpenHelper { } } + private void isOpenDb(){ + try { + if (!db.isOpen()) open(); + + }catch (Exception e){e.printStackTrace();} + } public void deleteNotificationTableafterOneWeek() { try { - if (!db.isOpen()) { - open(); - } + isOpenDb(); db.delete(CommonString.TABLE_NOTIFICATION_USER, null, null); db.delete(CommonString.TABLE_NOTIFICATION_DATA, null, null); @@ -313,9 +317,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { public int createtable(String sqltext) { try { - if (!db.isOpen()) { - open(); - } + isOpenDb(); db.execSQL(sqltext); return 1; } catch (Exception ex) { @@ -374,10 +376,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put("GeoFencingRadius", jcpList.get(i).getGeoFencingRadius()); values.put("GeoFencingAllow", jcpList.get(i).getGeoFencingAllow()); values.put("Checkout", jcpList.get(i).getCheckout()); - - if (!db.isOpen()) { - open(); - } + isOpenDb(); long id = db.insert("Mapping_JourneyPlan", null, values); if (id == -1) { throw new Exception(); @@ -464,13 +463,12 @@ public class Lorealba_Database extends SQLiteOpenHelper { public long delete_table_data(String table_name) { long l = 0; try { - if (!db.isOpen()) { - open(); - } + isOpenDb(); l = db.delete(table_name, null, null); } catch (Exception e) { e.fillInStackTrace(); } + return l; } @@ -508,9 +506,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put("ProductType", productMaster.getProductType().trim()); values.put("VisitDate", productMaster.getVisit_date()); - if (!db.isOpen()) { - open(); - } + isOpenDb(); long id = db.insert("Product_Master", null, values); if (id == -1) { throw new Exception(); @@ -544,10 +540,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { for (int i = 0; i < productList.size(); i++) { values.put("CounterId", productList.get(i).getCounterId()); values.put("PosmId", productList.get(i).getPosmId()); - - if (!db.isOpen()) { - open(); - } + isOpenDb(); long id = db.insert("Mapping_Visibility", null, values); if (id == -1) { throw new Exception(); @@ -579,7 +572,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put("PosmId", productList.get(i).getPosmId()); values.put("PosmTypeId", productList.get(i).getPosmTypeId()); values.put("RefImage", productList.get(i).getRefImage()); - long id = db.insert("Master_Posm", null, values); if (id == -1) { throw new Exception(); @@ -633,7 +625,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { sb.setEanCode(dbcursor.getString(dbcursor.getColumnIndexOrThrow("EanCode"))); sb.setMrp(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("Mrp"))); sb.setProductType(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ProductType"))); - list.add(sb); dbcursor.moveToNext(); } @@ -732,15 +723,12 @@ public class Lorealba_Database extends SQLiteOpenHelper { sb.setGeoFencingRadius(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("GeoFencingRadius"))); sb.setGeoFencingAllow(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("GeoFencingAllow"))); sb.setCheckout(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Checkout"))); - - list.add(sb); dbcursor.moveToNext(); } dbcursor.close(); return list; } - } catch (Exception e) { ////////test("Exception get JCP!", e.toString()); return list; @@ -803,11 +791,9 @@ public class Lorealba_Database extends SQLiteOpenHelper { list.add(sale); dbcursor.moveToNext(); } - dbcursor.close(); return list; } - } catch (Exception e) { ////////test("Exception Brands", e.toString()); return list; @@ -823,7 +809,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { try { if (promoId.isEmpty()) { dbcursor = db.rawQuery("SELECT Distinct t1.DISCOUNT as DISCOUNT ,t1.RECCEPT_COUNT as RECCEPT_COUNT,t1.PROMO_TYPE as" + " PROMO_TYPE,t1.PROMOTION_FLAG as PROMOTION_FLAG" + ",t1.PROMOTION as PROMOTION,t1.PROMOTION_ID as PROMOTION_ID," + "t1.PRODUCT_ID as PRODUCT_ID,t1.PRODUCT as PRODUCT,t1.EAN_CODE as EAN_CODE,t1.PRODUCT_QTY as PRODUCT_QTY," + "t1.MRP as MRP FROM DR_PROMOAPPLYED_PRODUCT t1 inner join SALE_TRACKING_HEADER_TABLE t2 on t2.RECCEPT_COUNT=t1.RECCEPT_COUNT" + " where t2.CONTACT_NUMBER='" + mobile_no + "' and t1.Visit_Date ='" + visite_date + "' and t1.RECCEPT_COUNT=" + reciept_count + " and t1.COUNTER_ID =" + counterId + " and t2.USER_ID ='" + user_Id + "' And t1.PROMOTION_FLAG = 1", null); - } else { dbcursor = db.rawQuery("SELECT Distinct t1.DISCOUNT as DISCOUNT, t1.RECCEPT_COUNT as RECCEPT_COUNT,t1.PROMO_TYPE as" + " PROMO_TYPE,t1.PROMOTION_FLAG as PROMOTION_FLAG" + ",t1.PROMOTION as PROMOTION,t1.PROMOTION_ID as PROMOTION_ID," + "t1.PRODUCT_ID as PRODUCT_ID,t1.PRODUCT as PRODUCT,t1.EAN_CODE as EAN_CODE,t1.PRODUCT_QTY as PRODUCT_QTY," + "t1.MRP as MRP FROM DR_PROMOAPPLYED_PRODUCT t1 inner join SALE_TRACKING_HEADER_TABLE t2 on t2.RECCEPT_COUNT=t1.RECCEPT_COUNT" + " where t2.CONTACT_NUMBER='" + mobile_no + "' and t1.Visit_Date ='" + visite_date + "' and t1.RECCEPT_COUNT=" + reciept_count + " AND t1.PROMOTION_ID =" + promoId + " AND t1.COUNTER_ID =" + counterId + " and t2.USER_ID ='" + user_Id + "' And t1.PROMOTION_FLAG = 1", null); @@ -1053,7 +1038,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put("StoreId", data.get(i).getStoreId()); values.put("UOM", data.get(i).getUOM()); values.put("ProductName", data.get(i).getProductName()); - + isOpenDb(); long id = db.insert("InwardSales_PO", null, values); if (id == -1) { throw new Exception(); @@ -1158,7 +1143,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { try { if (userId == null) { dbcursor = db.rawQuery("select count(RECCEPT_COUNT) as TotalCustomer, sum(TOTAL_AMOUNT) as TOTAL_AMOUNT from " + "(select m.RECCEPT_COUNT as RECCEPT_COUNT, m.BUYER_NAME as BUYER_NAME, m.CONTACT_NUMBER as CONTACT_NUMBER, IFNULL(sum(t.QUANTITY*t.PRODUCT_RATE),0) " + "AS TOTAL_AMOUNT from SALE_TRACKING_HEADER_TABLE m LEFT join SALE_TRACKING_TABLE t on m.RECCEPT_COUNT = t.RECCEPT_COUNT " + "WHERE M.Visit_Date ='" + visit_date + "' and M.COUNTER_ID=" + counterId + " and m.POS_SALE_FLAG='1'" + " And m." + CommonString.KEY_USER_TYPE + " ='" + userType + "'" + " GROUP BY m.RECCEPT_COUNT, m.BUYER_NAME, m.CONTACT_NUMBER, m.POS_SALE_FLAG) as t", null); - } else { dbcursor = db.rawQuery("select count(RECCEPT_COUNT) as TotalCustomer, sum(TOTAL_AMOUNT) as TOTAL_AMOUNT from " + "(select m.RECCEPT_COUNT as RECCEPT_COUNT, m.BUYER_NAME as BUYER_NAME, m.CONTACT_NUMBER as CONTACT_NUMBER, IFNULL(sum(t.QUANTITY*t.PRODUCT_RATE),0) " + "AS TOTAL_AMOUNT from SALE_TRACKING_HEADER_TABLE m LEFT join SALE_TRACKING_TABLE t on m.RECCEPT_COUNT = t.RECCEPT_COUNT " + "WHERE M.Visit_Date ='" + visit_date + "' and M.COUNTER_ID=" + counterId + " and M.USER_ID='" + userId + "' and m.POS_SALE_FLAG='1'" + " And m." + CommonString.KEY_USER_TYPE + " ='" + userType + "'" + " GROUP BY m.RECCEPT_COUNT, m.BUYER_NAME, m.CONTACT_NUMBER, m.POS_SALE_FLAG) as t", null); } @@ -1186,7 +1170,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { try { if (userId == null) { dbcursor = db.rawQuery(" select sum (ifnull (DISCOUNT,0)) as DISCOUNT from (" + " select Ifnull (sum(t.PRODUCT),0) AS DISCOUNT from SALE_TRACKING_HEADER_TABLE m LEFT join SALE_TRACKING_TABLE t on" + " m.RECCEPT_COUNT = t.RECCEPT_COUNT " + " WHERE m.Visit_Date ='" + visit_date + "'and m.COUNTER_ID=" + counterId + " And m." + CommonString.KEY_USER_TYPE + " ='" + userType + "'" + " and m.POS_SALE_FLAG='1'and t.PRODUCT_ID =0 AND" + " (t.PROMO_TYPE='OffWorth' OR t.PROMO_TYPE='Worth' OR t.PROMO_TYPE='OffAdditionalProduct' OR t.PROMO_TYPE='ValueOffAdditionalProduct' OR t.PROMO_TYPE='OffSameProduct' OR t.PROMO_TYPE='WorthWithProduct')" + " GROUP BY m.RECCEPT_COUNT, m.BUYER_NAME, m.CONTACT_NUMBER " + "union all select Ifnull (sum(t.SKU_TYPE),0) AS DISCOUNT from SALE_TRACKING_HEADER_TABLE m LEFT join SALE_TRACKING_TABLE t" + " on m.RECCEPT_COUNT = t.RECCEPT_COUNT " + " WHERE m.Visit_Date ='" + visit_date + "'and m.COUNTER_ID=" + counterId + " And m." + CommonString.KEY_USER_TYPE + " ='" + userType + "'" + " and m.POS_SALE_FLAG='1' AND" + " (t.PROMO_TYPE='OffWorth' OR t.PROMO_TYPE='Worth' OR t.PROMO_TYPE='OffAdditionalProduct' OR t.PROMO_TYPE='ValueOffAdditionalProduct' OR t.PROMO_TYPE='OffSameProduct' OR t.PROMO_TYPE='WorthWithProduct')" + " GROUP BY m.RECCEPT_COUNT, m.BUYER_NAME, m.CONTACT_NUMBER)", null); - } else { dbcursor = db.rawQuery(" select sum (ifnull (DISCOUNT,0)) as DISCOUNT from (" + " select Ifnull (sum(t.PRODUCT),0) AS DISCOUNT from SALE_TRACKING_HEADER_TABLE m LEFT join SALE_TRACKING_TABLE t" + " on m.RECCEPT_COUNT = t.RECCEPT_COUNT " + " WHERE m.Visit_Date ='" + visit_date + "'and m.COUNTER_ID=" + counterId + " And m." + CommonString.KEY_USER_TYPE + " ='" + userType + "'" + " and m.POS_SALE_FLAG='1' and " + "t.PRODUCT_ID =0 AND (t.PROMO_TYPE='OffWorth' OR t.PROMO_TYPE='OffAdditionalProduct' OR t.PROMO_TYPE='ValueOffAdditionalProduct' OR t.PROMO_TYPE='Worth' OR t.PROMO_TYPE='OffSameProduct' OR t.PROMO_TYPE='WorthWithProduct') and m.USER_ID='" + userId + "'GROUP BY m.RECCEPT_COUNT, m.BUYER_NAME, m.CONTACT_NUMBER " + "union all select Ifnull (sum(t.SKU_TYPE),0) AS DISCOUNT from SALE_TRACKING_HEADER_TABLE m LEFT join SALE_TRACKING_TABLE t" + " on m.RECCEPT_COUNT = t.RECCEPT_COUNT " + " WHERE m.Visit_Date ='" + visit_date + "' and m.COUNTER_ID=" + counterId + " And m." + CommonString.KEY_USER_TYPE + " ='" + userType + "'" + " and m.POS_SALE_FLAG='1' AND" + " (t.PROMO_TYPE='OffWorth' OR t.PROMO_TYPE='Worth' OR t.PROMO_TYPE='OffAdditionalProduct' OR t.PROMO_TYPE='ValueOffAdditionalProduct' OR t.PROMO_TYPE='OffSameProduct' OR t.PROMO_TYPE='WorthWithProduct')" + " and m.USER_ID='" + userId + "' GROUP BY m.RECCEPT_COUNT, m.BUYER_NAME, m.CONTACT_NUMBER)", null); @@ -1461,9 +1444,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put(CommonString.KEY_VISIT_DATE, visit_date); values.put(CommonString.KEY_IMAGE, ""); values.put(CommonString.KEY_USER_Checkout, "0"); - if (!db.isOpen()) { - open(); - } + isOpenDb(); l = db.update("User_login", values, "USER_ID='" + userId + "'", null); } catch (Exception e) { @@ -1480,9 +1461,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put(CommonString.KEY_VISIT_DATE, visit_date); values.put(CommonString.KEY_USER_LOGINTIME, loginTym); values.put(CommonString.KEY_USER_Checkout, "0"); - if (!db.isOpen()) { - open(); - } + isOpenDb(); l = db.update("User_login", values, "USER_ID='" + userId + "'", null); } catch (Exception e) { e.fillInStackTrace(); @@ -1600,10 +1579,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { if (completeFlag && stock == -1) { stock = 0; } - - if (!db.isOpen()) { - open(); - } + isOpenDb(); // getting product details from TStockSummary Table boolean stockFlag = isTStockSummaryProductFilled(data.get(save_listDataHeader.get(i)).get(j).getProductId()); if (stockFlag) { @@ -1675,20 +1651,14 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put("NuanceName", save_listDataHeader.get(i).getNuanceName()); long l = db.insert(CommonString.TABLE_INSERT_HEADER_TESTER_DATA, null, values); for (int j = 0; j < data.get(save_listDataHeader.get(i)).size(); j++) { - if (db.isOpen()) { - } else { - open(); - } + isOpenDb(); // getting product details from TStockSummary Table boolean stockFlag = isTStockSummaryProductFilled(data.get(save_listDataHeader.get(i)).get(j).getProductId()); if (stockFlag) { // set stock to product updateTStockData(data.get(save_listDataHeader.get(i)).get(j).getStock(), CommonString.TESTER, data.get(save_listDataHeader.get(i)).get(j).getProductId(), completeFlag, visit_date); } else { - if (db.isOpen()) { - } else { - open(); - } + isOpenDb(); TStockSummary stockObj; stockObj = getStockSummaryStatus(visit_date); if (stockObj != null) { @@ -1753,9 +1723,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { ContentValues values = new ContentValues(); try { db.beginTransaction(); - if (!db.isOpen()) { - open(); - } for (int i = 0; i < save_listDataHeader.size(); i++) { values.put("AxeName", save_listDataHeader.get(i).getSubBrandName()); values.put("BrandName", save_listDataHeader.get(i).getBrandName()); @@ -1767,18 +1734,14 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put("ImagePath", save_listDataHeader.get(i).getImagePath()); long l = db.insert(CommonString.TABLE_INSERT_HEADER_SAMPLE_DATA, null, values); for (int j = 0; j < data.get(save_listDataHeader.get(i)).size(); j++) { - if (!db.isOpen()) { - open(); - } + isOpenDb(); // getting product details from TStockSummary Table boolean stockFlag = isTStockSummaryProductFilled(data.get(save_listDataHeader.get(i)).get(j).getProductId()); if (stockFlag) { // set stock to product updateTStockData(data.get(save_listDataHeader.get(i)).get(j).getStock(), CommonString.SAMPLE, data.get(save_listDataHeader.get(i)).get(j).getProductId(), completeFlag, visit_date); } else { - if (!db.isOpen()) { - open(); - } + isOpenDb(); TStockSummary stockObj; stockObj = getStockSummaryStatus(visit_date); if (stockObj != null) { @@ -1870,10 +1833,8 @@ public class Lorealba_Database extends SQLiteOpenHelper { public void insertSuggestedStockCapturedData(String visit_date, HashMap> data, List save_listDataHeader) { db.delete(CommonString.TABLE_INSERT_HEADER_SUGGESTED_STOCK_DATA, null, null); db.delete(CommonString.TABLE_SUGGESTED_STOCK_CHILD_DATA, null, null); - ContentValues values = new ContentValues(); ContentValues values1 = new ContentValues(); - try { db.beginTransaction(); for (int i = 0; i < save_listDataHeader.size(); i++) { @@ -1894,7 +1855,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { values1.put("STOCK", data.get(save_listDataHeader.get(i)).get(j).getStock()); values1.put("Mrp", data.get(save_listDataHeader.get(i)).get(j).getMrp()); values1.put("STOCK_RECEIVED", data.get(save_listDataHeader.get(i)).get(j).getStock_receive()); - db.insert(CommonString.TABLE_SUGGESTED_STOCK_CHILD_DATA, null, values1); } } @@ -1916,7 +1876,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { dbcursor.moveToFirst(); while (!dbcursor.isAfterLast()) { ProductMaster sb = new ProductMaster(); - sb.setAxeName(dbcursor.getString(dbcursor.getColumnIndexOrThrow("AxeName"))); sb.setSubAxeName(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SubAxeName"))); sb.setBrandName(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BrandName"))); @@ -1954,8 +1913,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { sb.setProductId(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("ProductId"))); sb.setStock(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("STOCK"))); sb.setMrp(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("Mrp"))); - - list.add(sb); dbcursor.moveToNext(); } @@ -1993,9 +1950,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put("ActualQty", data.get(i).getActualQty()); values.put("ReasonId", data.get(i).getReasonId()); values.put("TranId", data.get(i).getTranId()); - - if (!db.isOpen()) open(); - + isOpenDb(); long id = db.insert("T_CounterInvoice", null, values); if (id == -1) { throw new Exception(); @@ -2059,9 +2014,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put("SampleStatus", tStockSummary.getSampleStatus().trim()); values.put("GwpStatus", tStockSummary.getGwpStatus().trim()); values.put("VisitDate", tStockSummary.getVisitDate()); - if (!db.isOpen()) { - open(); - } + isOpenDb(); long l = db.insert("T_StockSummary", null, values); if (l == -1) { throw new Exception(); @@ -2092,17 +2045,13 @@ public class Lorealba_Database extends SQLiteOpenHelper { public long updateLoginData(String userId, String new_password, boolean flag) { long l = 0; try { - if (db.isOpen()) { - } else { - open(); - } ContentValues values = new ContentValues(); if (flag) { values.put(CommonString.KEY_PASSWORD, new_password); } else { values.put(CommonString.KEY_USER_Checkout, "1"); } - + isOpenDb(); l = db.update("User_login", values, "USER_ID='" + userId + "'", null); } catch (Exception e) { e.fillInStackTrace(); @@ -2117,9 +2066,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { try { if (manual_upload) { dbcursor = db.rawQuery("Select distinct pt.UUID_ID as UUID_ID, Pt.Posm as Posm,Pt.PosmId as PosmId,Pt.PosmTypeId as PosmTypeId," + "Pt.RefImage as RefImage,Pt.Resion as Resion,Pt.Resion_id as Resion_id,pt.User_Id as User_Id," + "Pt.VISIBILITY_EXIST as VISIBILITY_EXIST,Pt.VISIBILITY_IMG as VISIBILITY_IMG from VISIBILITY_TABLE Pt Inner Join Master_Posm Pm " + "On Pt.PosmId=Pm.PosmId where Pt.COUNTER_ID='" + counterId + "' and " + CommonString.KEY_UUID + "='" + transId + "'and " + CommonString.KEY_STATUS + " ='N'", null); - } else { - dbcursor = db.rawQuery("Select distinct pt.UUID_ID as UUID_ID, Pt.Posm as Posm,Pt.PosmId as PosmId,Pt.PosmTypeId as PosmTypeId," + "Pt.RefImage as RefImage,Pt.Resion as Resion,Pt.Resion_id as Resion_id,pt.User_Id as User_Id," + "Pt.VISIBILITY_EXIST as VISIBILITY_EXIST,Pt.VISIBILITY_IMG as VISIBILITY_IMG from VISIBILITY_TABLE Pt Inner Join Master_Posm Pm " + "On Pt.PosmId=Pm.PosmId where Pt.COUNTER_ID='" + counterId + "' and " + CommonString.KEY_VISIT_DATE + "='" + visit_date + "'", null); } @@ -2353,6 +2300,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put("GWP_IMAGE", compOffers.get(k).getGwpImage()); String baInfoJson = gson.toJson(compOffers.get(k).getBaTenureDetailList()); values.put("BA_INFO_LIST", baInfoJson); + isOpenDb(); l = db.insert(CommonString.TABLE_COMP_OFFERS, null, values); } closeDb(); @@ -2528,11 +2476,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put("TotalLine", data.get(i).getTotalLine()); values.put("TotalStock", data.get(i).getTotalStock()); values.put("VisitDate", data.get(i).getVisitDate()); - - if (!db.isOpen()) { - open(); - } - + isOpenDb(); long id = db.insert("StockSummary_Check", null, values); if (id == -1) { throw new Exception(); @@ -2649,19 +2593,13 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put("FEEDBACK", makeover_object.getCst_feed_back_value()); values.put("UPLOAD_STATUS", makeover_object.getStr_upload_status()); values.put("TERMCONDITION_FLAG", makeover_object.getStr_termcondition()); - if (makeover_object.isPos_sale_flag()) { values.put("POS_SALE_FLAG", "1"); } else { values.put("POS_SALE_FLAG", "0"); - - } - - if (!db.isOpen()) { - open(); } + isOpenDb(); l = db.update(CommonString.Table_Makeover_Capture, values, CommonString.KEY_COUNTER_ID + "='" + counterId + "' AND " + CommonString.KEY_VISIT_DATE + " ='" + visit_date + "'AND USER_ID='" + user_Id + "'and " + CommonString.KEY_ID + "='" + makeover_object.getReccept_count() + "'", null); - } closeDb(); } catch (Exception e) { @@ -2676,10 +2614,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { public long deleteconsumersale(String visit_date, int reciept_count, String user_id) { long l = 0; try { - if (!db.isOpen()) { - open(); - } - + isOpenDb(); String whereClause = CommonString.KEY_RECCEPT_NUMBER + "='" + reciept_count + "' and " + CommonString.KEY_VISIT_DATE + "='" + visit_date + "'and USER_ID='" + user_id + "'"; l = db.delete(CommonString.Table_Sale_Tracking, whereClause, null); l = db.delete(CommonString.Table_Sale_Tracking_Header_Data, whereClause, null); @@ -2695,15 +2630,13 @@ public class Lorealba_Database extends SQLiteOpenHelper { public long delete_sale(String visit_date, int reciept_count, String user_id) { long l = 0; try { - if (!db.isOpen()) { - open(); - } - + isOpenDb(); l = db.delete(CommonString.Table_Sale_Tracking, CommonString.KEY_RECCEPT_NUMBER + "='" + String.valueOf(reciept_count) + "' and " + CommonString.KEY_VISIT_DATE + "='" + visit_date + "'and USER_ID='" + user_id + "'", null); } catch (Exception e) { e.fillInStackTrace(); } + return l; } @@ -2766,14 +2699,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { dbcursor = db.rawQuery(qury, null); -/* - dbcursor = db.rawQuery("select distinct Pm.ProductName,Pm.ProductId,Pm.EanCode,ci.Qty,Pm.Mrp," + - "ci.InvId,ci.CounterConfirm,ci.InvoiceStatus,ci.ActualQty,ci.ReasonId,ci.TranId from T_CounterInvoice as ci" + - " inner join Product_Master Pm on ci.ProductId = Pm.ProductId " + - " where Pm.SignatureName =\"" + signatureName + "\" AND Pm.BrandName=\"" + brandName + - "\" AND Pm.SubBrandName =\"" + subBrandName + "\" AND Pm.ReferenceName =\"" + referenceName + "\" " + - " AND ci.InvoiceNo='" + invoice_no + "' AND ci.InvoiceType='" + type + "'", null); -*/ if (dbcursor != null) { dbcursor.moveToFirst(); @@ -3176,25 +3101,17 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put("ANSWER", txt); } } - } else { - values.put("ANSWER", data.get(save_listDataHeader.get(i)).get(j).getANSWER()); } - values.put("OTHERS_TVALUE", data.get(save_listDataHeader.get(i)).get(j).getSpin_others_for_edt()); - id = db.insert(CommonString.TABLE_AUDIT_DATA_SAVE, null, values); - } } - closeDb(); } catch (Exception ex) { closeDb(); - ////////test("Database Exception", " while Insert Posm Master Data " + ex.toString()); } - return id; } catch (Exception ex) { return 0; @@ -3745,12 +3662,9 @@ public class Lorealba_Database extends SQLiteOpenHelper { if (data.isEmpty()) { return false; } - db.beginTransaction(); for (int i = 0; i < data.size(); i++) { - values.put("TermsCondition", data.get(i).getTermsCondition()); - long id = db.insert("Master_TermsCondition", null, values); if (id == -1) { throw new Exception(); @@ -3775,9 +3689,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { if (dbcursor != null) { dbcursor.moveToFirst(); while (!dbcursor.isAfterLast()) { - list.setTermsCondition(dbcursor.getString(dbcursor.getColumnIndexOrThrow("TermsCondition"))); - dbcursor.moveToNext(); } dbcursor.close(); @@ -3818,7 +3730,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { sale.setStore_name(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_STORE_NAME))); sale.setStore_address(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORE_ADDRESS"))); list.add(sale); - dbcursor.moveToNext(); } @@ -3844,7 +3755,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { db.beginTransaction(); for (int i = 0; i < data.size(); i++) { values.put("InvoiceType", data.get(i).getInvoiceType().trim()); - long id = db.insert("Master_InvoiceType", null, values); if (id == -1) { throw new Exception(); @@ -3864,7 +3774,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { private long updateInvoiceStatus(String invoiceNo, boolean newproductInward) { long l = 0; try { - if (!db.isOpen()) open(); + isOpenDb(); ContentValues values = new ContentValues(); values.put(CommonString.KEY_INVOICE_STATUS, "1"); l = db.update(CommonString.TABLE_INSERT_INWARD_STOCK_TRANSACTION, values, CommonString.KEY_INVOICE_NUMBER + " ='" + invoiceNo + "' AND " + CommonString.KEY_NEW_PRODUCT + "= " + (newproductInward ? 1 : 0), null); @@ -4023,11 +3933,10 @@ public class Lorealba_Database extends SQLiteOpenHelper { valuesmasterT.put(CommonString.KEY_STOCK_TYPE, CommonString.INWARD_DMS_NEW_SKU); valuesmasterT.put(CommonString.KEY_ENTRY_TYPE, CommonString.KEY_REGULAR); valuesmasterT.put(CommonString.KEY_STATUS, CommonString.KEY_N); - - if (!db.isOpen()) open(); - + isOpenDb(); masterreturn = db.insert(CommonString.TABLE_TRANSACTION_WISE_MASTER_TABLE, null, valuesmasterT); } + for (int i = 0; i < save_listDataHeader.size(); i++) { values = new ContentValues(); values.put("SubBrandName", save_listDataHeader.get(i).getSubBrandName()); @@ -4041,11 +3950,8 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put(CommonString.KEY_INVOICE_NUMBER, invoiceNo); values.put(CommonString.KEY_INVOICE_DATE, invDate); values.put(CommonString.KEY_INVOICE_TYPE, type); - - if (!db.isOpen()) open(); - + isOpenDb(); long l = db.insert(CommonString.TABLE_INSERT_INWARD_STOCK_HEADER_DATA, null, values); - for (int j = 0; j < data.get(save_listDataHeader.get(i)).size(); j++) { values1 = new ContentValues(); values1.put(CommonString.KEY_COMMON_ID, (int) l); @@ -4068,10 +3974,8 @@ public class Lorealba_Database extends SQLiteOpenHelper { values1.put(CommonString.KEY_ACTUAL_QTY, data.get(save_listDataHeader.get(i)).get(j).getActualQty()); values1.put(CommonString.KEY_REASON_ID, data.get(save_listDataHeader.get(i)).get(j).getReasonId()); values1.put(CommonString.KEY_INVOICE_STATUS, save_listDataHeader.get(i).getInvoice_Status()); - transactionList = getInwardStockCheckTransactionData(data.get(save_listDataHeader.get(i)).get(j).getProductId(), data.get(save_listDataHeader.get(i)).get(j).getInvId(), invoiceNo); stockObj = getTStockSummaryProductDetails(data.get(save_listDataHeader.get(i)).get(j).getProductId()); - if (transactionList == null && data.get(save_listDataHeader.get(i)).get(j).isConfirmChecked() && masterreturn > 0 && stockObj == null) { values2 = new ContentValues(); values2.put(CommonString.KEY_MASTER_TRANSACTION_ID, masterreturn); @@ -4090,24 +3994,22 @@ public class Lorealba_Database extends SQLiteOpenHelper { values2.put(CommonString.KEY_MRP, data.get(save_listDataHeader.get(i)).get(j).getMrp()); values2.put(CommonString.KEY_ACTUAL_QTY, data.get(save_listDataHeader.get(i)).get(j).getActualQty()); values2.put(CommonString.KEY_REASON_ID, data.get(save_listDataHeader.get(i)).get(j).getReasonId()); - if (save_listDataHeader.get(i).getInvoice_Status().equals("1")) { values2.put(CommonString.KEY_INVOICE_STATUS, "1"); ///For Update Invoice Status if Confirmed invoice - if (!db.isOpen()) open(); + updateInvoiceStatus(invoiceNo, true); } else { values2.put(CommonString.KEY_INVOICE_STATUS, save_listDataHeader.get(i).getInvoice_Status()); } values2.put(CommonString.KEY_TRANSACTION_ID, transactionId); values2.put(CommonString.KEY_NEW_PRODUCT, 1); - if (!db.isOpen()) open(); + isOpenDb(); stockObj = getStockSummaryStatus(visit_date); if (stockObj != null) { //Insert New Data comming insertTStockSummaryManualData(stockObj, data.get(save_listDataHeader.get(i)).get(j).getProductId(), counter_id, type, data.get(save_listDataHeader.get(i)).get(j).getActualQty()); } - // only for damaged stock int ReasonId = data.get(save_listDataHeader.get(i)).get(j).getReasonId(); if (ReasonId == 2 && type.trim().equalsIgnoreCase("Sellable")) { @@ -4115,14 +4017,14 @@ public class Lorealba_Database extends SQLiteOpenHelper { int damageStockQty = Integer.parseInt(data.get(save_listDataHeader.get(i)).get(j).getActualQty()); updateStockSummaryDamageValue(data.get(save_listDataHeader.get(i)).get(j).getProductId(), damageStockQty, counter_id); } - if (!db.isOpen()) open(); + isOpenDb(); id2 = db.insert(CommonString.TABLE_INSERT_INWARD_STOCK_TRANSACTION, null, values2); if (id2 > 0) { //updated counter invoice Confirm status using Invoice Id updateT_CounterInvoiceConfirmCounter(data.get(save_listDataHeader.get(i)).get(j).getInvId(), data.get(save_listDataHeader.get(i)).get(j).getProductId()); } } - if (!db.isOpen()) open(); + isOpenDb(); id = db.insert(CommonString.TABLE_INSERT_INWARD_STOCK_CHILD_DATA, null, values1); } } @@ -4184,9 +4086,8 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put(CommonString.KEY_INVOICE_DATE, invDate); values.put(CommonString.KEY_INVOICE_TYPE, type); - if (!db.isOpen()) open(); + isOpenDb(); long l = db.insert(CommonString.TABLE_INSERT_INWARD_STOCK_HEADER_DATA, null, values); - if (data.get(save_listDataHeader.get(i)).size() > 0) { for (int j = 0; j < data.get(save_listDataHeader.get(i)).size(); j++) { values1 = new ContentValues(); @@ -4211,7 +4112,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { values1.put(CommonString.KEY_REASON_ID, data.get(save_listDataHeader.get(i)).get(j).getReasonId()); values1.put(CommonString.KEY_INVOICE_STATUS, save_listDataHeader.get(i).getInvoice_Status()); - if (!db.isOpen()) open(); + isOpenDb(); transactionList = getInwardStockCheckTransactionData(data.get(save_listDataHeader.get(i)).get(j).getProductId(), data.get(save_listDataHeader.get(i)).get(j).getInvId(), invoiceNo); stockObj = getTStockSummaryProductDetails(data.get(save_listDataHeader.get(i)).get(j).getProductId()); if (transactionList == null && data.get(save_listDataHeader.get(i)).get(j).isConfirmChecked() && masterreturn > 0 && stockObj != null && stockObj.getProductId() != null) { @@ -4237,7 +4138,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { if (data.get(save_listDataHeader.get(i)).get(j).getReasonId() == 2 && type != null && type.trim().equalsIgnoreCase("Sellable")) { ///change by jp Updated Damage Stock QTY from T_StockSummery int damageStockQty = Integer.parseInt(data.get(save_listDataHeader.get(i)).get(j).getActualQty()); - if (!db.isOpen()) open(); updateStockSummaryDamageValue(data.get(save_listDataHeader.get(i)).get(j).getProductId(), damageStockQty, counter_id); } if (save_listDataHeader.get(i).getInvoice_Status().equals("1")) { @@ -4251,13 +4151,13 @@ public class Lorealba_Database extends SQLiteOpenHelper { values2.put(CommonString.KEY_NEW_PRODUCT, 0); // if stockObj is not null means product exist in stock summary table data then update value in TStockSummary updateStockSummaryData(stockObj, type, data.get(save_listDataHeader.get(i)).get(j).getActualQty(), visit_date); - if (!db.isOpen()) open(); + isOpenDb(); id2 = db.insert(CommonString.TABLE_INSERT_INWARD_STOCK_TRANSACTION, null, values2); if (id2 > 0) { updateT_CounterInvoiceConfirmCounter(data.get(save_listDataHeader.get(i)).get(j).getInvId(), data.get(save_listDataHeader.get(i)).get(j).getProductId()); } } - if (!db.isOpen()) open(); + isOpenDb(); id = db.insert(CommonString.TABLE_INSERT_INWARD_STOCK_CHILD_DATA, null, values1); } } @@ -4371,7 +4271,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put("UPLOAD_STATUS", CommonString.KEY_N); values.put("LeaveType", invoiceList.getStr_leaveType()); values.put("LeaveTypeId", invoiceList.getStr_leaveTypeId()); - l = db.insert(CommonString.Table_Leave_Management, null, values); closeDb(); } catch (Exception ex) { @@ -4394,7 +4293,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { for (int i = 0; i < data.size(); i++) { values.put("BreakId", data.get(i).getBreakId()); values.put("BreakType", data.get(i).getBreakType()); - long id = db.insert("Master_Break", null, values); if (id == -1) { throw new Exception(); @@ -4419,11 +4317,9 @@ public class Lorealba_Database extends SQLiteOpenHelper { if (dbcursor != null) { dbcursor.moveToFirst(); while (!dbcursor.isAfterLast()) { - MasterBreak sb = new MasterBreak(); sb.setBreakId(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("BreakId"))); sb.setBreakType(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BreakType"))); - list.add(sb); dbcursor.moveToNext(); } @@ -4477,7 +4373,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { long l = 0, masterreturn = 0; try { - if (!db.isOpen()) open(); db.beginTransaction(); finalvalues.put(CommonString.KEY_UUID, breakObject.getTransId()); finalvalues.put(CommonString.KEY_USER_ID, user_Id); @@ -4892,13 +4787,10 @@ public class Lorealba_Database extends SQLiteOpenHelper { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; try { - if (previous_date) { dbcursor = db.rawQuery("SELECT * FROM BA_PROFILE_DATA WHERE Visit_Date <>'" + visit_date + "'and " + CommonString.KEY_COUNTER_ID + "=" + counterId + " and STATUS='N'", null); - } else { dbcursor = db.rawQuery("SELECT * FROM BA_PROFILE_DATA WHERE Visit_Date='" + visit_date + "'and " + CommonString.KEY_COUNTER_ID + "=" + counterId + " and STATUS='N'", null); - } if (dbcursor != null) { @@ -4939,9 +4831,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { dbcursor = db.rawQuery("SELECT * FROM COUNTER_PROFILE_DATA WHERE COUNTER_ID ='" + counterId + "' AND Visit_Date='" + visit_date + "'", null); } else { dbcursor = db.rawQuery("SELECT * FROM COUNTER_PROFILE_DATA WHERE User_Id ='" + userId + "' AND Visit_Date='" + visit_date + "'AND COUNTER_ID='" + counterId + "'", null); - } - if (dbcursor != null) { dbcursor.moveToFirst(); while (!dbcursor.isAfterLast()) { @@ -5137,20 +5027,19 @@ public class Lorealba_Database extends SQLiteOpenHelper { } else { values2.put(CommonString.KEY_NEW_PRODUCT, 0); } - if (!db.isOpen()) open(); + isOpenDb(); id = db.insert(CommonString.TABLE_INSERT_MANUAL_INWARD_TRANSACTION, null, values2); - if (id > 0) { - if (!db.isOpen()) open(); + if (id > 0){ + isOpenDb(); TStockSummary stockObj = getTStockSummaryProductDetails(Integer.parseInt(selected_list.get(j).getProduct_Id())); if (stockObj != null) { // if stockObj is not null means product exist in stock summary table data then update value in TStockSummary updateStockSummaryData(stockObj, invoiceType, selected_list.get(j).getActualQty(), visit_date); } else { - if (!db.isOpen()) open(); + isOpenDb(); stockObj = getStockSummaryStatus(visit_date); if (stockObj.getId() != null) { - if (!db.isOpen()) open(); insertTStockSummaryManualData(stockObj, Integer.parseInt(selected_list.get(j).getProduct_Id()), counter_id, invoiceType, selected_list.get(j).getActualQty()); } } @@ -5161,7 +5050,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { } } } - db.setTransactionSuccessful(); db.endTransaction(); if (id > 0) { @@ -5216,30 +5104,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { return list; } - private String getinwardStockTransactionId(String invoiceNo, int product_id) { - Cursor dbcursor = null; - String transId = ""; - try { - dbcursor = db.rawQuery("select * from " + CommonString.TABLE_INSERT_INWARD_STOCK_TRANSACTION + " where " + CommonString.KEY_INVOICE_NUMBER + " = '" + invoiceNo + "' " + "and " + CommonString.KEY_ProductId + " =" + product_id + "", null); - - if (dbcursor != null) { - dbcursor.moveToFirst(); - while (!dbcursor.isAfterLast()) { - ProductMaster sb = new ProductMaster(); - transId = dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_TRANSACTION_ID)); - dbcursor.moveToNext(); - } - dbcursor.close(); - return transId; - } - } catch (Exception e) { - - return transId; - } - - return transId; - } - ///jp_update_getSaleable Stock public ProductMaster getActualSaleableStock(String productId, String coulmn_name, String visit_date, String counterId, String userType) { ProductMaster list = new ProductMaster(); @@ -5248,9 +5112,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { String q2 = userType != null && userType.equalsIgnoreCase(CommonString.TAG_FROM_ME) ? " AND S." + CommonString.KEY_USER_TYPE + "='" + CommonString.TAG_FROM_ME + "'" : " AND S." + CommonString.KEY_USER_TYPE + "!='" + CommonString.TAG_FROM_ME + "' AND S1.POS_SALE_FLAG ='0'"; String additionQueryMe = "", getDataMe = "(s.SaleableBalance - ifnull(dm.DamageQty,0)) as SaleableBalance"; try { - if (!db.isOpen()) { - open(); - } String table = "T_StockSummary", query = ""; if (userType != null && userType.equalsIgnoreCase(CommonString.TAG_FROM_ME)) { getDataMe = "((s.SaleableBalance + ifnull(tempsale.TempSale,0) ) - ifnull(dm.DamageQty,0)) as SaleableBalance"; @@ -5821,9 +5682,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { public long update_SaleTRacking(String counterId, String user_Id, String reciept_count) { long l = 0; try { - if (!db.isOpen()) { - open(); - } + isOpenDb(); ContentValues values = new ContentValues(); values.put("UPLOAD_STATUS", CommonString.KEY_Y); l = db.update(CommonString.Table_Sale_Tracking_Header_Data, values, CommonString.KEY_COUNTER_ID + "='" + counterId + "' AND USER_ID='" + user_Id + "' AND RECCEPT_COUNT='" + reciept_count + "'", null); @@ -5858,10 +5717,8 @@ public class Lorealba_Database extends SQLiteOpenHelper { finalvalues.put(CommonString.KEY_STOCK_TYPE, CommonString.CONSUMERSALE); finalvalues.put(CommonString.KEY_ENTRY_TYPE, CommonString.KEY_REGULAR); finalvalues.put(CommonString.KEY_STATUS, CommonString.KEY_N); - if (!db.isOpen()) open(); - + isOpenDb(); masterreturn = db.insert(CommonString.TABLE_TRANSACTION_WISE_MASTER_TABLE, null, finalvalues); - } for (int i = 0; i < invoiceHeaderList.size(); i++) { @@ -5893,10 +5750,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { } values.put("TERMCONDITION_FLAG", termcondition_str); values.put(CommonString.KEY_USER_TYPE, userType); - if (!db.isOpen()) { - open(); - } - + isOpenDb(); header_return = db.insert(CommonString.Table_Sale_Tracking_Header_Data, null, values); if (invoiceHeaderList.get(i).getProduct_sold_str().trim().equalsIgnoreCase("Yes")) { @@ -5955,16 +5809,12 @@ public class Lorealba_Database extends SQLiteOpenHelper { if (pos_sale_flag && userType != null && !userType.equalsIgnoreCase(CommonString.TAG_FROM_ME)) { InvoiceGetterSetter obj = data.get(invoiceHeaderList.get(i)).get(j); if (!obj.isPromo_flag()) { - if (!db.isOpen()) { - open(); - } + isOpenDb(); update_tstock_summery_using_consumer_sales(counter_Id, obj.getProduct_Id(), obj.getQuantity(), obj.getStr_invoiceType()); } } - if (!db.isOpen()) { - open(); - } values1.put(CommonString.KEY_USER_TYPE, userType); + isOpenDb(); finalreturen = db.insert(CommonString.Table_Sale_Tracking, null, values1); //////for applyied promotion insert if (Objects.requireNonNull(data.get(invoiceHeaderList.get(i))).get(j).isPromo_flag()) { @@ -6397,7 +6247,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put(CommonString.KEY_GWP_IN, gwpIn); values.put(CommonString.KEY_GWP_BALANCE, gwpBalance); } - if (!db.isOpen()) open(); + isOpenDb(); id = db.update(CommonString.T_StockSummary, values, CommonString.KEY_ProductId + "=" + stockObj.getProductId(), null); } catch (Exception ex) { return 0; @@ -6499,15 +6349,12 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put("SampleDamage", 0); values.put("GwpOut", 0); values.put("GwpDamage", 0); - values.put("SaleableStatus", stockObj.getSaleableStatus()); values.put("TesterStatus", stockObj.getTesterStatus()); values.put("SampleStatus", stockObj.getSampleStatus()); values.put("GwpStatus", stockObj.getGwpStatus()); values.put("VisitDate", stockObj.getVisitDate()); - - if (!db.isOpen()) open(); - + isOpenDb(); long id = db.insert("T_StockSummary", null, values); if (id == -1) { throw new Exception(); @@ -8894,7 +8741,16 @@ public class Lorealba_Database extends SQLiteOpenHelper { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; try { - String query = "Select " + column_name + ", sum(SaleableBalance) as StockQty, sum(StockValue) as StockValue from (" + " Select s.ProductId as ProductId, pm." + column_name + " as " + column_name + ", pm.Mrp as Mrp, " + "(ifnull(s.SaleableBalance,0) - ifnull(dm.DamageQty,0)) as SaleableBalance," + " IFNULL(pm.Mrp,0)*(IFNULL(s.SaleableBalance,0) - ifnull(dm.DamageQty,0)) As StockValue from" + " T_StockSummary s inner join Product_Master pm on s.ProductId = pm.ProductId left join (Select CounterId, ProductId," + " sum(DamageQty) as DamageQty from (" + " select T.COUNTER_ID as CounterId, T.ProductId, T.Stock as DamageQty from TABLE_TRANSACTION_DATA T" + " INNER JOIN DR_TABLE_TRANSACTION_WISE_MASTER M" + " ON T.MASTER_TRANSACTION_ID = M.MASTER_TRANSACTION_ID where T.STOCK_TYPE='DAMAGE' AND T.Visit_Date ='" + visit_date + "' and T.COUNTER_ID =" + counterId + " Union All" + " SELECT CounterId, ProductId, DamageQty from Damage_PreviousPending Where CounterId =" + counterId + " and Verify ='Pending') as t" + " Group by CounterId, ProductId) as dm on s.ProductId = dm.ProductId Where s.SaleableBalance>0 and s.CounterId = " + counterId + ") as t group by " + column_name; + String query = "Select " + column_name + ", sum(SaleableBalance) as StockQty, sum(StockValue) as StockValue from (" + " Select s.ProductId as ProductId, pm." + column_name + " as " + column_name + ", pm.Mrp as Mrp, " + + "(ifnull(s.SaleableBalance,0) - ifnull(dm.DamageQty,0)) as SaleableBalance," + " IFNULL(pm.Mrp,0)*(IFNULL(s.SaleableBalance,0) - ifnull(dm.DamageQty,0)) As StockValue from" + + " T_StockSummary s inner join Product_Master pm on s.ProductId = pm.ProductId left join (Select CounterId, ProductId," + + " sum(DamageQty) as DamageQty from (" + " select T.COUNTER_ID as CounterId, T.ProductId, T.Stock as DamageQty from TABLE_TRANSACTION_DATA T" + + " INNER JOIN DR_TABLE_TRANSACTION_WISE_MASTER M" + " ON T.MASTER_TRANSACTION_ID = M.MASTER_TRANSACTION_ID where T.STOCK_TYPE='DAMAGE' AND T.Visit_Date ='" + visit_date + + "' and T.COUNTER_ID =" + counterId + " Union All" + + " SELECT CounterId, ProductId, DamageQty from Damage_PreviousPending Where CounterId =" + counterId + + " and Verify ='Pending') as t" + + " Group by CounterId, ProductId) as dm on s.ProductId = dm.ProductId Where s.SaleableBalance>0 and s.CounterId = " + + counterId + ") as t group by " + column_name; if (me) { query = "Select distinct VisitDate as " + column_name + ",CounterName,CounterCode from Report_MTD_WorkingCounterME"; } @@ -9663,7 +9519,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { long id = 0; ContentValues values = new ContentValues(); try { - if (!db.isOpen()) open(); + isOpenDb(); values.put(CommonString.KEY_SaleableDamage, damagedQty); id = db.update(CommonString.T_StockSummary, values, CommonString.KEY_ProductId + "=" + product_id + " and CounterId=" + counterId + "", null); } catch (Exception ex) { @@ -10917,39 +10773,35 @@ public class Lorealba_Database extends SQLiteOpenHelper { } else { dbcursor = db.rawQuery("Select * from Master_Promotion where PromotionSetEntityType='Worth'" + " and PromotionGetEntityType in " + "('Product' ,'Worth' ,'Gift','OffWorth','OffProduct','OffAdditionalProduct','ValueOffAdditionalProduct')", null); } - if (dbcursor != null) { - dbcursor.moveToFirst(); - while (!dbcursor.isAfterLast()) { - MasterPromotion sb = new MasterPromotion(); - sb.setPromoId(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("PromoId"))); - sb.setPromotionSetEntityType(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromotionSetEntityType"))); - sb.setPromotionGetEntityType(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromotionGetEntityType"))); - sb.setPromotionSetEntityValue(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromotionSetEntityValue"))); - sb.setPromotionGetEntityValue(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromotionGetEntityValue"))); - sb.setPromotionCode(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromotionCode"))); - sb.setPromotionName(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromotionName"))); - sb.setStartTime(dbcursor.getString(dbcursor.getColumnIndexOrThrow("StartTime"))); - sb.setEndTime(dbcursor.getString(dbcursor.getColumnIndexOrThrow("EndTime"))); - sb.setStartDate(dbcursor.getString(dbcursor.getColumnIndexOrThrow("StartDate"))); - sb.setEndDate(dbcursor.getString(dbcursor.getColumnIndexOrThrow("EndDate"))); - sb.setPromoPath(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromoPath"))); - sb.setPromoOfferTab(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromoOfferTab"))); - sb.setPromoOfferMobile(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromoOfferMobile"))); - sb.setMaxValue(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MaxValue"))); - sb.setPromoType(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromoType"))); - list.add(sb); - dbcursor.moveToNext(); - } - dbcursor.close(); - return list; + + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + MasterPromotion sb = new MasterPromotion(); + sb.setPromoId(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("PromoId"))); + sb.setPromotionSetEntityType(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromotionSetEntityType"))); + sb.setPromotionGetEntityType(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromotionGetEntityType"))); + sb.setPromotionSetEntityValue(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromotionSetEntityValue"))); + sb.setPromotionGetEntityValue(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromotionGetEntityValue"))); + sb.setPromotionCode(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromotionCode"))); + sb.setPromotionName(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromotionName"))); + sb.setStartTime(dbcursor.getString(dbcursor.getColumnIndexOrThrow("StartTime"))); + sb.setEndTime(dbcursor.getString(dbcursor.getColumnIndexOrThrow("EndTime"))); + sb.setStartDate(dbcursor.getString(dbcursor.getColumnIndexOrThrow("StartDate"))); + sb.setEndDate(dbcursor.getString(dbcursor.getColumnIndexOrThrow("EndDate"))); + sb.setPromoPath(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromoPath"))); + sb.setPromoOfferTab(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromoOfferTab"))); + sb.setPromoOfferMobile(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromoOfferMobile"))); + sb.setMaxValue(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MaxValue"))); + sb.setPromoType(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromoType"))); + list.add(sb); + dbcursor.moveToNext(); } + dbcursor.close(); + return list; } catch (Exception e) { ////////test("Exception", " answer " + e.toString()); return list; } - - ////////test("Fetching", " audit answer-->Stop<-"); - return list; } @@ -10960,7 +10812,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { dbcursor = db.rawQuery("select distinct PM.EanCode as EanCode, PM.ProductName as ProductName,TA.Quantity as Quantity,TA.Rate as Rate," + "TA.ProductId as ProductId,TA.PromoId as PromoId" + " from Temp_Promo_AplyDefinition TA inner join" + " Product_Master PM on PM.ProductId=TA.ProductId where COUNTER_ID =" + counterId + " and User_Id = '" + userId + "' and Visit_Date ='" + visit_date + "' and PromoId =" + promoId + " Order By Rate Desc", null); - if (dbcursor != null) { dbcursor.moveToFirst(); while (!dbcursor.isAfterLast()) { @@ -10981,8 +10832,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { ////////test("Exception", " answer " + e); return list; } - - ////////test("Fetching", " audit answer-->Stop<-"); return list; } @@ -13116,10 +12965,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { " ) as a inner join " + "(WITH RECURSIVE neat( id, tag, etc) AS(SELECT PromoId, '' , SetEntityListItem || ',' FROM Master_PromotionSetEntityItem " + "WHERE PromoId=" + promotionOb.getPromoId() + " UNION ALL SELECT id, SUBSTR(etc, 0, INSTR(etc, ',')) , SUBSTR(etc, INSTR(etc, ',')+1) FROM neat WHERE etc <> '') " + "select * from Master_PromotionSetProductCatalog where CatalogId in(SELECT tag FROM neat WHERE tag <> '' ORDER BY id ASC , tag ASC) ) " + "b on a.ProductId = b.ProductId", null); } else { - if (!db.isOpen()) { - open(); - } - + isOpenDb(); if (setEntityListItem != null && setEntityListItem.equalsIgnoreCase("All")) { db.execSQL("Insert into Temp_Promo_AplyDefinition(COUNTER_ID,Visit_Date,USER_ID,PromoId,ProductId, Quantity,Rate) " + " select '" + counterId + "','" + visit_date + "','" + userId + "','" + promotionOb.getPromoId() + "'," + " a.ProductId, a.Quantity," + " a.Amount from (select * from Temp_Consumer_Sale where " + " USER_ID='" + userId + "'AND Visit_Date='" + visit_date + "' and COUNTER_ID=" + counterId + " and ProductId not in(WITH RECURSIVE neat( id, ProductId, etc) AS(SELECT PromoId, '' , SetExclusionList || ','" + " FROM Master_PromotionSetExclusionList WHERE PromoId=" + promotionOb.getPromoId() + " UNION ALL SELECT id, SUBSTR(etc, 0, INSTR(etc, ',')) , SUBSTR(etc, INSTR(etc, ',')+1) FROM neat WHERE etc <> '')" + "SELECT ProductId FROM neat WHERE ProductId <> '')" + " ) as a"); @@ -13129,7 +12975,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { dbcursor = db.rawQuery(" select ifnull(sum(" + val_str + "),0) as Total_Value from (select * from Temp_Consumer_Sale where" + " USER_ID='" + userId + "'AND Visit_Date='" + visit_date + "' and COUNTER_ID=" + counterId + " and ProductId not in(WITH RECURSIVE neat( id, ProductId, etc) AS(SELECT PromoId, '' , SetExclusionList || ','" + " FROM Master_PromotionSetExclusionList WHERE PromoId=" + promotionOb.getPromoId() + " UNION ALL SELECT id, SUBSTR(etc, 0, INSTR(etc, ',')) , SUBSTR(etc, INSTR(etc, ',')+1) FROM neat WHERE etc <> '')" + "SELECT ProductId FROM neat WHERE ProductId <> '')" + " )", null); } else { - + isOpenDb(); db.execSQL("Insert into Temp_Promo_AplyDefinition(COUNTER_ID,Visit_Date,USER_ID,PromoId,ProductId, Quantity,Rate) " + " select '" + counterId + "','" + visit_date + "','" + userId + "','" + promotionOb.getPromoId() + "'," + " a.ProductId, a.Quantity, a.Amount from (select * from Temp_Consumer_Sale where " + " USER_ID='" + userId + "'AND Visit_Date='" + visit_date + "'and COUNTER_ID=" + counterId + " and ProductId not in(WITH RECURSIVE neat( id, ProductId, etc) AS(SELECT PromoId, '' , SetExclusionList || ','" + " FROM Master_PromotionSetExclusionList WHERE PromoId=" + promotionOb.getPromoId() + " UNION ALL SELECT id, SUBSTR(etc, 0, INSTR(etc, ',')) , SUBSTR(etc, INSTR(etc, ',')+1) FROM neat WHERE etc <> '')" + "SELECT ProductId FROM neat WHERE ProductId <> '')" + " ) as a inner join" + " (WITH RECURSIVE neat( id, ProductId, etc) AS(SELECT PromoId, '' , SetEntityListItem || ',' FROM Master_PromotionSetEntityItem " + "WHERE PromoId=" + promotionOb.getPromoId() + " UNION ALL SELECT id, SUBSTR(etc, 0, INSTR(etc, ',')) , SUBSTR(etc, INSTR(etc, ',')+1) FROM neat WHERE etc <> '') " + "SELECT ProductId FROM neat WHERE ProductId <> '' ORDER BY id ASC , ProductId ASC) as b on a.ProductId = b.ProductId"); @@ -13385,12 +13231,9 @@ public class Lorealba_Database extends SQLiteOpenHelper { public long update_skinGenius_Category(String counterId, String user_Id, String keyId, String table_name) { long l = 0; try { - if (!db.isOpen()) { - open(); - } ContentValues values = new ContentValues(); values.put("UPLOAD_STATUS", CommonString.KEY_Y); - + isOpenDb(); l = db.update(table_name, values, CommonString.KEY_COUNTER_ID + "=" + counterId + " AND UNIQUE_CODE='" + keyId + "'", null); } catch (Exception e) { @@ -13406,9 +13249,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { ContentValues values = new ContentValues(); values.put(CommonString.KEY_STATUS, CommonString.KEY_Y); - if (!db.isOpen()) { - open(); - } + isOpenDb(); l = db.update(table_name, values, CommonString.KEY_COUNTER_ID + "='" + counterId + "' AND " + CommonString.KEY_UUID + "='" + keyId + "'", null); } catch (Exception e) { @@ -13426,9 +13267,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { ContentValues values = new ContentValues(); long l2 = 0, masterreturn = 0; try { - if (!db.isOpen()) { - open(); - } db.beginTransaction(); finalvalues.put(CommonString.KEY_UUID, UID_code); finalvalues.put(CommonString.KEY_USER_ID, user_Id); @@ -13437,7 +13275,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { finalvalues.put(CommonString.KEY_STOCK_TYPE, CommonString.SKINGENIUS); finalvalues.put(CommonString.KEY_ENTRY_TYPE, CommonString.KEY_REGULAR); finalvalues.put(CommonString.KEY_STATUS, CommonString.KEY_N); - + isOpenDb(); masterreturn = db.insert(CommonString.TABLE_TRANSACTION_WISE_MASTER_TABLE, null, finalvalues); @@ -13449,11 +13287,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put("SKIN_GENIUS_IMG", skingenius_img); values.put("UPLOAD_STATUS", CommonString.KEY_N); values.put("CAPTURED_TIME", current_tyme); - if (db.isOpen()) { - } else { - open(); - } - + isOpenDb(); l2 = db.insert(CommonString.Table_Skin_Genius_Table, null, values); closeDb(); } catch (Exception ex) { @@ -13472,9 +13306,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { ContentValues values = new ContentValues(); long l2 = 0, masterreturn = 0; try { - if (!db.isOpen()) { - open(); - } + db.beginTransaction(); finalvalues.put(CommonString.KEY_UUID, UID_code); finalvalues.put(CommonString.KEY_USER_ID, user_Id); @@ -13483,12 +13315,8 @@ public class Lorealba_Database extends SQLiteOpenHelper { finalvalues.put(CommonString.KEY_STOCK_TYPE, CommonString.OPEN_SKINGENIUS); finalvalues.put(CommonString.KEY_ENTRY_TYPE, CommonString.KEY_REGULAR); finalvalues.put(CommonString.KEY_STATUS, CommonString.KEY_N); - if (!db.isOpen()) { - open(); - } + isOpenDb(); masterreturn = db.insert(CommonString.TABLE_TRANSACTION_WISE_MASTER_TABLE, null, finalvalues); - - values.put("USER_ID", user_Id); values.put("UNIQUE_CODE", UID_code); values.put(CommonString.KEY_MASTER_TRANSACTION_ID, masterreturn); @@ -13496,13 +13324,8 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put(CommonString.KEY_VISIT_DATE, visit_date); values.put("OPENSKIN_GENIUS_COUNT", openskingenius_count); values.put("UPLOAD_STATUS", CommonString.KEY_N); - if (db.isOpen()) { - } else { - open(); - } - + isOpenDb(); l2 = db.insert(CommonString.Table_Open_Skin_Genius_Table, null, values); - closeDb(); } catch (Exception ex) { closeDb(); @@ -13519,9 +13342,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { ContentValues values = new ContentValues(); long l2 = 0, masterreturn = 0; try { - if (!db.isOpen()) { - open(); - } + db.beginTransaction(); finalvalues.put(CommonString.KEY_UUID, UID_code); finalvalues.put(CommonString.KEY_USER_ID, user_Id); @@ -13530,10 +13351,8 @@ public class Lorealba_Database extends SQLiteOpenHelper { finalvalues.put(CommonString.KEY_STOCK_TYPE, CommonString.OPEN_MAYBELLINE); finalvalues.put(CommonString.KEY_ENTRY_TYPE, CommonString.KEY_REGULAR); finalvalues.put(CommonString.KEY_STATUS, CommonString.KEY_N); - + isOpenDb(); masterreturn = db.insert(CommonString.TABLE_TRANSACTION_WISE_MASTER_TABLE, null, finalvalues); - - values.put("USER_ID", user_Id); values.put("UNIQUE_CODE", UID_code); values.put(CommonString.KEY_MASTER_TRANSACTION_ID, masterreturn); @@ -13541,11 +13360,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put(CommonString.KEY_VISIT_DATE, visit_date); values.put("OPEN_MAYBELLINE_COUNT", open_maybelline_count); values.put("UPLOAD_STATUS", CommonString.KEY_N); - if (db.isOpen()) { - } else { - open(); - } - + isOpenDb(); l2 = db.insert(CommonString.Table_Open_Maybelline_Table, null, values); closeDb(); @@ -13575,7 +13390,6 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put("CompSetName", data.get(i).getCompSetName()); values.put("CompGetId", data.get(i).getCompGetId()); values.put("CompGetName", data.get(i).getCompGetName()); - long id = db.insert("Master_CompetitionOffer", null, values); if (id == -1) { throw new Exception(); @@ -14351,11 +14165,9 @@ public class Lorealba_Database extends SQLiteOpenHelper { for (int i = 0; i < data.size(); i++) { values.put("KPI", data.get(i).getKpi()); values.put("CounterId", data.get(i).getCounterId()); - values.put("ParamId", data.get(i).getParamId()); values.put("ParamCode", data.get(i).getParamCode()); values.put("ParamName", data.get(i).getParamName()); - values.put("CounterName", data.get(i).getCounterName()); values.put("OpeningStock", data.get(i).getOpeningStock()); values.put("InvoicedQty", data.get(i).getInvoicedQty()); @@ -15228,9 +15040,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put("FieldValueType", mappingAppRestrictedKPI.getFieldValueType()); values.put("FieldValue", mappingAppRestrictedKPI.getFieldValue()); values.put("KPIFieldEnable", mappingAppRestrictedKPI.getKPIFieldEnable()); - if (!db.isOpen()) { - open(); - } + isOpenDb(); long id = db.insert("Mapping_AppRestrictedKPI", null, values); if (id == -1) { throw new Exception(); @@ -15317,9 +15127,7 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put("ImageAllowMandatory", question.getImageAllowMandatory()); values.put("QuestionEnable", question.getQuestionEnable()); values.put("QuestionDisable", question.getQuestionDisable()); - if (!db.isOpen()) { - open(); - } + isOpenDb(); long id = db.insert("Master_CheckoutQuestion", null, values); if (id == -1) { throw new Exception(); @@ -15459,12 +15267,10 @@ public class Lorealba_Database extends SQLiteOpenHelper { } catch (Exception e) { return _filled; } finally { - if (outerCursor != null && !outerCursor.isClosed()) outerCursor.close(); - if (dbcursor != null && !dbcursor.isClosed()) dbcursor.close(); + // if (outerCursor != null && !outerCursor.isClosed()) outerCursor.close(); + // if (dbcursor != null && !dbcursor.isClosed()) dbcursor.close(); } } - - } diff --git a/app/src/main/java/com/cpm/lorealbaautomation/IMEILoginActivity.java b/app/src/main/java/com/cpm/lorealbaautomation/IMEILoginActivity.java index ebf05c2..37ce676 100644 --- a/app/src/main/java/com/cpm/lorealbaautomation/IMEILoginActivity.java +++ b/app/src/main/java/com/cpm/lorealbaautomation/IMEILoginActivity.java @@ -266,7 +266,6 @@ public class IMEILoginActivity extends AppCompatActivity implements GoogleApiCli } } - @SuppressLint("ObsoleteSdkInt") private void AttempLogin() { try { @@ -280,7 +279,6 @@ public class IMEILoginActivity extends AppCompatActivity implements GoogleApiCli loading = ProgressDialog.show(IMEILoginActivity.this, "Processing", "Please wait...", false, false); versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode; JSONObject jsonObject = new JSONObject(); - jsonObject.put("OSVersion", os_version); jsonObject.put("Manufacturer", manufacturer); jsonObject.put("ModelNumber", model); @@ -302,9 +300,7 @@ public class IMEILoginActivity extends AppCompatActivity implements GoogleApiCli jsonObject.put("IMEINumber1", "0"); } } - String jsonString = jsonObject.toString(); - Log.e("jsonlogindata", jsonString); try { final OkHttpClient okHttpClient = new OkHttpClient.Builder().readTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).writeTimeout (CommonString.TIMEOUT, TimeUnit.SECONDS).connectTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).build(); diff --git a/app/src/main/java/com/cpm/lorealbaautomation/constant/CommonString.java b/app/src/main/java/com/cpm/lorealbaautomation/constant/CommonString.java index a707cef..6fe551d 100644 --- a/app/src/main/java/com/cpm/lorealbaautomation/constant/CommonString.java +++ b/app/src/main/java/com/cpm/lorealbaautomation/constant/CommonString.java @@ -119,6 +119,7 @@ public class CommonString { public static final String TABLE_COVERAGE_DATA = "COVERAGE_DATA"; public static final String Key_Download_Status = "Download_Status"; public static final String MESSAGE_CHANGED = "Invalid UserId Or Password / Password Has Been Changed."; + public static final String MESSAGE_LOCKED = "User ID is blocked. Please contact your supervisor"; public static final String MESSAGE_LOGIN_NO_DATA = "Data mapping error."; public static final String Table_Sale_Tracking = "SALE_TRACKING_TABLE"; public static final String Table_Applyeid_Promotion = "APPLYED_PROMOTION_TABLE"; diff --git a/app/src/main/java/com/cpm/lorealbaautomation/consumeractivity/ConsumerUserDetailsActivity.java b/app/src/main/java/com/cpm/lorealbaautomation/consumeractivity/ConsumerUserDetailsActivity.java index c477bcf..40eb9de 100644 --- a/app/src/main/java/com/cpm/lorealbaautomation/consumeractivity/ConsumerUserDetailsActivity.java +++ b/app/src/main/java/com/cpm/lorealbaautomation/consumeractivity/ConsumerUserDetailsActivity.java @@ -48,9 +48,11 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.cardview.widget.CardView; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import com.cpm.lorealbaautomation.gsonGetterSetter.PromotionMaster; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.gson.Gson; import com.google.zxing.integration.android.IntentIntegrator; @@ -96,6 +98,7 @@ import okhttp3.ResponseBody; import retrofit2.Retrofit; import retrofit2.converter.gson.GsonConverterFactory; + public class ConsumerUserDetailsActivity extends AppCompatActivity implements View.OnClickListener, AdapterView.OnItemSelectedListener { String dialog_invoiceType = "Saleable", dialog_brand_Id = "", dialog_sub_brand_Id = "", dialog_reference_Id = "", product_name = "", product_Id = "0", product_mrp = "0", CounterId, visit_date, @@ -266,7 +269,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi if (flag_for_consumer_Update != null && flag_for_consumer_Update.equals("1")) { edt_mobile_no.setEnabled(false); mobile_checkbox.setEnabled(false); - rl_term_condition.setTextColor(getResources().getColor(R.color.gray)); + rl_term_condition.setTextColor(ContextCompat.getColor(context,R.color.gray)); rl_term_condition.setEnabled(false); mobile_checkbox.setEnabled(false); edt_email_address.setEnabled(false); @@ -304,55 +307,55 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi //for demo perpose button if (!selected_list.get(0).getDemo_given_str().isEmpty() && selected_list.get(0).getDemo_given_str().equalsIgnoreCase("Yes")) { - promotion_btn_first.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - promotion_btn_first.setTextColor(getResources().getColor(R.color.white)); - promotion_btn_second.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - promotion_btn_second.setTextColor(getResources().getColor(R.color.grayfor_login)); + promotion_btn_first.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + promotion_btn_first.setTextColor(ContextCompat.getColor(context,R.color.white)); + promotion_btn_second.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + promotion_btn_second.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); demo_given_str = "Yes"; } else { - promotion_btn_second.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - promotion_btn_second.setTextColor(getResources().getColor(R.color.white)); - promotion_btn_first.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - promotion_btn_first.setTextColor(getResources().getColor(R.color.grayfor_login)); + promotion_btn_second.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + promotion_btn_second.setTextColor(ContextCompat.getColor(context,R.color.white)); + promotion_btn_first.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + promotion_btn_first.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); demo_given_str = "No"; } /////For Skin Genious if (!selected_list.get(0).getSkin_genius_str().isEmpty() && selected_list.get(0).getSkin_genius_str().equalsIgnoreCase("Yes")) { - skingn_btn_yes.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - skingn_btn_yes.setTextColor(getResources().getColor(R.color.white)); - skingn_btn_no.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - skingn_btn_no.setTextColor(getResources().getColor(R.color.grayfor_login)); + skingn_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + skingn_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.white)); + skingn_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + skingn_btn_no.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); skin_genius_str = "Yes"; } else { - skingn_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - skingn_btn_no.setTextColor(getResources().getColor(R.color.white)); - skingn_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - skingn_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login)); + skingn_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + skingn_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white)); + skingn_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + skingn_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); skin_genius_str = "No"; } /////For Maybelline VTO if (!selected_list.get(0).getMaybelline_vto_str().isEmpty() && selected_list.get(0).getMaybelline_vto_str().equalsIgnoreCase("Yes")) { - maybelline_btn_yes.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - maybelline_btn_yes.setTextColor(getResources().getColor(R.color.white)); - maybelline_btn_no.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - maybelline_btn_no.setTextColor(getResources().getColor(R.color.grayfor_login)); + maybelline_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + maybelline_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.white)); + maybelline_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + maybelline_btn_no.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); maybelline_vto = "Yes"; } else { - maybelline_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - maybelline_btn_no.setTextColor(getResources().getColor(R.color.white)); - maybelline_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - maybelline_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login)); + maybelline_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + maybelline_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white)); + maybelline_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + maybelline_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); maybelline_vto = "No"; } if (!selected_list.get(0).getProduct_sold_str().isEmpty() && selected_list.get(0).getProduct_sold_str().equalsIgnoreCase("Yes")) { - sale_btn_yes.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - sale_btn_yes.setTextColor(getResources().getColor(R.color.white)); - sale_btn_no.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - sale_btn_no.setTextColor(getResources().getColor(R.color.grayfor_login)); + sale_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + sale_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.white)); + sale_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + sale_btn_no.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); card_layout_scan.setVisibility(View.VISIBLE); card_layout_title.setVisibility(View.VISIBLE); drawer_layout_recycle_store.setVisibility(View.VISIBLE); @@ -361,10 +364,10 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi img_visble.setVisibility(View.VISIBLE); text_user_nm.setText(selected_list.get(0).getCustomer_name() + " Customer - " + CommonFunctions.removed_special_char(edt_customer)); } else { - sale_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - sale_btn_no.setTextColor(getResources().getColor(R.color.white)); - sale_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - sale_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login)); + sale_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + sale_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white)); + sale_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + sale_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); card_layout_scan.setVisibility(View.GONE); card_layout_title.setVisibility(View.GONE); drawer_layout_recycle_store.setVisibility(View.GONE); @@ -407,27 +410,27 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi drawer_layout_recycle_store.setLayoutManager(new LinearLayoutManager(context)); } else { selected_list = new ArrayList<>(); - promotion_btn_second.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - promotion_btn_second.setTextColor(getResources().getColor(R.color.white)); - promotion_btn_first.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - promotion_btn_first.setTextColor(getResources().getColor(R.color.grayfor_login)); + promotion_btn_second.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + promotion_btn_second.setTextColor(ContextCompat.getColor(context,R.color.white)); + promotion_btn_first.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + promotion_btn_first.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); - sale_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - sale_btn_no.setTextColor(getResources().getColor(R.color.white)); - sale_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - sale_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login)); + sale_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + sale_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white)); + sale_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + sale_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); ///for Sale Genius - skingn_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - skingn_btn_no.setTextColor(getResources().getColor(R.color.white)); - skingn_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - skingn_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login)); + skingn_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + skingn_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white)); + skingn_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + skingn_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); ///for Maybelline VTO - maybelline_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - maybelline_btn_no.setTextColor(getResources().getColor(R.color.white)); - maybelline_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - maybelline_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login)); + maybelline_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + maybelline_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white)); + maybelline_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + maybelline_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); maybelline_vto = "No"; skin_genius_str = "No"; @@ -508,7 +511,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi mobile_checkbox.setEnabled(false); edt_email_address.setEnabled(false); edt_email_address.setText(""); - rl_term_condition.setTextColor(getResources().getColor(R.color.gray)); + rl_term_condition.setTextColor(ContextCompat.getColor(context,R.color.gray)); rl_term_condition.setEnabled(false); }); @@ -539,6 +542,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi return super.onOptionsItemSelected(item); } + @SuppressLint("MissingSuperCall") @Override public void onBackPressed() { if (clicked_flag) { @@ -700,12 +704,12 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi edt_mobile_no.setText("0000000000"); rl_otp.setVisibility(View.GONE); edt_mobile_no.setEnabled(false); - rl_term_condition.setTextColor(getResources().getColor(R.color.gray)); + rl_term_condition.setTextColor(ContextCompat.getColor(context,R.color.gray)); } else { edt_mobile_no.setText(""); no_mobile_no_flag = false; edt_mobile_no.setEnabled(true); - rl_term_condition.setTextColor(getResources().getColor(R.color.blue)); + rl_term_condition.setTextColor(ContextCompat.getColor(context,R.color.blue)); } } else if (view.getId() == R.id.no_name_checkbox) { @@ -912,10 +916,10 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi } else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) { AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id "); } else { - promotion_btn_first.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - promotion_btn_first.setTextColor(getResources().getColor(R.color.white)); - promotion_btn_second.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - promotion_btn_second.setTextColor(getResources().getColor(R.color.grayfor_login)); + promotion_btn_first.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + promotion_btn_first.setTextColor(ContextCompat.getColor(context,R.color.white)); + promotion_btn_second.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + promotion_btn_second.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); demo_given_str = "Yes"; if (response_term_condition.equals("1")) { rl_demo_img.setVisibility(View.VISIBLE); @@ -940,10 +944,10 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi } else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) { AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id "); } else { - skingn_btn_yes.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - skingn_btn_yes.setTextColor(getResources().getColor(R.color.white)); - skingn_btn_no.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - skingn_btn_no.setTextColor(getResources().getColor(R.color.grayfor_login)); + skingn_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + skingn_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.white)); + skingn_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + skingn_btn_no.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); skin_genius_str = "Yes"; } @@ -960,10 +964,10 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi } else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) { AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id "); } else { - maybelline_btn_yes.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - maybelline_btn_yes.setTextColor(getResources().getColor(R.color.white)); - maybelline_btn_no.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - maybelline_btn_no.setTextColor(getResources().getColor(R.color.grayfor_login)); + maybelline_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + maybelline_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.white)); + maybelline_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + maybelline_btn_no.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); maybelline_vto = "Yes"; } @@ -977,10 +981,10 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi } else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) { AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id "); } else { - skingn_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - skingn_btn_no.setTextColor(getResources().getColor(R.color.white)); - skingn_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - skingn_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login)); + skingn_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + skingn_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white)); + skingn_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + skingn_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); skin_genius_str = "No"; } @@ -997,10 +1001,10 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi } else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) { AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id "); } else { - maybelline_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - maybelline_btn_no.setTextColor(getResources().getColor(R.color.white)); - maybelline_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - maybelline_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login)); + maybelline_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + maybelline_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white)); + maybelline_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + maybelline_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); maybelline_vto = "No"; } @@ -1014,15 +1018,15 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi } else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) { AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id "); } else { - promotion_btn_second.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - promotion_btn_second.setTextColor(getResources().getColor(R.color.white)); - promotion_btn_first.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - promotion_btn_first.setTextColor(getResources().getColor(R.color.grayfor_login)); + promotion_btn_second.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + promotion_btn_second.setTextColor(ContextCompat.getColor(context,R.color.white)); + promotion_btn_first.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + promotion_btn_first.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); - sale_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - sale_btn_no.setTextColor(getResources().getColor(R.color.white)); - sale_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - sale_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login)); + sale_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + sale_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white)); + sale_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + sale_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); demo_given_str = "No"; str_img_demo_no_sale = ""; @@ -1040,10 +1044,10 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi } else if (!edt_email_address.getText().toString().isEmpty() && !CommonFunctions.isValidEmail(edt_email_address.getText().toString())) { AlertandMessages.showToastMsg(context, "Please Enter Valid Email Id "); } else { - sale_btn_no.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - sale_btn_no.setTextColor(getResources().getColor(R.color.white)); - sale_btn_yes.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - sale_btn_yes.setTextColor(getResources().getColor(R.color.grayfor_login)); + sale_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + sale_btn_no.setTextColor(ContextCompat.getColor(context,R.color.white)); + sale_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + sale_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); card_layout_scan.setVisibility(View.GONE); card_layout_title.setVisibility(View.GONE); drawer_layout_recycle_store.setVisibility(View.GONE); @@ -1068,10 +1072,10 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi } } } - sale_btn_yes.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - sale_btn_yes.setTextColor(getResources().getColor(R.color.white)); - sale_btn_no.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - sale_btn_no.setTextColor(getResources().getColor(R.color.grayfor_login)); + sale_btn_yes.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + sale_btn_yes.setTextColor(ContextCompat.getColor(context,R.color.white)); + sale_btn_no.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + sale_btn_no.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); card_layout_scan.setVisibility(View.VISIBLE); card_layout_title.setVisibility(View.VISIBLE); drawer_layout_recycle_store.setVisibility(View.VISIBLE); @@ -1552,7 +1556,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi if (_pathforcheck != null && !_pathforcheck.isEmpty()) { if (new File(CommonString.getImagesFolder(context) + _pathforcheck).exists()) { convertBitmap(CommonString.getImagesFolder(context) + _pathforcheck); - img_only_demo.setImageDrawable(getResources().getDrawable(R.mipmap.camera_bsd)); + img_only_demo.setImageDrawable(ContextCompat.getDrawable(context,R.mipmap.camera_bsd)); str_img_demo_no_sale = _pathforcheck; _pathforcheck = ""; } @@ -2581,12 +2585,12 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi setProductSpinnerData(productList, dialog_product_spin); db.open(); dialog_product_list = db.getproduct_masterlist("T_StockSummary", visit_date, CounterId, from); - btn_invoice_type_saleable.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - btn_invoice_type_saleable.setTextColor(getResources().getColor(R.color.white)); - btn_invoice_type_sample.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - btn_invoice_type_sample.setTextColor(getResources().getColor(R.color.grayfor_login)); - btn_invoice_type_gwp.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - btn_invoice_type_gwp.setTextColor(getResources().getColor(R.color.grayfor_login)); + btn_invoice_type_saleable.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + btn_invoice_type_saleable.setTextColor(ContextCompat.getColor(context,R.color.white)); + btn_invoice_type_sample.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + btn_invoice_type_sample.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); + btn_invoice_type_gwp.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + btn_invoice_type_gwp.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); }); btn_invoice_type_sample.setOnClickListener(view -> { @@ -2604,12 +2608,12 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi setSubBrandSpinnerData(subbrandList, dialog_sub_brand_spin); setReferenceSpinnerData(referenceList, dialog_franchise_spin); setProductSpinnerData(productList, dialog_product_spin); - btn_invoice_type_sample.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - btn_invoice_type_sample.setTextColor(getResources().getColor(R.color.white)); - btn_invoice_type_saleable.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - btn_invoice_type_saleable.setTextColor(getResources().getColor(R.color.grayfor_login)); - btn_invoice_type_gwp.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - btn_invoice_type_gwp.setTextColor(getResources().getColor(R.color.grayfor_login)); + btn_invoice_type_sample.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + btn_invoice_type_sample.setTextColor(ContextCompat.getColor(context,R.color.white)); + btn_invoice_type_saleable.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + btn_invoice_type_saleable.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); + btn_invoice_type_gwp.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + btn_invoice_type_gwp.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); db.open(); dialog_product_list = db.getproduct_masterlist(dialog_invoiceType, visit_date, CounterId, from); @@ -2630,12 +2634,12 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi setSubBrandSpinnerData(subbrandList, dialog_sub_brand_spin); setReferenceSpinnerData(referenceList, dialog_franchise_spin); setProductSpinnerData(productList, dialog_product_spin); - btn_invoice_type_gwp.setBackground(getResources().getDrawable(R.drawable.rouded_corner)); - btn_invoice_type_gwp.setTextColor(getResources().getColor(R.color.white)); - btn_invoice_type_saleable.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - btn_invoice_type_saleable.setTextColor(getResources().getColor(R.color.grayfor_login)); - btn_invoice_type_sample.setBackground(getResources().getDrawable(R.drawable.round_btn_color_primary)); - btn_invoice_type_sample.setTextColor(getResources().getColor(R.color.grayfor_login)); + btn_invoice_type_gwp.setBackground(ContextCompat.getDrawable(context,R.drawable.rouded_corner)); + btn_invoice_type_gwp.setTextColor(ContextCompat.getColor(context,R.color.white)); + btn_invoice_type_saleable.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + btn_invoice_type_saleable.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); + btn_invoice_type_sample.setBackground(ContextCompat.getDrawable(context,R.drawable.round_btn_color_primary)); + btn_invoice_type_sample.setTextColor(ContextCompat.getColor(context,R.color.grayfor_login)); db.open(); dialog_product_list = db.getproduct_masterlist(dialog_invoiceType, visit_date, CounterId, from); }); @@ -3149,7 +3153,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi response_term_condition = "0"; } } else { - rl_term_condition.setTextColor(getResources().getColor(R.color.blue)); + rl_term_condition.setTextColor(ContextCompat.getColor(context,R.color.blue)); rl_term_condition.setEnabled(true); } } @@ -3180,7 +3184,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi List dataresponce = reportbaAvailabilityGetterSetter.getConsumerTermsConditionAccept(); if (dataresponce.get(0).getTermsConditionAccept()) { 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); } else { @@ -3214,7 +3218,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi protected void onResume() { super.onResume(); if (!response_term_condition.isEmpty() && !response_term_condition.equals("0")) { - rl_term_condition.setTextColor(getResources().getColor(R.color.gray)); + rl_term_condition.setTextColor(ContextCompat.getColor(context,R.color.gray)); rl_term_condition.setEnabled(false); } @@ -3363,10 +3367,10 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi if (flag_worth) { header_txt.setText("Applicable Worth Promotions"); - rl_changes_color.setBackgroundColor(getResources().getColor(R.color.dashboard_less_ach)); + rl_changes_color.setBackgroundColor(ContextCompat.getColor(context,R.color.dashboard_less_ach)); } else { header_txt.setText("Applicable Product Promotions"); - rl_changes_color.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); + rl_changes_color.setBackgroundColor(ContextCompat.getColor(context,R.color.colorPrimary)); } ////show product selected @@ -3374,7 +3378,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi recycl_promotion.setLayoutManager(new LinearLayoutManager(context)); cancet_btn.setOnClickListener(view -> { - purposeDialog.dismiss(); added_prmo_products.clear(); if (purposeDialog != null && purposeDialog.isShowing()) { purposeDialog.dismiss(); @@ -3383,11 +3386,9 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi btn_add.setOnClickListener(view -> { try { - purposeDialog.dismiss(); if (purposeDialog != null && purposeDialog.isShowing()) { purposeDialog.dismiss(); } - if (flag_worth) { if (!added_prmo_products.isEmpty()) { selected_list.addAll(added_prmo_products); @@ -3795,7 +3796,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi } invoiceGetterSetter.setDiscounted_value_productwise(new DecimalFormat("##.##").format(calculate_per_productwise)); invoiceGetterSetter.setScan_ean_code_or_enterd_ean_code(qualified_products1.get(l).getScan_ean_code_or_enterd_ean_code()); - applyeid_products.add(invoiceGetterSetter); } } @@ -3895,7 +3895,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi } else { calculate_per_productwise = (total_valueper_productwise * getentityValue) / 100; } - //test("promodata", String.valueOf(calculate_per_productwise)); } catch (NumberFormatException e) { e.fillInStackTrace(); } @@ -4283,14 +4282,8 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi protected void remove_added_promo_index() { try { if (!selected_list.isEmpty()) { - Iterator it = selected_list.iterator(); - while (it.hasNext()) { - InvoiceGetterSetter name = it.next(); - if (name.isPromo_flag()) { - it.remove(); - } - // Do something - } + // Do something + selected_list.removeIf(InvoiceGetterSetter::isPromo_flag); } } catch (Exception e) { e.fillInStackTrace(); @@ -4300,14 +4293,8 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi protected void remove_added_promo_fromtemp(String promoId) { try { if (!added_prmo_products.isEmpty()) { - Iterator it = added_prmo_products.iterator(); - while (it.hasNext()) { - InvoiceGetterSetter name = it.next(); - if (promoId.equals(name.getPromotion_Id())) { - it.remove(); - } - // Do something - } + // Do something + added_prmo_products.removeIf(name -> promoId.equals(name.getPromotion_Id())); } } catch (Exception e) { e.fillInStackTrace(); @@ -4362,7 +4349,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi } close_white.setOnClickListener(view -> { - purposeDialog.dismiss(); if (purposeDialog != null && purposeDialog.isShowing()) { purposeDialog.dismiss(); } @@ -4514,8 +4500,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi ////for product promotion db.open(); ArrayList promoMaster = db.getPromotionMaster(true); - // //test("promosize", String.valueOf(promoMaster.size())); - if (!promoMaster.isEmpty()) { final ArrayList validPromoList = new ArrayList<>(); for (int x = 0; x < promoMaster.size(); x++) { @@ -4528,13 +4512,11 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi boolean flag_for_and = true; for (int q = 0; q < promoAndList.size(); q++) { db.open(); - int product_countfor_and = db.getPromotiongetProductforAndPromo(promoAndList.get(q).getId(), - promoAndList.get(q).getPromoId().toString(), true, username, visit_date, CounterId); + int product_countfor_and = db.getPromotiongetProductforAndPromo(promoAndList.get(q).getId(), promoAndList.get(q).getPromoId().toString(), true, username, visit_date, CounterId); ////checking AND promo itemcount if (product_countfor_and >= promoAndList.get(q).getItemCount()) { db.open(); - db.update_temp_promo_apply_definitionfor_andpromo(promoAndList.get(q).getId(), CounterId, username, - promoAndList.get(q).getPromoId(), visit_date); + db.update_temp_promo_apply_definitionfor_andpromo(promoAndList.get(q).getId(), CounterId, username, promoAndList.get(q).getPromoId(), visit_date); } else { db.open(); flag_for_and = false; @@ -4542,7 +4524,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi break; } } - if (flag_for_and) { //////--------insert all AND Promo data to Apply Definition.Table...----------- db.open(); @@ -4553,17 +4534,22 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi } else { db.open(); int product_count = db.getPromotiongetProductall(promoMaster.get(x), true, username, visit_date, CounterId); - //test("product_count", String.valueOf(product_count)); + String promoSetEntityValues = promoMaster.get(x).getPromotionSetEntityValue(); if (product_count > 0) { - if (product_count >= Integer.parseInt(promoMaster.get(x).getPromotionSetEntityValue())) { + if (promoSetEntityValues.contains("|") && promoSetEntityValues.split("\\|").length == 2 && isCostInRange(promoSetEntityValues, product_count, promoMaster.get(x))) { db.open(); db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date); validPromoList.add(promoMaster.get(x)); + } else { + if (!promoSetEntityValues.contains("|") && product_count >= Integer.parseInt(promoSetEntityValues)) { + db.open(); + db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date); + validPromoList.add(promoMaster.get(x)); + } } } } } - if (!validPromoList.isEmpty()) { runOnUiThread(() -> { if (dialog != null && dialog.isShowing()) { @@ -4571,7 +4557,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi } show_promotion_skuwise_dialog(context, selected_list, validPromoList, false); }); - } else { ///finish checkPromoWorth(promoMaster); @@ -4606,7 +4591,6 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi break; } } - if (flag_for_and) { //////--------insert all AND Promo data to Apply Definition.Table...----------- db.open(); @@ -4617,12 +4601,19 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi } else { db.open(); int product_count = db.getPromotiongetProductall(promoMaster.get(x), false, username, visit_date, CounterId); - //test("product_count", String.valueOf(product_count)); + //Log.e("product_count", String.valueOf(product_count)); + String promoSetEntityValues = promoMaster.get(x).getPromotionSetEntityValue(); if (product_count > 0) { - if (product_count >= Integer.parseInt(promoMaster.get(x).getPromotionSetEntityValue())) { + if (promoSetEntityValues.contains("|") && promoSetEntityValues.split("\\|").length == 2 && isCostInRange(promoSetEntityValues, product_count, promoMaster.get(x))) { db.open(); db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date); validPromoList.add(promoMaster.get(x)); + } else { + if (!promoSetEntityValues.contains("|") && product_count >= Integer.parseInt(promoSetEntityValues)) { + db.open(); + db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date); + validPromoList.add(promoMaster.get(x)); + } } } } @@ -4717,11 +4708,18 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi } else { db.open(); int product_count = db.getPromotiongetProductall(promoMaster.get(x), false, username, visit_date, CounterId); + String promoSetEntityValues = promoMaster.get(x).getPromotionSetEntityValue(); if (product_count > 0) { - if (product_count >= Integer.parseInt(promoMaster.get(x).getPromotionSetEntityValue())) { + if (promoSetEntityValues.contains("|") && promoSetEntityValues.split("\\|").length == 2 && isCostInRange(promoSetEntityValues, product_count, promoMaster.get(x))) { db.open(); db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date); validPromoList.add(promoMaster.get(x)); + } else { + if (!promoSetEntityValues.contains("|") && product_count >= Integer.parseInt(promoSetEntityValues)) { + db.open(); + db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date); + validPromoList.add(promoMaster.get(x)); + } } } } @@ -4813,12 +4811,18 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi } else { db.open(); int product_count = db.getPromotiongetProductall(promoMaster.get(x), false, username, visit_date, CounterId); - //test("Productcount", String.valueOf(product_count)); + String promoSetEntityValues = promoMaster.get(x).getPromotionSetEntityValue(); if (product_count > 0) { - if (product_count >= Integer.parseInt(promoMaster.get(x).getPromotionSetEntityValue())) { + if (promoSetEntityValues.contains("|") && promoSetEntityValues.split("\\|").length == 2 && isCostInRange(promoSetEntityValues, product_count, promoMaster.get(x))) { db.open(); db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date); validPromoList.add(promoMaster.get(x)); + } else { + if (!promoSetEntityValues.contains("|") && product_count >= Integer.parseInt(promoSetEntityValues)) { + db.open(); + db.update_temp_promo_apply_definition(CounterId, username, promoMaster.get(x).getPromoId().toString(), visit_date); + validPromoList.add(promoMaster.get(x)); + } } } } @@ -4907,5 +4911,27 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi return object; } + + private boolean isCostInRange(String range, int totalCost, MasterPromotion promo) { + if (range == null || range.trim().isEmpty()) { + return false; // No range provided + } + + String[] parts = range.split("\\|"); + if (parts.length != 2) { + return false; // Invalid format + } + try { + int min = Integer.parseInt(parts[0].trim()); + int max = Integer.parseInt(parts[1].trim()); + boolean flg = totalCost >= min && totalCost <= max; + Log.e("Testing------1", min + " -- " + max + "\n" + flg); + return flg; + } catch (NumberFormatException e) { + e.fillInStackTrace(); + return false; // Invalid number format + } + } + } diff --git a/app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/BAProfileActivity.java b/app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/BAProfileActivity.java index 9aaa0e3..33ae929 100644 --- a/app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/BAProfileActivity.java +++ b/app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/BAProfileActivity.java @@ -1047,7 +1047,7 @@ public class BAProfileActivity extends AppCompatActivity implements View.OnClick round_img_pic.setImageBitmap(bitmp); } } else if (!baProfileListData.isEmpty() && baProfileListData.get(0).getProfilePic() != null && !baProfileListData.get(0).getProfilePic().isEmpty()) { - Picasso.with(context).load(baProfileListData.get(0).getProfilePic()).networkPolicy(NetworkPolicy.NO_CACHE).into(round_img_pic); + Picasso.with(context).load(baProfileListData.get(0).getProfilePic()).networkPolicy(NetworkPolicy.NO_CACHE).placeholder(R.mipmap.profile_image).into(round_img_pic); } else { bitmp = BitmapFactory.decodeResource(getResources(), R.mipmap.profile_image); round_img_pic.setImageBitmap(bitmp); diff --git a/app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/CounterImageActivity.java b/app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/CounterImageActivity.java index 901bde5..c061456 100644 --- a/app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/CounterImageActivity.java +++ b/app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/CounterImageActivity.java @@ -91,6 +91,10 @@ public class CounterImageActivity extends AppCompatActivity implements db = new Lorealba_Database(context); db.open(); validateuidata(); + if (!db.isBaProfileFilled(counter_id, username, user_type) && db.getSaveServerData(null, username).isEmpty()) { + // Only show if BOTH are false + showAlertProfile(context); + } } private void getLastLocation() { @@ -456,11 +460,11 @@ public class CounterImageActivity extends AppCompatActivity implements super.onResume(); db.open(); checkgpsEnableDevice(); - if (!db.isBaProfileFilled(counter_id, username, user_type)) { + /*if (!db.isBaProfileFilled(counter_id, username, user_type)) { showAlertProfile(context); } else if (db.getSaveServerData(null, username).isEmpty()) { showAlertProfile(context); - } + }*/ } private void checkgpsEnableDevice() { diff --git a/app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/TabLoginActivity.java b/app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/TabLoginActivity.java index 00c1544..67f5467 100644 --- a/app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/TabLoginActivity.java +++ b/app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/TabLoginActivity.java @@ -20,6 +20,7 @@ import android.os.Bundle; import android.provider.Settings; import android.text.InputFilter; import android.text.Spanned; +import android.util.Log; import android.view.View; import android.view.WindowManager; import android.widget.AdapterView; @@ -355,9 +356,9 @@ public class TabLoginActivity extends AppCompatActivity implements View.OnClickL jsonObject.put("IMEINumber1", "0"); jsonObject.put("IMEINumber2", "0"); } - } String jsonString = jsonObject.toString(); + // Log.e("loginjson", jsonString); try { 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)) { AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.KEY_FAILURE + " Please try again"); loading.dismiss(); - } else if (data != null && data.contains("Changed")) { + } + else if (data != null && data.contains("Changed")) { loading.dismiss(); AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.MESSAGE_CHANGED); - } else if (data != null && data.contains("No data")) { + } + else if (data != null && data.contains("Lockout")) { + loading.dismiss(); + AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.MESSAGE_LOCKED); + } + else if (data != null && data.contains("No data")) { loading.dismiss(); AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.MESSAGE_LOGIN_NO_DATA); - } else { + } + else { JSONObject obj = new JSONObject(); obj.put("Downloadtype", "LoginTime"); obj.put("Username", userId); diff --git a/app/src/main/java/com/cpm/lorealbaautomation/pinviewactivity/PinViewActivity.java b/app/src/main/java/com/cpm/lorealbaautomation/pinviewactivity/PinViewActivity.java index bbc7e14..c0d39cc 100644 --- a/app/src/main/java/com/cpm/lorealbaautomation/pinviewactivity/PinViewActivity.java +++ b/app/src/main/java/com/cpm/lorealbaautomation/pinviewactivity/PinViewActivity.java @@ -19,6 +19,7 @@ import android.location.LocationManager; import android.os.Build; import android.os.Bundle; import android.provider.Settings; +import android.util.Log; import android.view.View; import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; @@ -33,6 +34,7 @@ import androidx.cardview.widget.CardView; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; +import com.cpm.lorealbaautomation.dailyactivity.TabLoginActivity; import com.goodiebag.pinview.Pinview; import com.google.android.gms.common.api.ResolvableApiException; import com.google.android.gms.location.FusedLocationProviderClient; @@ -482,7 +484,6 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener { private void AttempLogin() { try { - loading = ProgressDialog.show(context, "Processing", "Please wait...", false, false); versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode; JSONObject jsonObject = new JSONObject(); @@ -518,6 +519,7 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener { } String jsonString = jsonObject.toString(); + Log.d("pinviewjson",jsonString); try { final OkHttpClient okHttpClient = new OkHttpClient.Builder().readTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS). 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")) { loading.dismiss(); 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"); loading.dismiss(); } else { diff --git a/app/src/main/java/com/cpm/lorealbaautomation/retrofit/DownloadAllDatawithRetro.java b/app/src/main/java/com/cpm/lorealbaautomation/retrofit/DownloadAllDatawithRetro.java index ee0258a..79046b8 100644 --- a/app/src/main/java/com/cpm/lorealbaautomation/retrofit/DownloadAllDatawithRetro.java +++ b/app/src/main/java/com/cpm/lorealbaautomation/retrofit/DownloadAllDatawithRetro.java @@ -89,7 +89,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv this.context = context; this.db = db; this.pd = pd; - preferences = PrefHelper.getPrefs(context); + preferences = PrefHelper.getPrefs(context); editor = preferences.edit(); date = preferences.getString(CommonString.KEY_DATE, ""); counterId = preferences.getString(CommonString.KEY_COUNTER_ID, ""); @@ -144,7 +144,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv } else { editor.putInt(CommonString.KEY_DOWNLOAD_INDEX, finalJsonIndex[0]); editor.apply(); - Log.d("JSON_DATA",data); + Log.d("JSON_DATA", data); new MyLoader(context, finalKeyName, data).execute(); } } @@ -336,7 +336,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv case "Mapping_JourneyPlan": if (!data.contains("No Data")) { - Log.d("JSON_DATA",data); + Log.d("JSON_DATA", data); jcpObject = new Gson().fromJson(data, JCPGetterSetter.class); db.open(); if (jcpObject != null && !db.insertJCPData(jcpObject)) { @@ -425,6 +425,9 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv pd.dismiss(); AlertandMessages.showToastMsg(context, "Master_Posm data not saved"); } + } else { + db.open(); + db.delete_table_data("Master_Posm"); } break; @@ -438,6 +441,9 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv pd.dismiss(); AlertandMessages.showToastMsg(context, "InwardSales PO Data not saved"); } + } else { + db.open(); + db.delete_table_data("InwardSales_PO"); } @@ -490,6 +496,8 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv } catch (Exception e) { throw new java.lang.Exception(); } + } else { + db.delete_table_data("T_StockSummary"); } break; @@ -506,8 +514,6 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv db.open(); db.delete_table_data("T_CounterInvoice"); } - - break; case "Master_NonVisibility": @@ -526,7 +532,6 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv break; - case "Master_NonStockReason": if (!data.contains("No Data")) { masterNonStockReasonObj = new Gson().fromJson(data, MasterNonStockReasonGetterSetter.class); @@ -540,7 +545,6 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv db.delete_table_data("Master_NonStockReason"); } - break; //jp case "Master_SkinType": @@ -579,6 +583,9 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv pd.dismiss(); AlertandMessages.showToastMsg(context, "Master_Profile not saved"); } + } else { + db.open(); + db.delete_table_data("Master_Profile"); } @@ -609,10 +616,8 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv throw new java.lang.Exception(); } - break; - case "Master_TermsCondition": if (!data.contains("No Data")) { termConditionObject = new Gson().fromJson(data, MasterProfileQuestionGetterSetter.class); @@ -834,7 +839,6 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv db.delete_table_data("Report_Top10Volume"); } - break; case "Report_Top10Value": @@ -1600,7 +1604,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv if (!data.contains("No Data")) { TesterCounter testerCounter = new Gson().fromJson(data, TesterCounter.class); db.open(); - if (testerCounter != null && testerCounter.getReportTesterCounter()!=null && !db.insertTesterCounter(testerCounter)) { + if (testerCounter != null && testerCounter.getReportTesterCounter() != null && !db.insertTesterCounter(testerCounter)) { pd.dismiss(); AlertandMessages.showToastMsg(context, "Report_TesterCounter not saved"); } @@ -1806,7 +1810,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv break; - case "T_LeaveLedgerSummary": + case "T_LeaveLedgerSummary": if (!data.contains("No Data")) { ResponseResult leaveLedger = new Gson().fromJson(data, ResponseResult.class); db.open(); @@ -1823,7 +1827,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv case "Mapping_AppRestrictedKPI": if (!data.contains("No Data")) { - MasterBAProfileGetterSetter mappingAppRestrictedKPIGetterSetter = new Gson().fromJson(data, MasterBAProfileGetterSetter.class); + MasterBAProfileGetterSetter mappingAppRestrictedKPIGetterSetter = new Gson().fromJson(data, MasterBAProfileGetterSetter.class); db.open(); if (mappingAppRestrictedKPIGetterSetter != null && !db.insertMappingAppRestrictedKPI(mappingAppRestrictedKPIGetterSetter)) { AlertandMessages.showToastMsg(context, "Mapping_AppRestrictedKPI data not saved"); @@ -1963,7 +1967,6 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv } } } - } catch (Exception e) { e.fillInStackTrace(); } @@ -1987,12 +1990,10 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv int bytes = 0; byte[] buffer = new byte[1024]; int len1 = 0; - while ((len1 = is1.read(buffer)) != -1) { bytes = (bytes + len1); fos.write(buffer, 0, len1); } - fos.close(); is1.close(); } @@ -2058,7 +2059,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv } else { data_global[0] = data; if (finalKeyName.equalsIgnoreCase("Table_Structure")) { - Log.d("JSON_DATA",data); + Log.d("JSON_DATA", data); editor.putInt(CommonString.KEY_DOWNLOAD_INDEX, finalJsonIndex[0]); editor.apply(); tableStructureObj = new Gson().fromJson(data, TableStructureGetterSetter.class); diff --git a/app/src/main/res/layout-sw600dp/content_baprofile.xml b/app/src/main/res/layout-sw600dp/content_baprofile.xml index 6784602..3bb87e5 100644 --- a/app/src/main/res/layout-sw600dp/content_baprofile.xml +++ b/app/src/main/res/layout-sw600dp/content_baprofile.xml @@ -34,6 +34,7 @@ android:layout_height="@dimen/hieght_180dp" android:layout_centerInParent="true" android:layout_gravity="center" + android:visibility="visible" android:layout_margin="@dimen/custom_margin" android:adjustViewBounds="true" android:src="@mipmap/profile_image" /> diff --git a/app/src/main/res/layout/content_baprofile.xml b/app/src/main/res/layout/content_baprofile.xml index 8ef29b0..b8d101e 100644 --- a/app/src/main/res/layout/content_baprofile.xml +++ b/app/src/main/res/layout/content_baprofile.xml @@ -36,6 +36,7 @@ android:layout_height="@dimen/hieght_130dp" android:layout_centerInParent="true" android:layout_gravity="center" + android:visibility="visible" android:layout_margin="@dimen/custom_margin" android:adjustViewBounds="true" android:src="@mipmap/profile_image" /> diff --git a/library/build/.transforms/342b84e04b8a1617a1931ce3652c49ce/results.bin b/library/build/.transforms/342b84e04b8a1617a1931ce3652c49ce/results.bin new file mode 100644 index 0000000..4c288ce --- /dev/null +++ b/library/build/.transforms/342b84e04b8a1617a1931ce3652c49ce/results.bin @@ -0,0 +1 @@ +i/debug_dex diff --git a/library/build/.transforms/3ea453ea54864eaf5b2e82cae56200f3/results.bin b/library/build/.transforms/3ea453ea54864eaf5b2e82cae56200f3/results.bin new file mode 100644 index 0000000..1ed65e0 --- /dev/null +++ b/library/build/.transforms/3ea453ea54864eaf5b2e82cae56200f3/results.bin @@ -0,0 +1 @@ +i/ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/results.bin b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/results.bin new file mode 100644 index 0000000..5ff383e --- /dev/null +++ b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/results.bin @@ -0,0 +1 @@ +o/debug diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/KeyPairBoolData.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/KeyPairBoolData.dex new file mode 100644 index 0000000..8b51b57 Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/KeyPairBoolData.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinner$1.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinner$1.dex new file mode 100644 index 0000000..0756706 Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinner$1.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinner.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinner.dex new file mode 100644 index 0000000..826975b Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinner.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerListener.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerListener.dex new file mode 100644 index 0000000..fa7e03c Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerListener.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$1.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$1.dex new file mode 100644 index 0000000..dbdc679 Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$1.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$2.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$2.dex new file mode 100644 index 0000000..96c41ae Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$2.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$LimitExceedListener.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$LimitExceedListener.dex new file mode 100644 index 0000000..bf3e79a Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$LimitExceedListener.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$1.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$1.dex new file mode 100644 index 0000000..9c75328 Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$1.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$2.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$2.dex new file mode 100644 index 0000000..bb3b026 Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$2.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$ViewHolder.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$ViewHolder.dex new file mode 100644 index 0000000..a29cb2b Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$ViewHolder.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter.dex new file mode 100644 index 0000000..cb94f4b Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch.dex new file mode 100644 index 0000000..9b30229 Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/MultiSpinnerSearch.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinner$1.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinner$1.dex new file mode 100644 index 0000000..ba63825 Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinner$1.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$1.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$1.dex new file mode 100644 index 0000000..61fe266 Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$1.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$ViewHolder.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$ViewHolder.dex new file mode 100644 index 0000000..92e906e Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$ViewHolder.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter.dex new file mode 100644 index 0000000..a270225 Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinner.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinner.dex new file mode 100644 index 0000000..a5df522 Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinner.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$1.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$1.dex new file mode 100644 index 0000000..6dc1d41 Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$1.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$2.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$2.dex new file mode 100644 index 0000000..fc02abe Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$2.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$1.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$1.dex new file mode 100644 index 0000000..7b96081 Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$1.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$2.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$2.dex new file mode 100644 index 0000000..275ed2b Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$2.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$ViewHolder.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$ViewHolder.dex new file mode 100644 index 0000000..09fc9e2 Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$ViewHolder.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter.dex new file mode 100644 index 0000000..20cb174 Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch.dex new file mode 100644 index 0000000..8e72a9d Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SingleSpinnerSearch.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SpinnerListener.dex b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SpinnerListener.dex new file mode 100644 index 0000000..735f61d Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/debug_dex/com/androidbuts/multispinnerfilter/SpinnerListener.dex differ diff --git a/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/desugar_graph.bin b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/desugar_graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/library/build/.transforms/a2841b4d6c808f25645c28ceeef64b03/transformed/debug/desugar_graph.bin differ diff --git a/library/build/.transforms/ac39e6495ea24aa413ae87816dbc476a/results.bin b/library/build/.transforms/ac39e6495ea24aa413ae87816dbc476a/results.bin new file mode 100644 index 0000000..0d259dd --- /dev/null +++ b/library/build/.transforms/ac39e6495ea24aa413ae87816dbc476a/results.bin @@ -0,0 +1 @@ +o/classes diff --git a/library/build/.transforms/ac39e6495ea24aa413ae87816dbc476a/transformed/classes/classes_dex/classes.dex b/library/build/.transforms/ac39e6495ea24aa413ae87816dbc476a/transformed/classes/classes_dex/classes.dex new file mode 100644 index 0000000..94af6a3 Binary files /dev/null and b/library/build/.transforms/ac39e6495ea24aa413ae87816dbc476a/transformed/classes/classes_dex/classes.dex differ diff --git a/library/build/.transforms/ad97815781a2bfc9647b462ed26fbc9d/results.bin b/library/build/.transforms/ad97815781a2bfc9647b462ed26fbc9d/results.bin new file mode 100644 index 0000000..1ed65e0 --- /dev/null +++ b/library/build/.transforms/ad97815781a2bfc9647b462ed26fbc9d/results.bin @@ -0,0 +1 @@ +i/ diff --git a/library/build/.transforms/b7b2c2d529328a31e1f4b376c44c107c/results.bin b/library/build/.transforms/b7b2c2d529328a31e1f4b376c44c107c/results.bin new file mode 100644 index 0000000..e3f0ff0 --- /dev/null +++ b/library/build/.transforms/b7b2c2d529328a31e1f4b376c44c107c/results.bin @@ -0,0 +1 @@ +i/classes_global-synthetics diff --git a/library/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml b/library/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml new file mode 100644 index 0000000..8d5055c --- /dev/null +++ b/library/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/library/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json b/library/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json new file mode 100644 index 0000000..51c8201 --- /dev/null +++ b/library/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json @@ -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" +} \ No newline at end of file diff --git a/library/build/intermediates/aar_metadata/debug/aar-metadata.properties b/library/build/intermediates/aar_metadata/debug/aar-metadata.properties new file mode 100644 index 0000000..1211b1e --- /dev/null +++ b/library/build/intermediates/aar_metadata/debug/aar-metadata.properties @@ -0,0 +1,6 @@ +aarFormatVersion=1.0 +aarMetadataVersion=1.0 +minCompileSdk=1 +minCompileSdkExtension=0 +minAndroidGradlePluginVersion=1.0.0 +coreLibraryDesugaringEnabled=false diff --git a/library/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/library/build/intermediates/annotation_processor_list/debug/annotationProcessors.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/library/build/intermediates/annotation_processor_list/debug/annotationProcessors.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/library/build/intermediates/compile_library_classes_jar/debug/classes.jar b/library/build/intermediates/compile_library_classes_jar/debug/classes.jar new file mode 100644 index 0000000..3f62458 Binary files /dev/null and b/library/build/intermediates/compile_library_classes_jar/debug/classes.jar differ diff --git a/library/build/intermediates/compile_r_class_jar/debug/R.jar b/library/build/intermediates/compile_r_class_jar/debug/R.jar new file mode 100644 index 0000000..9997c56 Binary files /dev/null and b/library/build/intermediates/compile_r_class_jar/debug/R.jar differ diff --git a/library/build/intermediates/compile_symbol_list/debug/R.txt b/library/build/intermediates/compile_symbol_list/debug/R.txt new file mode 100644 index 0000000..064f8f7 --- /dev/null +++ b/library/build/intermediates/compile_symbol_list/debug/R.txt @@ -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 diff --git a/library/build/intermediates/compiled_local_resources/debug/out/layout_activity_main.xml.flat b/library/build/intermediates/compiled_local_resources/debug/out/layout_activity_main.xml.flat new file mode 100644 index 0000000..97797cd Binary files /dev/null and b/library/build/intermediates/compiled_local_resources/debug/out/layout_activity_main.xml.flat differ diff --git a/library/build/intermediates/compiled_local_resources/debug/out/layout_alert_dialog_listview_search.xml.flat b/library/build/intermediates/compiled_local_resources/debug/out/layout_alert_dialog_listview_search.xml.flat new file mode 100644 index 0000000..18eb4fb Binary files /dev/null and b/library/build/intermediates/compiled_local_resources/debug/out/layout_alert_dialog_listview_search.xml.flat differ diff --git a/library/build/intermediates/compiled_local_resources/debug/out/layout_item_listview_multiple.xml.flat b/library/build/intermediates/compiled_local_resources/debug/out/layout_item_listview_multiple.xml.flat new file mode 100644 index 0000000..9011e66 Binary files /dev/null and b/library/build/intermediates/compiled_local_resources/debug/out/layout_item_listview_multiple.xml.flat differ diff --git a/library/build/intermediates/compiled_local_resources/debug/out/layout_item_listview_single.xml.flat b/library/build/intermediates/compiled_local_resources/debug/out/layout_item_listview_single.xml.flat new file mode 100644 index 0000000..8913d59 Binary files /dev/null and b/library/build/intermediates/compiled_local_resources/debug/out/layout_item_listview_single.xml.flat differ diff --git a/library/build/intermediates/compiled_local_resources/debug/out/layout_textview_for_spinner.xml.flat b/library/build/intermediates/compiled_local_resources/debug/out/layout_textview_for_spinner.xml.flat new file mode 100644 index 0000000..c1666f2 Binary files /dev/null and b/library/build/intermediates/compiled_local_resources/debug/out/layout_textview_for_spinner.xml.flat differ diff --git a/library/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/library/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties new file mode 100644 index 0000000..1d91ab6 --- /dev/null +++ b/library/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -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 diff --git a/library/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-v21/values-v21.xml b/library/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-v21/values-v21.xml new file mode 100644 index 0000000..8d5c618 --- /dev/null +++ b/library/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-v21/values-v21.xml @@ -0,0 +1,25 @@ + + + + + + + + + + \ No newline at end of file diff --git a/library/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml b/library/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml new file mode 100644 index 0000000..2e14dcc --- /dev/null +++ b/library/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml @@ -0,0 +1,47 @@ + + + #29CA97 + #06ACE4 + #747474 + #AAAAAA + #E1E2E2 + #000000 + #1589FF + #00FFFF + #D1D0CE + #ADD8E6 + #06ACE4 + #AAAAAA + #99979C + #E1E2E2 + #455FB6 + #3f51b5 + #303f9f + #E1E2E2 + #FF0000 + #F06292 + #686868 + #FFFFFF + 16dp + 16dp + Type to Search + + + + + \ No newline at end of file diff --git a/library/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/library/build/intermediates/incremental/debug/packageDebugResources/merger.xml new file mode 100644 index 0000000..c9ffcba --- /dev/null +++ b/library/build/intermediates/incremental/debug/packageDebugResources/merger.xml @@ -0,0 +1,34 @@ + +#29CA97#06ACE4#06ACE4#1589FF#FFFFFF#000000#D1D0CE#E1E2E2#3f51b5#E1E2E2#303f9f#F06292#FF0000#00FFFF#ADD8E6#686868#747474#AAAAAA#AAAAAA#E1E2E2#455FB6#99979C16dp16dpType to Search + + \ No newline at end of file diff --git a/library/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/library/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml new file mode 100644 index 0000000..f4f5939 --- /dev/null +++ b/library/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/library/build/intermediates/incremental/mergeDebugShaders/merger.xml b/library/build/intermediates/incremental/mergeDebugShaders/merger.xml new file mode 100644 index 0000000..ea0867d --- /dev/null +++ b/library/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/library/build/intermediates/incremental/packageDebugAssets/merger.xml b/library/build/intermediates/incremental/packageDebugAssets/merger.xml new file mode 100644 index 0000000..7db2116 --- /dev/null +++ b/library/build/intermediates/incremental/packageDebugAssets/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/library/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties b/library/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties index be79bfd..7bbfc2a 100644 --- a/library/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties +++ b/library/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties @@ -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/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 diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/KeyPairBoolData.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/KeyPairBoolData.class new file mode 100644 index 0000000..4905997 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/KeyPairBoolData.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinner$1.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinner$1.class new file mode 100644 index 0000000..c4d8e55 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinner$1.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinner.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinner.class new file mode 100644 index 0000000..d378884 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinner.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerListener.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerListener.class new file mode 100644 index 0000000..6be7d2b Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerListener.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$1.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$1.class new file mode 100644 index 0000000..e934a48 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$1.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$2.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$2.class new file mode 100644 index 0000000..a08139f Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$2.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$LimitExceedListener.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$LimitExceedListener.class new file mode 100644 index 0000000..c207ca9 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$LimitExceedListener.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$1.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$1.class new file mode 100644 index 0000000..b321d4c Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$1.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$2.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$2.class new file mode 100644 index 0000000..cb3a27b Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$2.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$ViewHolder.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$ViewHolder.class new file mode 100644 index 0000000..1271dc5 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$ViewHolder.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter.class new file mode 100644 index 0000000..b2aac88 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch.class new file mode 100644 index 0000000..e38746b Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/MultiSpinnerSearch.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinner$1.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinner$1.class new file mode 100644 index 0000000..2146677 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinner$1.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$1.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$1.class new file mode 100644 index 0000000..bd9b11a Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$1.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$ViewHolder.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$ViewHolder.class new file mode 100644 index 0000000..4d91701 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$ViewHolder.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter.class new file mode 100644 index 0000000..7a56345 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinner.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinner.class new file mode 100644 index 0000000..c6bd4b3 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinner.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$1.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$1.class new file mode 100644 index 0000000..03f2e92 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$1.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$2.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$2.class new file mode 100644 index 0000000..c512f0d Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$2.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$1.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$1.class new file mode 100644 index 0000000..b6ddcce Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$1.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$2.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$2.class new file mode 100644 index 0000000..d0ccdf6 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$2.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$ViewHolder.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$ViewHolder.class new file mode 100644 index 0000000..95d39dd Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$ViewHolder.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter.class new file mode 100644 index 0000000..e593289 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch.class new file mode 100644 index 0000000..1d5a5f8 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SingleSpinnerSearch.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SpinnerListener.class b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SpinnerListener.class new file mode 100644 index 0000000..1c962cd Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/androidbuts/multispinnerfilter/SpinnerListener.class differ diff --git a/library/build/intermediates/lint-cache/lintVitalAnalyzeRelease/maven.google/com/google/android/material/group-index.xml b/library/build/intermediates/lint-cache/lintVitalAnalyzeRelease/maven.google/com/google/android/material/group-index.xml index 0cbb48b..97ed9c7 100644 --- a/library/build/intermediates/lint-cache/lintVitalAnalyzeRelease/maven.google/com/google/android/material/group-index.xml +++ b/library/build/intermediates/lint-cache/lintVitalAnalyzeRelease/maven.google/com/google/android/material/group-index.xml @@ -3,5 +3,5 @@ - + diff --git a/library/build/intermediates/lint-cache/lintVitalAnalyzeRelease/maven.google/master-index.xml b/library/build/intermediates/lint-cache/lintVitalAnalyzeRelease/maven.google/master-index.xml index 1172485..44e03fd 100644 --- a/library/build/intermediates/lint-cache/lintVitalAnalyzeRelease/maven.google/master-index.xml +++ b/library/build/intermediates/lint-cache/lintVitalAnalyzeRelease/maven.google/master-index.xml @@ -130,6 +130,7 @@ + @@ -244,6 +245,7 @@ + diff --git a/library/build/intermediates/lint-cache/lintVitalAnalyzeRelease/sdk_index/snapshot.gz b/library/build/intermediates/lint-cache/lintVitalAnalyzeRelease/sdk_index/snapshot.gz index 55a204c..a28459b 100644 Binary files a/library/build/intermediates/lint-cache/lintVitalAnalyzeRelease/sdk_index/snapshot.gz and b/library/build/intermediates/lint-cache/lintVitalAnalyzeRelease/sdk_index/snapshot.gz differ diff --git a/library/build/intermediates/local_only_symbol_list/debug/R-def.txt b/library/build/intermediates/local_only_symbol_list/debug/R-def.txt new file mode 100644 index 0000000..32db838 --- /dev/null +++ b/library/build/intermediates/local_only_symbol_list/debug/R-def.txt @@ -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 diff --git a/library/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/library/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt new file mode 100644 index 0000000..9f8c817 --- /dev/null +++ b/library/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -0,0 +1,12 @@ +1 +2 +4 +5 +6 +7 +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 +9 +10 diff --git a/library/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/library/build/intermediates/merged_manifest/debug/AndroidManifest.xml new file mode 100644 index 0000000..8d5055c --- /dev/null +++ b/library/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/library/build/intermediates/navigation_json/debug/navigation.json b/library/build/intermediates/navigation_json/debug/navigation.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/library/build/intermediates/navigation_json/debug/navigation.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/library/build/intermediates/packaged_res/debug/layout/activity_main.xml b/library/build/intermediates/packaged_res/debug/layout/activity_main.xml new file mode 100644 index 0000000..d78e6bb --- /dev/null +++ b/library/build/intermediates/packaged_res/debug/layout/activity_main.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/library/build/intermediates/packaged_res/debug/layout/alert_dialog_listview_search.xml b/library/build/intermediates/packaged_res/debug/layout/alert_dialog_listview_search.xml new file mode 100644 index 0000000..5bd820e --- /dev/null +++ b/library/build/intermediates/packaged_res/debug/layout/alert_dialog_listview_search.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/library/build/intermediates/packaged_res/debug/layout/item_listview_multiple.xml b/library/build/intermediates/packaged_res/debug/layout/item_listview_multiple.xml new file mode 100644 index 0000000..8298262 --- /dev/null +++ b/library/build/intermediates/packaged_res/debug/layout/item_listview_multiple.xml @@ -0,0 +1,27 @@ + + + + + + + + \ No newline at end of file diff --git a/library/build/intermediates/packaged_res/debug/layout/item_listview_single.xml b/library/build/intermediates/packaged_res/debug/layout/item_listview_single.xml new file mode 100644 index 0000000..a05d532 --- /dev/null +++ b/library/build/intermediates/packaged_res/debug/layout/item_listview_single.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/library/build/intermediates/packaged_res/debug/layout/textview_for_spinner.xml b/library/build/intermediates/packaged_res/debug/layout/textview_for_spinner.xml new file mode 100644 index 0000000..0cd92c2 --- /dev/null +++ b/library/build/intermediates/packaged_res/debug/layout/textview_for_spinner.xml @@ -0,0 +1,13 @@ + + diff --git a/library/build/intermediates/packaged_res/debug/values-v21/values-v21.xml b/library/build/intermediates/packaged_res/debug/values-v21/values-v21.xml new file mode 100644 index 0000000..8d5c618 --- /dev/null +++ b/library/build/intermediates/packaged_res/debug/values-v21/values-v21.xml @@ -0,0 +1,25 @@ + + + + + + + + + + \ No newline at end of file diff --git a/library/build/intermediates/packaged_res/debug/values/values.xml b/library/build/intermediates/packaged_res/debug/values/values.xml new file mode 100644 index 0000000..2e14dcc --- /dev/null +++ b/library/build/intermediates/packaged_res/debug/values/values.xml @@ -0,0 +1,47 @@ + + + #29CA97 + #06ACE4 + #747474 + #AAAAAA + #E1E2E2 + #000000 + #1589FF + #00FFFF + #D1D0CE + #ADD8E6 + #06ACE4 + #AAAAAA + #99979C + #E1E2E2 + #455FB6 + #3f51b5 + #303f9f + #E1E2E2 + #FF0000 + #F06292 + #686868 + #FFFFFF + 16dp + 16dp + Type to Search + + + + + \ No newline at end of file diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/KeyPairBoolData.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/KeyPairBoolData.class new file mode 100644 index 0000000..4905997 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/KeyPairBoolData.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinner$1.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinner$1.class new file mode 100644 index 0000000..c4d8e55 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinner$1.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinner.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinner.class new file mode 100644 index 0000000..d378884 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinner.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerListener.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerListener.class new file mode 100644 index 0000000..6be7d2b Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerListener.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$1.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$1.class new file mode 100644 index 0000000..e934a48 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$1.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$2.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$2.class new file mode 100644 index 0000000..a08139f Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$2.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$LimitExceedListener.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$LimitExceedListener.class new file mode 100644 index 0000000..c207ca9 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$LimitExceedListener.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$1.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$1.class new file mode 100644 index 0000000..b321d4c Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$1.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$2.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$2.class new file mode 100644 index 0000000..cb3a27b Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$2.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$ViewHolder.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$ViewHolder.class new file mode 100644 index 0000000..1271dc5 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$ViewHolder.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter.class new file mode 100644 index 0000000..b2aac88 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch.class new file mode 100644 index 0000000..e38746b Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinner$1.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinner$1.class new file mode 100644 index 0000000..2146677 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinner$1.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$1.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$1.class new file mode 100644 index 0000000..bd9b11a Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$1.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$ViewHolder.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$ViewHolder.class new file mode 100644 index 0000000..4d91701 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$ViewHolder.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter.class new file mode 100644 index 0000000..7a56345 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinner.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinner.class new file mode 100644 index 0000000..c6bd4b3 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinner.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$1.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$1.class new file mode 100644 index 0000000..03f2e92 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$1.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$2.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$2.class new file mode 100644 index 0000000..c512f0d Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$2.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$1.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$1.class new file mode 100644 index 0000000..b6ddcce Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$1.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$2.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$2.class new file mode 100644 index 0000000..d0ccdf6 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$2.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$ViewHolder.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$ViewHolder.class new file mode 100644 index 0000000..95d39dd Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$ViewHolder.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter.class new file mode 100644 index 0000000..e593289 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch.class new file mode 100644 index 0000000..1d5a5f8 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SpinnerListener.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SpinnerListener.class new file mode 100644 index 0000000..1c962cd Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/androidbuts/multispinnerfilter/SpinnerListener.class differ diff --git a/library/build/intermediates/runtime_library_classes_jar/debug/classes.jar b/library/build/intermediates/runtime_library_classes_jar/debug/classes.jar new file mode 100644 index 0000000..6351d0a Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_jar/debug/classes.jar differ diff --git a/library/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt b/library/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt new file mode 100644 index 0000000..479ccc1 --- /dev/null +++ b/library/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt @@ -0,0 +1,45 @@ +com.androidbuts.multispinnerfilter +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 diff --git a/library/build/outputs/logs/manifest-merger-debug-report.txt b/library/build/outputs/logs/manifest-merger-debug-report.txt new file mode 100644 index 0000000..f0b6ff5 --- /dev/null +++ b/library/build/outputs/logs/manifest-merger-debug-report.txt @@ -0,0 +1,21 @@ +-- Merging decision tree log --- +manifest +ADDED from D:\LorealBa-LP-July-2025\library\src\main\AndroidManifest.xml:2:1-9:12 +INJECTED from D:\LorealBa-LP-July-2025\library\src\main\AndroidManifest.xml:2:1-9:12 + package + ADDED from D:\LorealBa-LP-July-2025\library\src\main\AndroidManifest.xml:3:5-49 + INJECTED from D:\LorealBa-LP-July-2025\library\src\main\AndroidManifest.xml + xmlns:android + ADDED from D:\LorealBa-LP-July-2025\library\src\main\AndroidManifest.xml:2:11-69 +application +ADDED from D:\LorealBa-LP-July-2025\library\src\main\AndroidManifest.xml:5:5-7:19 + android:allowBackup + ADDED from D:\LorealBa-LP-July-2025\library\src\main\AndroidManifest.xml:5:18-44 +uses-sdk +INJECTED from D:\LorealBa-LP-July-2025\library\src\main\AndroidManifest.xml reason: use-sdk injection requested +INJECTED from D:\LorealBa-LP-July-2025\library\src\main\AndroidManifest.xml +INJECTED from D:\LorealBa-LP-July-2025\library\src\main\AndroidManifest.xml + android:targetSdkVersion + INJECTED from D:\LorealBa-LP-July-2025\library\src\main\AndroidManifest.xml + android:minSdkVersion + INJECTED from D:\LorealBa-LP-July-2025\library\src\main\AndroidManifest.xml diff --git a/library/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/library/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin new file mode 100644 index 0000000..fbf39bb Binary files /dev/null and b/library/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ