diff --git a/app/release/LorealBa-Mny-280825-release.apk b/app/release/LorealBa-MNY-T1-release.apk similarity index 83% rename from app/release/LorealBa-Mny-280825-release.apk rename to app/release/LorealBa-MNY-T1-release.apk index 54ae337..9e57ef8 100644 Binary files a/app/release/LorealBa-Mny-280825-release.apk and b/app/release/LorealBa-MNY-T1-release.apk differ diff --git a/app/src/main/java/com/cpm/lorealbaMabeline/Database/Lorealba_Database.java b/app/src/main/java/com/cpm/lorealbaMabeline/Database/Lorealba_Database.java index 40492bd..b7fca3b 100644 --- a/app/src/main/java/com/cpm/lorealbaMabeline/Database/Lorealba_Database.java +++ b/app/src/main/java/com/cpm/lorealbaMabeline/Database/Lorealba_Database.java @@ -1995,20 +1995,19 @@ public class Lorealba_Database extends SQLiteOpenHelper { values.put("ProductId", tStockSummary.getProductId()); values.put("SaleableIn", tStockSummary.getSaleableIn()); values.put("SaleableOut", tStockSummary.getSaleableOut()); - values.put("SaleableDamage", tStockSummary.getSaleableDamage()); - values.put("SaleableBalance", tStockSummary.getSaleableBalance()); + values.put("SaleableBalance", tStockSummary.getSaleableStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getSaleableBalance()==-1 ? 0 : tStockSummary.getSaleableBalance()); values.put("TesterIn", tStockSummary.getTesterIn()); values.put("TesterOut", tStockSummary.getTesterOut()); values.put("TesterDamage", tStockSummary.getTesterDamage()); - values.put("TesterBalance", tStockSummary.getTesterBalance()); + values.put("TesterBalance", tStockSummary.getTesterStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getTesterBalance()==-1 ? 0 :tStockSummary.getTesterBalance()); values.put("SampleIn", tStockSummary.getSampleIn()); values.put("SampleOut", tStockSummary.getSampleOut()); values.put("SampleDamage", tStockSummary.getSampleDamage()); - values.put("SampleBalance", tStockSummary.getSampleBalance()); + values.put("SampleBalance", tStockSummary.getSampleStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getSampleBalance()==-1 ? 0 : tStockSummary.getSampleBalance()); values.put("GwpIn", tStockSummary.getGwpIn()); values.put("GwpOut", tStockSummary.getGwpOut()); values.put("GwpDamage", tStockSummary.getGwpDamage()); - values.put("GwpBalance", tStockSummary.getGwpBalance()); + values.put("GwpBalance", tStockSummary.getGwpStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getGwpBalance()==-1 ? 0 : tStockSummary.getGwpBalance()); values.put("SaleableStatus", tStockSummary.getSaleableStatus().trim()); values.put("TesterStatus", tStockSummary.getTesterStatus().trim()); values.put("SampleStatus", tStockSummary.getSampleStatus().trim()); diff --git a/app/src/main/java/com/cpm/lorealbaMabeline/constant/AlertandMessages.java b/app/src/main/java/com/cpm/lorealbaMabeline/constant/AlertandMessages.java index 851e815..9b45997 100644 --- a/app/src/main/java/com/cpm/lorealbaMabeline/constant/AlertandMessages.java +++ b/app/src/main/java/com/cpm/lorealbaMabeline/constant/AlertandMessages.java @@ -101,12 +101,14 @@ public class AlertandMessages { Snackbar.make(Objects.requireNonNull(((Activity) context).getCurrentFocus()), message, Snackbar.LENGTH_SHORT).show(); } - public void backpressedAlert(final Activity activity) { + public static void closeApp(final Activity activity, String str) { final AlertDialog.Builder builder = new AlertDialog.Builder(activity); builder.setTitle("Alert"); - builder.setMessage("Do you want to exit? Filled data will be lost").setCancelable(false) - .setPositiveButton("Ok", (dialog, id) -> activity.finish()); - builder.setNegativeButton("Cancel", (dialog, which) -> dialog.dismiss()); + builder.setMessage(str).setCancelable(false) + .setPositiveButton("Ok", (dialog, id) -> { + dialog.dismiss(); + activity.finishAffinity(); + }); AlertDialog alert = builder.create(); alert.show(); } diff --git a/app/src/main/java/com/cpm/lorealbaMabeline/constant/CommonString.java b/app/src/main/java/com/cpm/lorealbaMabeline/constant/CommonString.java index 3c283b7..aa4942c 100644 --- a/app/src/main/java/com/cpm/lorealbaMabeline/constant/CommonString.java +++ b/app/src/main/java/com/cpm/lorealbaMabeline/constant/CommonString.java @@ -117,6 +117,7 @@ public class CommonString { public static final String KEY_TYPE = "Message_Type"; public static final int PERMISSION_ALL = 99; public static final String TABLE_COVERAGE_DATA = "COVERAGE_DATA"; + public static final String KEY_LOCKOUT = "LOCKOUT"; 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"; diff --git a/app/src/main/java/com/cpm/lorealbaMabeline/dailyactivity/TabLoginActivity.java b/app/src/main/java/com/cpm/lorealbaMabeline/dailyactivity/TabLoginActivity.java index aed754b..23ce683 100644 --- a/app/src/main/java/com/cpm/lorealbaMabeline/dailyactivity/TabLoginActivity.java +++ b/app/src/main/java/com/cpm/lorealbaMabeline/dailyactivity/TabLoginActivity.java @@ -115,6 +115,7 @@ public class TabLoginActivity extends AppCompatActivity implements View.OnClickL setSppinerData(); checkAndRequestPermissions(); getLastLocation(); + /* To restrict Space Bar in Keyboard */ InputFilter filter = (source, start, end, dest, dstart, dend) -> { for (int i = start; i < end; i++) { @@ -384,7 +385,9 @@ public class TabLoginActivity extends AppCompatActivity implements View.OnClickL } else if (data != null && data.contains("Lockout")) { loading.dismiss(); - AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.MESSAGE_LOCKED); + editor.putBoolean(CommonString.KEY_LOCKOUT + userId + visitdate, true); + editor.commit(); + AlertandMessages.closeApp((Activity) context, CommonString.MESSAGE_LOCKED); } else if (data != null && data.contains("No data")) { loading.dismiss(); diff --git a/app/src/main/java/com/cpm/lorealbaMabeline/pinviewactivity/PinViewActivity.java b/app/src/main/java/com/cpm/lorealbaMabeline/pinviewactivity/PinViewActivity.java index 5628303..f4d28ff 100644 --- a/app/src/main/java/com/cpm/lorealbaMabeline/pinviewactivity/PinViewActivity.java +++ b/app/src/main/java/com/cpm/lorealbaMabeline/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; @@ -82,7 +83,6 @@ import retrofit2.converter.gson.GsonConverterFactory; public class PinViewActivity extends AppCompatActivity implements View.OnClickListener { private String counterId = ""; - private final String visitdate = ""; private String Update_Visit_Date; private String userType; Pinview pinview_confirm, pinview_start; @@ -142,6 +142,9 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener { } getDeviceName(); getLastLocation(); + if (preferences.getBoolean(CommonString.KEY_LOCKOUT + user_id + visit_date, false)) { + AlertandMessages.closeApp((Activity) context, CommonString.MESSAGE_LOCKED); + } } private boolean checkAndRequestPermissions() { @@ -543,7 +546,9 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener { } else if (data_Login.contains("Lockout")) { loading.dismiss(); - AlertandMessages.showAlertlogin((Activity) context, CommonString.MESSAGE_LOCKED); + editor.putBoolean(CommonString.KEY_LOCKOUT + user_id + visit_date, true); + editor.commit(); + AlertandMessages.closeApp((Activity) context, CommonString.MESSAGE_LOCKED); } else if (data_Login.contains("No data")) { loading.dismiss(); @@ -580,7 +585,6 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener { if (!data_login_time.contains("No Data")) { data_login_Tym = new Gson().fromJson(data_login_time, BADeviceLoginGetterSetter.class); } - loading.dismiss(); Gson gson = new Gson(); final BADeviceLoginGetterSetter userObject = gson.fromJson(finalData_Login, BADeviceLoginGetterSetter.class); @@ -593,7 +597,7 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener { loginGetterSetter = new LoginGetterSetter(); loginGetterSetter.setUserId(user_id); loginGetterSetter.setPassword(allLoginData.get(0).getPassword()); - loginGetterSetter.setVisitDate(visitdate); + loginGetterSetter.setVisitDate(visit_date); loginGetterSetter.setUserType(userType); if (data_login_Tym != null) { loginGetterSetter.setUserLoginTym(data_login_Tym.getLoginTime().get(0).getLoginTime()); diff --git a/library/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml b/library/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml index 2c8815b..33ecdc8 100644 --- a/library/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml +++ b/library/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml @@ -1,9 +1,9 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/library/build/intermediates/incremental/mergeReleaseShaders/merger.xml b/library/build/intermediates/incremental/mergeReleaseShaders/merger.xml index ff3efc1..9843624 100644 --- a/library/build/intermediates/incremental/mergeReleaseShaders/merger.xml +++ b/library/build/intermediates/incremental/mergeReleaseShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/library/build/intermediates/incremental/packageReleaseAssets/merger.xml b/library/build/intermediates/incremental/packageReleaseAssets/merger.xml index b4441fe..1c2094f 100644 --- a/library/build/intermediates/incremental/packageReleaseAssets/merger.xml +++ b/library/build/intermediates/incremental/packageReleaseAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ 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 7511b18..88b1aa7 100644 --- a/library/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties +++ b/library/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties @@ -1,6 +1,6 @@ -#Thu Aug 28 16:11:54 IST 2025 -com.androidbuts.multispinnerfilter.library-main-5\:/layout/textview_for_spinner.xml=D\:\\LorealBa-Latest-MNY-July-2025\\library\\build\\intermediates\\packaged_res\\release\\layout\\textview_for_spinner.xml -com.androidbuts.multispinnerfilter.library-main-5\:/layout/activity_main.xml=D\:\\LorealBa-Latest-MNY-July-2025\\library\\build\\intermediates\\packaged_res\\release\\layout\\activity_main.xml -com.androidbuts.multispinnerfilter.library-main-5\:/layout/alert_dialog_listview_search.xml=D\:\\LorealBa-Latest-MNY-July-2025\\library\\build\\intermediates\\packaged_res\\release\\layout\\alert_dialog_listview_search.xml -com.androidbuts.multispinnerfilter.library-main-5\:/layout/item_listview_single.xml=D\:\\LorealBa-Latest-MNY-July-2025\\library\\build\\intermediates\\packaged_res\\release\\layout\\item_listview_single.xml -com.androidbuts.multispinnerfilter.library-main-5\:/layout/item_listview_multiple.xml=D\:\\LorealBa-Latest-MNY-July-2025\\library\\build\\intermediates\\packaged_res\\release\\layout\\item_listview_multiple.xml +#Fri Sep 12 13:08:27 IST 2025 +com.androidbuts.multispinnerfilter.library-main-5\:/layout/textview_for_spinner.xml=D\:\\LorealBa-MNY-Latest-2024\\library\\build\\intermediates\\packaged_res\\release\\layout\\textview_for_spinner.xml +com.androidbuts.multispinnerfilter.library-main-5\:/layout/activity_main.xml=D\:\\LorealBa-MNY-Latest-2024\\library\\build\\intermediates\\packaged_res\\release\\layout\\activity_main.xml +com.androidbuts.multispinnerfilter.library-main-5\:/layout/alert_dialog_listview_search.xml=D\:\\LorealBa-MNY-Latest-2024\\library\\build\\intermediates\\packaged_res\\release\\layout\\alert_dialog_listview_search.xml +com.androidbuts.multispinnerfilter.library-main-5\:/layout/item_listview_single.xml=D\:\\LorealBa-MNY-Latest-2024\\library\\build\\intermediates\\packaged_res\\release\\layout\\item_listview_single.xml +com.androidbuts.multispinnerfilter.library-main-5\:/layout/item_listview_multiple.xml=D\:\\LorealBa-MNY-Latest-2024\\library\\build\\intermediates\\packaged_res\\release\\layout\\item_listview_multiple.xml diff --git a/library/build/intermediates/incremental/release/packageReleaseResources/merger.xml b/library/build/intermediates/incremental/release/packageReleaseResources/merger.xml index f9d0f0e..193f519 100644 --- a/library/build/intermediates/incremental/release/packageReleaseResources/merger.xml +++ b/library/build/intermediates/incremental/release/packageReleaseResources/merger.xml @@ -1,5 +1,5 @@ -#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 + \ No newline at end of file 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 97ed9c7..6a082bc 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/sdk_index/snapshot.gz b/library/build/intermediates/lint-cache/lintVitalAnalyzeRelease/sdk_index/snapshot.gz index a28459b..c9cc17b 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/lint_model/release/module.xml b/library/build/intermediates/lint_model/release/module.xml index 2c8815b..33ecdc8 100644 --- a/library/build/intermediates/lint_model/release/module.xml +++ b/library/build/intermediates/lint_model/release/module.xml @@ -1,9 +1,9 @@ + simpleName="LorealBa-MNY-Latest-2024:library"/> @@ -174,7 +174,7 @@ roots=":@@:library::release,com.github.rey5137:material:1.2.2@aar,androidx.legacy:legacy-support-v4:1.0.0@aar,com.google.android.material:material:1.12.0@aar,androidx.viewpager2:viewpager2:1.0.0@aar,androidx.recyclerview:recyclerview:1.1.0@aar,androidx.constraintlayout:constraintlayout:2.0.1@aar,androidx.appcompat:appcompat-resources:1.6.1@aar,androidx.appcompat:appcompat:1.6.1@aar,androidx.cardview:cardview:1.0.0@aar,androidx.media:media:1.0.0@aar,androidx.legacy:legacy-support-core-ui:1.0.0@aar,androidx.transition:transition:1.5.0@aar,androidx.dynamicanimation:dynamicanimation:1.0.0@aar,androidx.legacy:legacy-support-core-utils:1.0.0@aar,androidx.fragment:fragment:1.3.6@aar,androidx.fragment:fragment:1.3.6@aar,androidx.activity:activity:1.8.0@aar,androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar,androidx.drawerlayout:drawerlayout:1.1.1@aar,androidx.vectordrawable:vectordrawable-animated:1.1.0@aar,androidx.vectordrawable:vectordrawable:1.1.0@aar,androidx.loader:loader:1.0.0@aar,androidx.viewpager:viewpager:1.0.0@aar,androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar,androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar,androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar,androidx.emoji2:emoji2-views-helper:1.2.0@aar,androidx.emoji2:emoji2:1.2.0@aar,androidx.customview:customview:1.1.0@aar,androidx.savedstate:savedstate:1.2.1@aar,androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar,androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar,androidx.lifecycle:lifecycle-process:2.6.2@aar,androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar,androidx.lifecycle:lifecycle-livedata:2.6.2@aar,androidx.lifecycle:lifecycle-common:2.6.2@jar,androidx.lifecycle:lifecycle-runtime:2.6.2@aar,androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar,androidx.core:core-ktx:1.13.0@aar,androidx.core:core:1.13.0@aar,androidx.core:core:1.13.0@aar,com.google.errorprone:error_prone_annotations:2.15.0@jar,androidx.resourceinspection:resourceinspection-annotation:1.0.1@jar,androidx.documentfile:documentfile:1.0.0@aar,androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar,androidx.print:print:1.0.0@aar,androidx.interpolator:interpolator:1.0.0@aar,androidx.cursoradapter:cursoradapter:1.0.0@aar,androidx.profileinstaller:profileinstaller:1.3.0@aar,androidx.startup:startup-runtime:1.1.1@aar,androidx.tracing:tracing:1.0.0@aar,androidx.versionedparcelable:versionedparcelable:1.1.1@aar,androidx.collection:collection:1.1.0@jar,androidx.concurrent:concurrent-futures:1.1.0@jar,androidx.arch.core:core-runtime:2.2.0@aar,androidx.arch.core:core-common:2.2.0@jar,androidx.annotation:annotation-experimental:1.4.0@aar,androidx.annotation:annotation-jvm:1.6.0@jar,org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4@jar,org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4@jar,org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22@jar,org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22@jar,org.jetbrains.kotlin:kotlin-stdlib:1.8.22@jar,org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22@jar,androidx.constraintlayout:constraintlayout-solver:2.0.1@jar,org.jetbrains:annotations:13.0@jar,com.google.guava:listenablefuture:1.0@jar"> + simpleName="LorealBa-MNY-Latest-2024:library"/> diff --git a/library/build/intermediates/lint_model/release/release-testArtifact-libraries.xml b/library/build/intermediates/lint_model/release/release-testArtifact-libraries.xml index d318f59..05b644b 100644 --- a/library/build/intermediates/lint_model/release/release-testArtifact-libraries.xml +++ b/library/build/intermediates/lint_model/release/release-testArtifact-libraries.xml @@ -689,9 +689,9 @@ resolved="com.google.guava:listenablefuture:1.0"/> 6 7 -7-->D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml:5:5-7:19 -7-->D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml:5:18-44 +7-->D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml:5:5-7:19 +7-->D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml:5:18-44 8 9 10 diff --git a/library/build/outputs/logs/manifest-merger-release-report.txt b/library/build/outputs/logs/manifest-merger-release-report.txt index 585e0f0..687ffa9 100644 --- a/library/build/outputs/logs/manifest-merger-release-report.txt +++ b/library/build/outputs/logs/manifest-merger-release-report.txt @@ -1,21 +1,21 @@ -- Merging decision tree log --- manifest -ADDED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml:2:1-9:12 -INJECTED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml:2:1-9:12 +ADDED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml:2:1-9:12 +INJECTED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml:2:1-9:12 package - ADDED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml:3:5-49 - INJECTED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml + ADDED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml:3:5-49 + INJECTED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml xmlns:android - ADDED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml:2:11-69 + ADDED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml:2:11-69 application -ADDED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml:5:5-7:19 +ADDED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml:5:5-7:19 android:allowBackup - ADDED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml:5:18-44 + ADDED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml:5:18-44 uses-sdk -INJECTED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml reason: use-sdk injection requested -INJECTED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml -INJECTED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml +INJECTED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml reason: use-sdk injection requested +INJECTED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml +INJECTED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml android:targetSdkVersion - INJECTED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml + INJECTED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml android:minSdkVersion - INJECTED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml + INJECTED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml