AndroidNative2026/Haleon-Egypt-PD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added draft mode, delete image changes

Browse Source
This commit is contained in:
ravik
2025-03-13 16:20:37 +05:30
parent 883cbf0756
commit ffd20ef524
51 changed files with 262 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/modules.xml
Generated
+9 -9
View File
@@ -2,15 +2,15 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/modules/HALEON_KENYA_PD.iml" filepath="$PROJECT_DIR$/.idea/modules/HALEON_KENYA_PD.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/HALEON_KENYA_PD.GSKMTOrange.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/HALEON_KENYA_PD.GSKMTOrange.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/HALEON_KENYA_PD.GSKMTOrange.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/HALEON_KENYA_PD.GSKMTOrange.androidTest.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/HALEON_KENYA_PD.GSKMTOrange.main.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/HALEON_KENYA_PD.GSKMTOrange.main.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/HALEON_KENYA_PD.GSKMTOrange.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/HALEON_KENYA_PD.GSKMTOrange.unitTest.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/library/HALEON_KENYA_PD.library.iml" filepath="$PROJECT_DIR$/.idea/modules/library/HALEON_KENYA_PD.library.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/library/HALEON_KENYA_PD.library.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/library/HALEON_KENYA_PD.library.androidTest.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/library/HALEON_KENYA_PD.library.main.iml" filepath="$PROJECT_DIR$/.idea/modules/library/HALEON_KENYA_PD.library.main.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/library/HALEON_KENYA_PD.library.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/library/HALEON_KENYA_PD.library.unitTest.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/Haleon_Kenya_pd-git.iml" filepath="$PROJECT_DIR$/.idea/modules/Haleon_Kenya_pd-git.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/Haleon_Kenya_pd-git.GSKMTOrange.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/Haleon_Kenya_pd-git.GSKMTOrange.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/Haleon_Kenya_pd-git.GSKMTOrange.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/Haleon_Kenya_pd-git.GSKMTOrange.androidTest.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/Haleon_Kenya_pd-git.GSKMTOrange.main.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/Haleon_Kenya_pd-git.GSKMTOrange.main.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/Haleon_Kenya_pd-git.GSKMTOrange.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/Haleon_Kenya_pd-git.GSKMTOrange.unitTest.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/library/Haleon_Kenya_pd-git.library.iml" filepath="$PROJECT_DIR$/.idea/modules/library/Haleon_Kenya_pd-git.library.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/library/Haleon_Kenya_pd-git.library.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/library/Haleon_Kenya_pd-git.library.androidTest.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/library/Haleon_Kenya_pd-git.library.main.iml" filepath="$PROJECT_DIR$/.idea/modules/library/Haleon_Kenya_pd-git.library.main.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/library/Haleon_Kenya_pd-git.library.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/library/Haleon_Kenya_pd-git.library.unitTest.iml" />
</modules>
</component>
</project>
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+106 -11
View File
@@ -4693,7 +4693,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
Cursor dbcursor = null;
try {
if (key_account_id != null) {
dbcursor = db.rawQuery("SELECT DISTINCT ifnull(T.IRPD_IMAGES,'')as IRPD_IMAGES, ifnull(SB.PD_SUB_CATEGORY_CODE,'')AS PD_SUB_CATEGORY_CODE,SB.SUB_CATEGORY_ID, MIA.IMAGE_ALLOW,SB.SUB_CATEGORY FROM "
dbcursor = db.rawQuery("SELECT DISTINCT ifnull(T.IRPD_IMAGES,'')as IRPD_IMAGES,ifnull(T.IRPD_IMAGES_MODIFY,'')as IRPD_IMAGES_MODIFY, ifnull(SB.PD_SUB_CATEGORY_CODE,'')AS PD_SUB_CATEGORY_CODE,SB.SUB_CATEGORY_ID, MIA.IMAGE_ALLOW,SB.SUB_CATEGORY FROM "
+ tableName + " M INNER JOIN SKU_MASTER SK ON M.SKU_ID = SK.SKU_ID" +
" INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID" +
" INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID" +
@@ -4706,20 +4706,16 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"' AND M.CLASS_ID = '" + class_id + "' AND CA.CATEGORY_ID = '" + categoryId + "'", null);
} else {
dbcursor = db.rawQuery("SELECT DISTINCT ifnull(T.IRPD_IMAGES,'')as IRPD_IMAGES,ifnull(SB.PD_SUB_CATEGORY_CODE,'')AS PD_SUB_CATEGORY_CODE,SB.SUB_CATEGORY_ID, MIA.IMAGE_ALLOW,SB.SUB_CATEGORY FROM MAPPING_STOCK_STOREWISE M INNER JOIN SKU_MASTER SK ON M.SKU_ID = SK.SKU_ID" +
dbcursor = db.rawQuery("SELECT DISTINCT ifnull(T.IRPD_IMAGES,'')as IRPD_IMAGES,ifnull(T.IRPD_IMAGES_MODIFY,'')as IRPD_IMAGES_MODIFY,ifnull(SB.PD_SUB_CATEGORY_CODE,'')AS PD_SUB_CATEGORY_CODE,SB.SUB_CATEGORY_ID, MIA.IMAGE_ALLOW,SB.SUB_CATEGORY FROM MAPPING_STOCK_STOREWISE M INNER JOIN SKU_MASTER SK ON M.SKU_ID = SK.SKU_ID" +
" INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID" +
" INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID" +
" INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID" +
" INNER JOIN MAPPING_SUB_CATEGORY_IMAGE_ALLOW MIA ON SB.SUB_CATEGORY_ID=MIA.SUB_CATEGORY_ID " +
" LEFT JOIN (SELECT * FROM " + CommonString.TABLE_IRPD + " WHERE " + CommonString.KEY_STORE_ID + "=" + store_id +
" AND " + CommonString.KEY_CATEGORY_ID + "=" + categoryId + " AND " + CommonString.KEY_VISIT_DATE + "='" + visit_date +
"') AS T ON T.CATEGORY_ID=CA.CATEGORY_ID AND T.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
"WHERE M.STORE_ID = '" + store_id + "' AND CA.CATEGORY_ID = '" + categoryId + "'", null);
}
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
@@ -4728,10 +4724,33 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
CPGS.setSUB_CATEGORY_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
CPGS.setImage_allow(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE_ALLOW")));
CPGS.setSubCatCode(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PD_SUB_CATEGORY_CODE")));
String imgs = dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IRPD_IMAGES));
/* String imgs = dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IRPD_IMAGES));
// String imgs_modify = dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IRPD_MODIFY_IMAGES));
CPGS.setImageUris(imgs != null && !imgs.isEmpty() ? (ArrayList<ImageUri>) Arrays.stream(imgs.split(", "))
.map(img -> new ImageUri(img, new File(img).getName())) // Extract file name as second parameter
.collect(Collectors.toList()) : new ArrayList<>());
.collect(Collectors.toList()) : new ArrayList<>());*/
// Retrieve image URIs from database
String imgs = dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IRPD_IMAGES));
String imgs_modify = dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IRPD_MODIFY_IMAGES));
// Split and map URIs and Modify URIs separately
List<String> imageUris = imgs != null && !imgs.isEmpty()
? Arrays.stream(imgs.split(", ")).collect(Collectors.toList())
: new ArrayList<>();
List<String> modifyUris = imgs_modify != null && !imgs_modify.isEmpty()
? Arrays.stream(imgs_modify.split(", ")).collect(Collectors.toList())
: new ArrayList<>();
// Create ImageUri objects with original URI and Modify URI
ArrayList<ImageUri> imageUriList = new ArrayList<>();
for (int i = 0; i < imageUris.size(); i++) {
String uri = imageUris.get(i);
String modifyUri = (i < modifyUris.size()) ? modifyUris.get(i) : uri; // Fallback to original if no modify URI
imageUriList.add(new ImageUri(uri, modifyUri));
}
CPGS.setImageUris(imageUriList);
CPGS.setSubCategoryCamera1("");
CPGS.setSubCategoryCamera2("");
@@ -10533,7 +10552,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
public long InsertPdImageData(
String visit_date, String storeId, String categoryId, List<CategoryPictureGetterSetter> _list) {
String visit_date, String storeId, String categoryId, List<CategoryPictureGetterSetter> _list,String savemode) {
ContentValues values = new ContentValues();
long l = 0;
try {
@@ -10543,6 +10562,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.beginTransaction();
for (int i = 0; i < _list.size(); i++) {
values.put(CommonString.KEY_SAVE_MODE, savemode);
values.put(CommonString.KEY_STORE_ID, storeId);
values.put(CommonString.KEY_VISIT_DATE, visit_date);
values.put(CommonString.KEY_CATEGORY_ID, categoryId);
@@ -10552,8 +10572,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put(CommonString.KEY_IRPD_IMAGES, _list.get(i).getImageUris().stream().map(ImageUri::getUri).collect(Collectors.toList()).stream().collect(Collectors.joining(", ")));
values.put(CommonString.KEY_IRPD_MODIFY_IMAGES, _list.get(i).getImageUris().stream().map(ImageUri::getModify_uri).collect(Collectors.toList()).stream().collect(Collectors.joining(", ")));
l = db.insert(CommonString.TABLE_IRPD, null, values);
Log.e("data_d", info.toString());
Log.e("data_d", values.toString());
Log.e("data_d", info.toString() + ","+_list.get(i).getImageUris().size());
// Log.e("data_d", values.toString());
}
db.setTransactionSuccessful();
db.endTransaction();
@@ -10565,6 +10585,81 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public boolean isSOS(String store_id, String date, String mode) {
boolean filled = false;
Cursor dbcursor = null;
try {
String query = "";
if (mode != null) {
query = "SELECT * FROM " + CommonString.TABLE_IRPD + " WHERE "
+ CommonString.KEY_STORE_ID + " =" + store_id + " AND "
+ CommonString.KEY_VISIT_DATE + " ='" + date + "'";
} else {
}
dbcursor = db.rawQuery(query, null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
String common_status = dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SAVE_MODE));
if (mode != null) {
if (common_status != null && !common_status.equals("") && common_status.equalsIgnoreCase(CommonString.KEY_COMPELETE)) {
filled = true;
} else {
filled = false;
break;
}
}
dbcursor.moveToNext();
}
dbcursor.close();
}
} catch (Exception e) {
return filled;
}
return filled;
}
public boolean isSOSCategory(String store_id, String date, String mode, String categoryId) {
boolean filled = false;
Cursor dbcursor = null;
try {
String query = "";
if (mode != null) {
query = "SELECT * FROM " + CommonString.TABLE_IRPD + " WHERE "
+ CommonString.KEY_STORE_ID + " =" + store_id + " AND "
+ CommonString.KEY_CATEGORY_ID + " =" + categoryId + " AND "
+ CommonString.KEY_VISIT_DATE + " ='" + date + "'";
} else {
}
dbcursor = db.rawQuery(query, null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
String common_status = dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SAVE_MODE));
if (mode != null) {
if (common_status != null && !common_status.equals("") && common_status.equalsIgnoreCase(CommonString.KEY_COMPELETE)) {
filled = true;
} else {
filled = false;
break;
}
}
dbcursor.moveToNext();
}
dbcursor.close();
}
} catch (Exception e) {
return filled;
}
return filled;
}
public ArrayList<CategoryPictureGetterSetter> getIrPDforUpload(String store_id, String visit_date) {
ArrayList<CategoryPictureGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/adapter/SavedImagesAdapter.kt
+2
View File
@@ -1,6 +1,7 @@
package cpm.com.gskmtorange.adapter
import android.content.Context
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@@ -24,6 +25,7 @@ class SavedImagesAdapter(private val context: Context, private val images: List<
}
override fun onBindViewHolder(holder: SavedImageViewHolder, position: Int) {
Log.d("imagedata",images[position].uri)
imgPreviewwithError(
context = context,
url = images[position].uri,
GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+5
View File
@@ -18,6 +18,9 @@ public class CommonString {
public static final String KEY_DATE = "date";
public static final String KEY_COUNTRY_ID = "COUNTRY_ID";
public static final String KEY_STOREVISITED_STATUS = "STOREVISITED_STATUS";
public static final String KEY_SAVE_MODE = "SAVE_MODE";
public static final String KEY_DRAFT = "DRAFT";
public static final String KEY_COMPELETE = "COMPELETE";
public static final String KEY_PATH = "path";
@@ -1546,6 +1549,8 @@ public class CommonString {
+ " INTEGER,"
+ KEY_VISIT_DATE
+ " VARCHAR,"
+ KEY_SAVE_MODE
+ " VARCHAR,"
+ KEY_CATEGORY_ID
+ " INTEGER,"
+ KEY_SUB_CATEGORY_ID
GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonUtils.kt
+16 -10
View File
@@ -2,8 +2,10 @@ package cpm.com.gskmtorange.constant
import android.content.Context
import android.net.Uri
import android.util.Log
import android.util.Patterns
import android.widget.ImageView
import android.widget.Toast
import androidx.swiperefreshlayout.widget.CircularProgressDrawable
import com.bumptech.glide.Glide
import com.bumptech.glide.Priority
@@ -20,7 +22,6 @@ object CommonUtils {
}
}
}
fun imgPreviewwithError(context: Context, url: String, imgView: ImageView, resId: Int) {
val circularProgressDrawable = CircularProgressDrawable(context).apply {
strokeWidth = 5f
@@ -32,6 +33,12 @@ object CommonUtils {
.diskCacheStrategy(DiskCacheStrategy.ALL).priority(Priority.HIGH)
Glide.with(context).load(url).apply(options).into(imgView)
/* Glide.with(context).load(url).apply(options).into(imgView)
Glide.get(context).clearMemory()*/
// Clear disk cache in a background thread
/* Thread {
Glide.get(context).clearDiskCache()
}.start()*/
}
fun isValidUrl(url: String): Boolean {
@@ -39,18 +46,17 @@ object CommonUtils {
}
fun deleteSpecificImage(context: Context,filePath: String?) {
val file = File(context.filesDir, "")
// val file = File(context.filesDir, "")
if (!filePath.isNullOrEmpty()) {
val file = File(filePath)
val file = File(filePath)
//Log.d("filedatanew", file.toString());
if (file.exists()) {
val directory = file.parent // Get the directory path
val imageName = file.name // Get the image file name
println("Directory: $directory")
println("Image Name: $imageName")
if (file.delete()) {
println("File deleted successfully: $filePath")
val isDeleted = file.delete()
if (isDeleted) {
Log.d("deletefile","File deleted successfully");
// Toast.makeText(context, "File deleted successfully", Toast.LENGTH_SHORT).show()
} else {
println("Failed to delete file: $filePath")
println("Failed to delete file")
}
} else {
println("File does not exist: $filePath")
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java
+6
View File
@@ -10,6 +10,8 @@ import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.preference.PreferenceManager;
import android.view.View;
import android.widget.ProgressBar;
@@ -143,6 +145,10 @@ public class CheckoutActivity extends AppCompatActivity {
if (result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
deleteIRURl();
/* new Handler(Looper.getMainLooper()).postDelayed({
notifyDataSetChanged()
}, 5000);*/
db.open();
db.updateCheckoutOuttime(store_id, CommonFunctions.getCurrentTimeWithLanguage(context), CommonString.KEY_Y, checkOutImagePath);
SharedPreferences.Editor editor = preferences.edit();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/PDimageActivity.kt
+4 -5
View File
@@ -28,7 +28,6 @@ import com.sj.camera_lib_android.models.ImageUploadModel
import com.sj.camera_lib_android.utils.CameraSDK
import cpm.com.gskmtorange.Database.GSKOrangeDB
import cpm.com.gskmtorange.GetterSetter.CategoryPictureGetterSetter
import cpm.com.gskmtorange.LoginActivity
import cpm.com.gskmtorange.R
import cpm.com.gskmtorange.adapter.SubCatPdAdapter
import cpm.com.gskmtorange.adapter.data.ImageUri
@@ -112,7 +111,7 @@ class PDimageActivity : AppCompatActivity() {
.setPositiveButton(getString(R.string.yes)) { dialog, _ ->
// Handle Yes button click
db?.open()
db?.InsertPdImageData(date, store_id, categoryId, listdat)?.let {
db?.InsertPdImageData(date, store_id, categoryId, listdat,CommonString.KEY_COMPELETE)?.let {
if (it > 0) {
Snackbar.make(
binding.fab,
@@ -228,7 +227,6 @@ class PDimageActivity : AppCompatActivity() {
store_id + "_" + username?.replace(".", "") + "_IRPDIMG-" + File(
item.uri
).getName()
savedImages.add(ImageUri(uri = item.uri, modify_uri = setName))
savefile(Uri.parse(item.uri), "$dir $setName")
}
@@ -345,7 +343,9 @@ class PDimageActivity : AppCompatActivity() {
override fun onPause() {
super.onPause()
db?.open()
db?.InsertPdImageData(date, store_id, categoryId, listdat)
if (!db!!.isSOSCategory(store_id, date, CommonString.KEY_COMPELETE,categoryId)) {
db?.InsertPdImageData(date, store_id, categoryId,listdat,CommonString.KEY_DRAFT)
}
}
private fun checkAndRequestPermissions() {
@@ -389,7 +389,6 @@ class PDimageActivity : AppCompatActivity() {
grantResults: IntArray
) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults)
if (requestCode == PERMISSION_ALL) {
val perms: MutableMap<String, Int> = HashMap()
// Initialize the map with both permissions
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+2 -2
View File
@@ -287,7 +287,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
mGoogleApiClient = new GoogleApiClient.Builder(this).addConnectionCallbacks(this).addOnConnectionFailedListener(this).addApi(LocationServices.API).build();
}
deleteIRURl();
// deleteIRURl();
}
private void deleteIRURl() {
@@ -299,7 +299,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
if (uris != null && !uris.isEmpty()) {
for (int k = 0; k < uris.size(); k++) {
CommonUtils.INSTANCE.deleteSpecificImage(this,uris.get(k).getUri());
CommonUtils.INSTANCE. deleteImage(this,uris.get(k).getUri());
// CommonUtils.INSTANCE. deleteImage(this,uris.get(k).getUri());
}
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
+3 -3
View File
@@ -282,12 +282,12 @@ public class CategoryListActivity extends AppCompatActivity {
//// IR PD images handling by jp
ArrayList<CategoryPictureGetterSetter> irList = isPdIRMapping(category_id);
if (irList != null && !irList.isEmpty() && camera_allow.equals("1")) {
flag = db.isFilledIRPDdata(store_id, visit_date, category_id);
//flag = db.isFilledIRPDdata(store_id, visit_date, category_id);
// flag = db.isSOS(store_id, date, CommonString.KEY_COMPELETE);
flag = db.isSOSCategory(store_id, visit_date, CommonString.KEY_COMPELETE, category_id);
} else {
flag = true;
}
flag_filled = flag;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
+71 -1
View File
@@ -16,6 +16,7 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
@@ -24,6 +25,7 @@ import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -34,8 +36,10 @@ import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter;
import cpm.com.gskmtorange.GetterSetter.CategoryPictureGetterSetter;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.adapter.data.ImageUri;
import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.constant.CommonUtils;
import cpm.com.gskmtorange.dailyentry.AdditionalPromoSKUwiseActivity;
import cpm.com.gskmtorange.dailyentry.AdditionalVisibility;
import cpm.com.gskmtorange.dailyentry.AuditActivity;
@@ -82,6 +86,8 @@ public class DailyDataMenuActivity extends AppCompatActivity {
db.open();
context = this;
//preference data
//deletefile(context);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
@@ -106,6 +112,7 @@ public class DailyDataMenuActivity extends AppCompatActivity {
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
db.open();
deleteIRURl(context);
visittypelist = db.getInsertedVisitType(store_id, visit_date, "3");
if (visittypelist.size() > 0) {
if (visittypelist.get(0).getVISIT_TYPE_ID().equals("3")) {
@@ -117,6 +124,66 @@ public class DailyDataMenuActivity extends AppCompatActivity {
}
}
private void deleteIRURl(Context context) {
try {
ArrayList<CategoryPictureGetterSetter> irList = db.getIrPDforUpload(store_id, visit_date);
Log.d("irlistsize", String.valueOf(irList));
if (irList != null && !irList.isEmpty()) {
for (int i = 0; i < irList.size(); i++) {
ArrayList<ImageUri> uris = irList.get(i).getImageUris();
if (uris != null && !uris.isEmpty()) {
for (int k = 0; k < uris.size(); k++) {
// CommonUtils.INSTANCE.deleteSpecificImage(this,uris.get(k).getUri());
deleteSpecificImage(context,uris.get(k).getUri());
}
}
}
}
} catch (Exception e) {
e.fillInStackTrace();
}
}
private void deleteSpecificImage(Context context, String uri) {
// Path to the file in app-specific internal storage
String filePath = uri;
Log.d("filepath",filePath);
// Create a File object
File file = new File(filePath);
// Check if the file exists and delete it
if (file.exists()) {
boolean isDeleted = file.delete();
if (isDeleted) {
Toast.makeText(context, "File deleted successfully", Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(context, "Failed to delete the file", Toast.LENGTH_SHORT).show();
}
} else {
Toast.makeText(context, "File does not exist", Toast.LENGTH_SHORT).show();
}
}
private void deletefile(Context context) {
// Path to the file in app-specific internal storage
String filePath = context.getFilesDir().getAbsolutePath() + "/e462845c-0dc4-4aa0-9066-6334d33af7d8_1.jpg";
Log.d("filepathnew",filePath);
// Create a File object
File file = new File(filePath);
// Check if the file exists and delete it
if (file.exists()) {
boolean isDeleted = file.delete();
if (isDeleted) {
Toast.makeText(context, "File deleted successfully", Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(context, "Failed to delete the file", Toast.LENGTH_SHORT).show();
}
} else {
Toast.makeText(context, "File does not exist", Toast.LENGTH_SHORT).show();
}
}
@Override
protected void onResume() {
super.onResume();
@@ -428,7 +495,10 @@ public class DailyDataMenuActivity extends AppCompatActivity {
if (ir_list != null && !ir_list.isEmpty() && camera_allow.equals("1")) {
data.setCategory_img(R.mipmap.picturecatogory);
db.open();
if (db.isFilledIRPDdata(store_id, visit_date, categoryId)) {
/*if (db.isFilledIRPDdata(store_id, visit_date, categoryId)) {
data.setCategory_img(R.mipmap.picturecatogory_done);
}*/
if (db.isSOSCategory(store_id, visit_date, CommonString.KEY_COMPELETE,categoryId)){
data.setCategory_img(R.mipmap.picturecatogory_done);
}
} else {
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/results.bin
+1
View File
@@ -0,0 +1 @@
o/debug
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/BuildConfig.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/KeyPairBoolData.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/MultiSpinner$1.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/MultiSpinner.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/MultiSpinnerListener.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$1.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$2.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$LimitExceedListener.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$1.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$2.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter$ViewHolder.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch$MyAdapter.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/MultiSpinnerSearch.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/SingleSpinner$1.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$1.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter$ViewHolder.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/SingleSpinner$MyAdapter.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/SingleSpinner.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$1.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$2.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$1.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$2.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter$ViewHolder.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch$MyAdapter.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/SingleSpinnerSearch.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/debug/com/androidbuts/multispinnerfilter/SpinnerListener.dex
BIN
View File
Binary file not shown.
library/build/.transforms/0e876c0592886a1e1df37aca57b140fd/transformed/desugar_graph.bin
BIN
View File
Binary file not shown.
library/build/.transforms/b8f856f97b93c6d43b8a39b00aae3f19/results.bin
+1
View File
@@ -0,0 +1 @@
i/
library/build/intermediates/compiled_local_resources/debug/out/layout_activity_main.xml.flat
BIN
View File
Binary file not shown.
library/build/intermediates/compiled_local_resources/debug/out/layout_alert_dialog_listview_search.xml.flat
BIN
View File
Binary file not shown.
library/build/intermediates/compiled_local_resources/debug/out/layout_item_listview_multiple.xml.flat
BIN
View File
Binary file not shown.
library/build/intermediates/compiled_local_resources/debug/out/layout_item_listview_single.xml.flat
BIN
View File
Binary file not shown.
library/build/intermediates/compiled_local_resources/debug/out/layout_textview_for_spinner.xml.flat
BIN
View File
Binary file not shown.
library/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
+6 -6
View File
@@ -1,6 +1,6 @@
#Fri Mar 07 18:11:12 IST 2025
com.androidbuts.multispinnerfilter.library-main-7\:/layout/alert_dialog_listview_search.xml=D\:\\jeevanp_cpm_projects\\FromRavi\\Haleon_Kenya_pd\\HALEON_KENYA_PD\\library\\build\\intermediates\\packaged_res\\debug\\layout\\alert_dialog_listview_search.xml
com.androidbuts.multispinnerfilter.library-main-7\:/layout/activity_main.xml=D\:\\jeevanp_cpm_projects\\FromRavi\\Haleon_Kenya_pd\\HALEON_KENYA_PD\\library\\build\\intermediates\\packaged_res\\debug\\layout\\activity_main.xml
com.androidbuts.multispinnerfilter.library-main-7\:/layout/item_listview_single.xml=D\:\\jeevanp_cpm_projects\\FromRavi\\Haleon_Kenya_pd\\HALEON_KENYA_PD\\library\\build\\intermediates\\packaged_res\\debug\\layout\\item_listview_single.xml
com.androidbuts.multispinnerfilter.library-main-7\:/layout/item_listview_multiple.xml=D\:\\jeevanp_cpm_projects\\FromRavi\\Haleon_Kenya_pd\\HALEON_KENYA_PD\\library\\build\\intermediates\\packaged_res\\debug\\layout\\item_listview_multiple.xml
com.androidbuts.multispinnerfilter.library-main-7\:/layout/textview_for_spinner.xml=D\:\\jeevanp_cpm_projects\\FromRavi\\Haleon_Kenya_pd\\HALEON_KENYA_PD\\library\\build\\intermediates\\packaged_res\\debug\\layout\\textview_for_spinner.xml
#Mon Mar 10 13:35:42 IST 2025
com.androidbuts.multispinnerfilter.library-main-7\:/layout/alert_dialog_listview_search.xml=D\:\\Haleon_Kenya_pd-git\\library\\build\\intermediates\\packaged_res\\debug\\layout\\alert_dialog_listview_search.xml
com.androidbuts.multispinnerfilter.library-main-7\:/layout/activity_main.xml=D\:\\Haleon_Kenya_pd-git\\library\\build\\intermediates\\packaged_res\\debug\\layout\\activity_main.xml
com.androidbuts.multispinnerfilter.library-main-7\:/layout/item_listview_single.xml=D\:\\Haleon_Kenya_pd-git\\library\\build\\intermediates\\packaged_res\\debug\\layout\\item_listview_single.xml
com.androidbuts.multispinnerfilter.library-main-7\:/layout/item_listview_multiple.xml=D\:\\Haleon_Kenya_pd-git\\library\\build\\intermediates\\packaged_res\\debug\\layout\\item_listview_multiple.xml
com.androidbuts.multispinnerfilter.library-main-7\:/layout/textview_for_spinner.xml=D\:\\Haleon_Kenya_pd-git\\library\\build\\intermediates\\packaged_res\\debug\\layout\\textview_for_spinner.xml
library/build/intermediates/incremental/debug/packageDebugResources/merger.xml
+4 -4
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res"/><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\build\generated\res\rs\debug"/><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res"><file name="activity_main" path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\layout\activity_main.xml" qualifiers="" type="layout"/><file name="alert_dialog_listview_search" path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\layout\alert_dialog_listview_search.xml" qualifiers="" type="layout"/><file name="item_listview_multiple" path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\layout\item_listview_multiple.xml" qualifiers="" type="layout"/><file name="item_listview_single" path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\layout\item_listview_single.xml" qualifiers="" type="layout"/><file name="textview_for_spinner" path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\layout\textview_for_spinner.xml" qualifiers="" type="layout"/><file path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\values\colors.xml" qualifiers=""><color name="ColorPrimary">#29CA97</color><color name="ColorPrimaryDark">#06ACE4</color><color name="list_background">#06ACE4</color><color name="blue">#1589FF</color><color name="white">#FFFFFF</color><color name="black">#000000</color><color name="gray">#D1D0CE</color><color name="background_color">#E1E2E2</color><color name="primary">#3f51b5</color><color name="primary_pressed">#E1E2E2</color><color name="primary_dark">#303f9f</color><color name="ripple">#F06292</color><color name="red">#FF0000</color><color name="cyan">#00FFFF</color><color name="lightBlue">#ADD8E6</color><color name="text_color">#686868</color><color name="android_text_color">#747474</color><color name="app_topbar_color">#AAAAAA</color><color name="list_even">#AAAAAA</color><color name="list_odd">#E1E2E2</color><color name="list_selected">#455FB6</color><color name="list_header">#99979C</color></file><file path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\values\dimens.xml" qualifiers=""><dimen name="activity_horizontal_margin">16dp</dimen><dimen name="activity_vertical_margin">16dp</dimen></file><file path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\values\strings.xml" qualifiers=""><string name="type_to_search">Type to Search</string></file><file path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\values\styles.xml" qualifiers=""><style name="MaterialSpinner" parent="Widget.AppCompat.Spinner">
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\main\res"/><source path="D:\Haleon_Kenya_pd-git\library\build\generated\res\rs\debug"/><source path="D:\Haleon_Kenya_pd-git\library\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\main\res"><file name="activity_main" path="D:\Haleon_Kenya_pd-git\library\src\main\res\layout\activity_main.xml" qualifiers="" type="layout"/><file name="alert_dialog_listview_search" path="D:\Haleon_Kenya_pd-git\library\src\main\res\layout\alert_dialog_listview_search.xml" qualifiers="" type="layout"/><file name="item_listview_multiple" path="D:\Haleon_Kenya_pd-git\library\src\main\res\layout\item_listview_multiple.xml" qualifiers="" type="layout"/><file name="item_listview_single" path="D:\Haleon_Kenya_pd-git\library\src\main\res\layout\item_listview_single.xml" qualifiers="" type="layout"/><file name="textview_for_spinner" path="D:\Haleon_Kenya_pd-git\library\src\main\res\layout\textview_for_spinner.xml" qualifiers="" type="layout"/><file path="D:\Haleon_Kenya_pd-git\library\src\main\res\values\colors.xml" qualifiers=""><color name="ColorPrimary">#29CA97</color><color name="ColorPrimaryDark">#06ACE4</color><color name="list_background">#06ACE4</color><color name="blue">#1589FF</color><color name="white">#FFFFFF</color><color name="black">#000000</color><color name="gray">#D1D0CE</color><color name="background_color">#E1E2E2</color><color name="primary">#3f51b5</color><color name="primary_pressed">#E1E2E2</color><color name="primary_dark">#303f9f</color><color name="ripple">#F06292</color><color name="red">#FF0000</color><color name="cyan">#00FFFF</color><color name="lightBlue">#ADD8E6</color><color name="text_color">#686868</color><color name="android_text_color">#747474</color><color name="app_topbar_color">#AAAAAA</color><color name="list_even">#AAAAAA</color><color name="list_odd">#E1E2E2</color><color name="list_selected">#455FB6</color><color name="list_header">#99979C</color></file><file path="D:\Haleon_Kenya_pd-git\library\src\main\res\values\dimens.xml" qualifiers=""><dimen name="activity_horizontal_margin">16dp</dimen><dimen name="activity_vertical_margin">16dp</dimen></file><file path="D:\Haleon_Kenya_pd-git\library\src\main\res\values\strings.xml" qualifiers=""><string name="type_to_search">Type to Search</string></file><file path="D:\Haleon_Kenya_pd-git\library\src\main\res\values\styles.xml" qualifiers=""><style name="MaterialSpinner" parent="Widget.AppCompat.Spinner">
<item name="rd_style">@style/Material.Drawable.Ripple.Wave.Light</item>
<item name="spn_labelEnable">true</item>
<item name="spn_labelTextSize">18sp</item>
@@ -14,9 +14,9 @@
<item name="android:maxLines">1</item>
<item name="android:scrollHorizontally">true</item>
<item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
</style></file><file path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\values-v21\attrs.xml" qualifiers="v21"><declare-styleable name="MultiSpinnerSearch">
</style></file><file path="D:\Haleon_Kenya_pd-git\library\src\main\res\values-v21\attrs.xml" qualifiers="v21"><declare-styleable name="MultiSpinnerSearch">
<attr format="string" name="hintText"/>
</declare-styleable></file><file path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\res\values-v21\styles.xml" qualifiers="v21"><style name="MaterialSpinner" parent="Material.Widget.Spinner">
</declare-styleable></file><file path="D:\Haleon_Kenya_pd-git\library\src\main\res\values-v21\styles.xml" qualifiers="v21"><style name="MaterialSpinner" parent="Material.Widget.Spinner">
<item name="rd_style">@style/Material.Drawable.Ripple.Wave.Light</item>
<item name="spn_labelEnable">true</item>
<item name="spn_labelTextSize">18sp</item>
@@ -31,4 +31,4 @@
<item name="android:maxLines">1</item>
<item name="android:scrollHorizontally">true</item>
<item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
</style></file></source><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\build\generated\res\rs\debug"/><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
</style></file></source><source path="D:\Haleon_Kenya_pd-git\library\build\generated\res\rs\debug"/><source path="D:\Haleon_Kenya_pd-git\library\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
library/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+1 -1
View File
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\debug\jniLibs"/></dataSet></merger>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\debug\jniLibs"/></dataSet></merger>
library/build/intermediates/incremental/mergeDebugShaders/merger.xml
+1 -1
View File
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\debug\shaders"/></dataSet></merger>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\debug\shaders"/></dataSet></merger>
library/build/intermediates/incremental/packageDebugAssets/merger.xml
+1 -1
View File
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\assets"/><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\debug\assets"/></dataSet></merger>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\main\assets"/><source path="D:\Haleon_Kenya_pd-git\library\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Kenya_pd-git\library\src\debug\assets"/></dataSet></merger>
library/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+3 -3
View File
@@ -3,11 +3,11 @@
3 package="com.androidbuts.multispinnerfilter" >
4
5 <uses-sdk android:minSdkVersion="20" />
5-->D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml
5-->D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml
6
7 <application android:allowBackup="true" >
7-->D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml:5:5-7:19
7-->D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml:5:18-44
7-->D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml:5:5-7:19
7-->D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml:5:18-44
8 </application>
9
10</manifest>
library/build/outputs/logs/manifest-merger-debug-report.txt
+20 -20
View File
@@ -1,29 +1,29 @@
-- Merging decision tree log ---
manifest
ADDED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml:2:1-9:12
ADDED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml:2:1-9:12
package
ADDED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml:3:5-49
INJECTED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml
INJECTED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml
ADDED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml:3:5-49
INJECTED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml
INJECTED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml
xmlns:android
ADDED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml:2:11-69
ADDED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml:2:11-69
application
ADDED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml:5:5-7:19
ADDED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml:5:5-7:19
android:allowBackup
ADDED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml:5:18-44
ADDED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml:5:18-44
uses-sdk
INJECTED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml
INJECTED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml
INJECTED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml
INJECTED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml
INJECTED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml
INJECTED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml
INJECTED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml
INJECTED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml
android:targetSdkVersion
INJECTED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml
ADDED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml
INJECTED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml
INJECTED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml
ADDED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml
INJECTED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml
android:minSdkVersion
INJECTED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml
ADDED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml
INJECTED from D:\jeevanp_cpm_projects\FromRavi\Haleon_Kenya_pd\HALEON_KENYA_PD\library\src\main\AndroidManifest.xml
INJECTED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml
ADDED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml
INJECTED from D:\Haleon_Kenya_pd-git\library\src\main\AndroidManifest.xml