From 9142924800f50ac30fb278712f7f4d5c21bc18fc Mon Sep 17 00:00:00 2001 From: jeevanp Date: Fri, 19 Dec 2025 17:39:01 +0530 Subject: [PATCH] Added BA assessment and fixed baskinGss --- .idea/appInsightsSettings.xml | 4 +- .idea/deviceManager.xml | 13 + annca/build.gradle | 2 + app/build.gradle | 20 +- ...se.apk => LOREALBA-MNY-V-3.2-22DEC025.apk} | Bin 15236679 -> 19314592 bytes app/release/output-metadata.json | 4 +- app/src/main/AndroidManifest.xml | 14 +- .../lorealbaMabeline/AutoUpdateActivity.java | 23 +- .../CounterLoginActivity.java | 2 +- .../Database/Lorealba_Database.java | 11 +- .../lorealbaMabeline/DealarBoardActivity.java | 4 +- .../lorealbaMabeline/IMEILoginActivity.java | 3 +- .../lorealbaMabeline/UserLoginActivity.java | 4 +- .../constant/CommonString.java | 1 + .../ConsumerReturnReplaceProductActivity.java | 36 ++- .../ConsumerUserDetailsActivity.java | 77 +++++- .../dailyactivity/BAProfileActivity.java | 2 - .../dailyactivity/BaAssessmentActivity.java | 142 +++++++++++ .../dailyactivity/ConsumerReturnActivity.java | 36 ++- .../ManualInWardStockActivity.java | 35 ++- .../SkinGeniusCategoryActivity.java | 7 +- .../SkinGeniusScreenshotActivity.java | 126 ++++------ .../dailyactivity/TabLoginActivity.java | 3 +- .../lorealbaMabeline/download/Downloader.java | 1 + .../fragements/BAdvisorMenuFragment.java | 21 +- .../fragements/MyAdaperForIcon.java | 5 +- .../pinviewactivity/PinViewActivity.java | 3 +- .../retrofit/StringConverterFactory.java | 31 ++- .../upload/ManualUploadActivity.java | 5 +- .../layout-sw600dp/activity_ba_assessment.xml | 32 +++ .../layout-sw600dp/content_ba_assessment.xml | 32 +++ .../res/layout/activity_ba_assessment.xml | 32 +++ .../main/res/layout/content_ba_assessment.xml | 32 +++ .../main/res/mipmap-hdpi/ba_assessment.png | Bin 0 -> 3127 bytes .../main/res/mipmap-mdpi/ba_assessment.png | Bin 0 -> 3127 bytes app/src/main/res/xml/provider_paths.xml | 12 +- .../results.bin | 0 .../results.bin | 1 + .../results.bin | 1 + .../classes/classes_dex/classes.dex | Bin 0 -> 23956 bytes .../results.bin | 1 + .../debug/out/layout_activity_main.xml.flat | Bin 1376 -> 1412 bytes ...yout_alert_dialog_listview_search.xml.flat | Bin 2924 -> 2960 bytes .../layout_item_listview_multiple.xml.flat | Bin 1900 -> 1936 bytes .../out/layout_item_listview_single.xml.flat | Bin 1060 -> 1096 bytes .../out/layout_textview_for_spinner.xml.flat | Bin 1088 -> 1128 bytes .../release/out/layout_activity_main.xml.flat | Bin 0 -> 1416 bytes ...yout_alert_dialog_listview_search.xml.flat | Bin 0 -> 2964 bytes .../layout_item_listview_multiple.xml.flat | Bin 0 -> 1940 bytes .../out/layout_item_listview_single.xml.flat | Bin 0 -> 1100 bytes .../out/layout_textview_for_spinner.xml.flat | Bin 0 -> 1128 bytes .../compile-file-map.properties | 12 +- .../debug/packageDebugResources/merger.xml | 8 +- .../lintVitalAnalyzeRelease/module.xml | 4 +- .../release-artifact-libraries.xml | 224 ++++++++--------- .../lintVitalAnalyzeRelease/release.xml | 4 +- .../mergeDebugJniLibFolders/merger.xml | 2 +- .../incremental/mergeDebugShaders/merger.xml | 2 +- .../mergeReleaseJniLibFolders/merger.xml | 2 +- .../mergeReleaseShaders/merger.xml | 2 +- .../incremental/packageDebugAssets/merger.xml | 2 +- .../packageReleaseAssets/merger.xml | 2 +- .../compile-file-map.properties | 12 +- .../packageReleaseResources/merger.xml | 8 +- .../google/android/material/group-index.xml | 2 +- .../maven.google/master-index.xml | 5 + .../sdk_index/snapshot.gz | Bin 95096 -> 97480 bytes .../lint_model/release/module.xml | 4 +- .../release/release-artifact-libraries.xml | 224 ++++++++--------- .../release-testArtifact-libraries.xml | 228 +++++++++--------- .../lint_model/release/release.xml | 2 +- .../lint_vital_lint_model/release/module.xml | 4 +- .../release/release-artifact-libraries.xml | 224 ++++++++--------- .../lint_vital_lint_model/release/release.xml | 2 +- .../manifest-merger-blame-debug-report.txt | 4 +- .../manifest-merger-blame-release-report.txt | 4 +- .../logs/manifest-merger-debug-report.txt | 24 +- .../logs/manifest-merger-release-report.txt | 24 +- 78 files changed, 1131 insertions(+), 682 deletions(-) create mode 100644 .idea/deviceManager.xml rename app/release/{LorealBa-Mny-T-release.apk => LOREALBA-MNY-V-3.2-22DEC025.apk} (67%) create mode 100644 app/src/main/java/com/cpm/lorealbaMabeline/dailyactivity/BaAssessmentActivity.java create mode 100644 app/src/main/res/layout-sw600dp/activity_ba_assessment.xml create mode 100644 app/src/main/res/layout-sw600dp/content_ba_assessment.xml create mode 100644 app/src/main/res/layout/activity_ba_assessment.xml create mode 100644 app/src/main/res/layout/content_ba_assessment.xml create mode 100644 app/src/main/res/mipmap-hdpi/ba_assessment.png create mode 100644 app/src/main/res/mipmap-mdpi/ba_assessment.png delete mode 100644 library/build/.transforms/17cddfd6cef98c836972a0692f096343/results.bin create mode 100644 library/build/.transforms/35f86ab9b64c5d1c6696b91b760d62d0/results.bin create mode 100644 library/build/.transforms/b5a47160d4ac744c5813d9c98b841f73/results.bin create mode 100644 library/build/.transforms/b5a47160d4ac744c5813d9c98b841f73/transformed/classes/classes_dex/classes.dex create mode 100644 library/build/.transforms/ee9872ba885e6f7b3ea3222ce72cbb21/results.bin create mode 100644 library/build/intermediates/compiled_local_resources/release/out/layout_activity_main.xml.flat create mode 100644 library/build/intermediates/compiled_local_resources/release/out/layout_alert_dialog_listview_search.xml.flat create mode 100644 library/build/intermediates/compiled_local_resources/release/out/layout_item_listview_multiple.xml.flat create mode 100644 library/build/intermediates/compiled_local_resources/release/out/layout_item_listview_single.xml.flat create mode 100644 library/build/intermediates/compiled_local_resources/release/out/layout_textview_for_spinner.xml.flat diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml index a79a228..3f585a2 100644 --- a/.idea/appInsightsSettings.xml +++ b/.idea/appInsightsSettings.xml @@ -22,8 +22,8 @@