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

Fixed green tick issue on category lavel and camera issue in additional visibility

Browse Source
This commit is contained in:
Jeevan Prasad
2025-06-24 17:17:57 +05:30
parent 6f260fd0b0
commit d52ce68cf5
11 changed files with 262 additions and 1200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/caches/deviceStreaming.xml
Generated
-787
View File
@@ -1,787 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DeviceStreaming">
<option name="deviceSelectionList">
<list>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="Sony" />
<option name="codename" value="A402SO" />
<option name="id" value="A402SO" />
<option name="labId" value="google" />
<option name="manufacturer" value="Sony" />
<option name="name" value="Xperia 10" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2520" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="27" />
<option name="brand" value="DOCOMO" />
<option name="codename" value="F01L" />
<option name="id" value="F01L" />
<option name="labId" value="google" />
<option name="manufacturer" value="FUJITSU" />
<option name="name" value="F-01L" />
<option name="screenDensity" value="360" />
<option name="screenX" value="720" />
<option name="screenY" value="1280" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="OnePlus" />
<option name="codename" value="OP535DL1" />
<option name="id" value="OP535DL1" />
<option name="labId" value="google" />
<option name="manufacturer" value="OnePlus" />
<option name="name" value="CPH2409" />
<option name="screenDensity" value="401" />
<option name="screenX" value="1080" />
<option name="screenY" value="2412" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="OnePlus" />
<option name="codename" value="OP5552L1" />
<option name="id" value="OP5552L1" />
<option name="labId" value="google" />
<option name="manufacturer" value="OnePlus" />
<option name="name" value="CPH2415" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2412" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="OPPO" />
<option name="codename" value="OP573DL1" />
<option name="id" value="OP573DL1" />
<option name="labId" value="google" />
<option name="manufacturer" value="OPPO" />
<option name="name" value="CPH2557" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="28" />
<option name="brand" value="DOCOMO" />
<option name="codename" value="SH-01L" />
<option name="id" value="SH-01L" />
<option name="labId" value="google" />
<option name="manufacturer" value="SHARP" />
<option name="name" value="AQUOS sense2 SH-01L" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2160" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="a15" />
<option name="id" value="a15" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="A15" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="a15x" />
<option name="id" value="a15x" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="A15 5G" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="a16x" />
<option name="id" value="a16x" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="A16 5G" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="a35x" />
<option name="id" value="a35x" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="A35" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="31" />
<option name="brand" value="samsung" />
<option name="codename" value="a51" />
<option name="id" value="a51" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy A51" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="akita" />
<option name="id" value="akita" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 8a" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="motorola" />
<option name="codename" value="arcfox" />
<option name="id" value="arcfox" />
<option name="labId" value="google" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="razr plus 2024" />
<option name="screenDensity" value="360" />
<option name="screenX" value="1080" />
<option name="screenY" value="1272" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="motorola" />
<option name="codename" value="austin" />
<option name="id" value="austin" />
<option name="labId" value="google" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="moto g 5G (2022)" />
<option name="screenDensity" value="280" />
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="samsung" />
<option name="codename" value="b0q" />
<option name="id" value="b0q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S22 Ultra" />
<option name="screenDensity" value="600" />
<option name="screenX" value="1440" />
<option name="screenY" value="3088" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="b6q" />
<option name="id" value="b6q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Flip 6" />
<option name="screenDensity" value="340" />
<option name="screenX" value="1080" />
<option name="screenY" value="2640" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="32" />
<option name="brand" value="google" />
<option name="codename" value="bluejay" />
<option name="id" value="bluejay" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 6a" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="caiman" />
<option name="id" value="caiman" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9 Pro" />
<option name="screenDensity" value="360" />
<option name="screenX" value="960" />
<option name="screenY" value="2142" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="google" />
<option name="codename" value="caiman" />
<option name="id" value="caiman" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9 Pro" />
<option name="screenDensity" value="360" />
<option name="screenX" value="960" />
<option name="screenY" value="2142" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="comet" />
<option name="default" value="true" />
<option name="id" value="comet" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9 Pro Fold" />
<option name="screenDensity" value="390" />
<option name="screenX" value="2076" />
<option name="screenY" value="2152" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="google" />
<option name="codename" value="comet" />
<option name="default" value="true" />
<option name="id" value="comet" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9 Pro Fold" />
<option name="screenDensity" value="390" />
<option name="screenX" value="2076" />
<option name="screenY" value="2152" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="29" />
<option name="brand" value="samsung" />
<option name="codename" value="crownqlteue" />
<option name="id" value="crownqlteue" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Note9" />
<option name="screenDensity" value="420" />
<option name="screenX" value="2220" />
<option name="screenY" value="1080" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="dm2q" />
<option name="id" value="dm2q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="S23 Plus" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="dm3q" />
<option name="id" value="dm3q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S23 Ultra" />
<option name="screenDensity" value="600" />
<option name="screenX" value="1440" />
<option name="screenY" value="3088" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="motorola" />
<option name="codename" value="dubai" />
<option name="id" value="dubai" />
<option name="labId" value="google" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="edge 30" />
<option name="screenDensity" value="405" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="e1q" />
<option name="default" value="true" />
<option name="id" value="e1q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S24" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="e3q" />
<option name="id" value="e3q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S24 Ultra" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1440" />
<option name="screenY" value="3120" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="eos" />
<option name="id" value="eos" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Eos" />
<option name="screenDensity" value="320" />
<option name="screenX" value="384" />
<option name="screenY" value="384" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="felix" />
<option name="id" value="felix" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Fold" />
<option name="screenDensity" value="420" />
<option name="screenX" value="2208" />
<option name="screenY" value="1840" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="felix" />
<option name="id" value="felix" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Fold" />
<option name="screenDensity" value="420" />
<option name="screenX" value="2208" />
<option name="screenY" value="1840" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="felix_camera" />
<option name="id" value="felix_camera" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Fold (Camera-enabled)" />
<option name="screenDensity" value="420" />
<option name="screenX" value="2208" />
<option name="screenY" value="1840" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="motorola" />
<option name="codename" value="fogona" />
<option name="id" value="fogona" />
<option name="labId" value="google" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="moto g play - 2024" />
<option name="screenDensity" value="280" />
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="motorola" />
<option name="codename" value="fogos" />
<option name="id" value="fogos" />
<option name="labId" value="google" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="moto g34 5G" />
<option name="screenDensity" value="280" />
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="g0q" />
<option name="id" value="g0q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="SM-S906U1" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="gta9pwifi" />
<option name="id" value="gta9pwifi" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="SM-X210" />
<option name="screenDensity" value="240" />
<option name="screenX" value="1200" />
<option name="screenY" value="1920" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="samsung" />
<option name="codename" value="gts7lwifi" />
<option name="id" value="gts7lwifi" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="SM-T870" />
<option name="screenDensity" value="340" />
<option name="screenX" value="1600" />
<option name="screenY" value="2560" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="gts7xllite" />
<option name="id" value="gts7xllite" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="SM-T738U" />
<option name="screenDensity" value="340" />
<option name="screenX" value="1600" />
<option name="screenY" value="2560" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="samsung" />
<option name="codename" value="gts8uwifi" />
<option name="formFactor" value="Tablet" />
<option name="id" value="gts8uwifi" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Tab S8 Ultra" />
<option name="screenDensity" value="320" />
<option name="screenX" value="1848" />
<option name="screenY" value="2960" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="gts8wifi" />
<option name="formFactor" value="Tablet" />
<option name="id" value="gts8wifi" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Tab S8" />
<option name="screenDensity" value="274" />
<option name="screenX" value="1600" />
<option name="screenY" value="2560" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="gts9fe" />
<option name="id" value="gts9fe" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Tab S9 FE 5G" />
<option name="screenDensity" value="280" />
<option name="screenX" value="1440" />
<option name="screenY" value="2304" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="gts9wifi" />
<option name="id" value="gts9wifi" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="SM-X710" />
<option name="screenDensity" value="340" />
<option name="screenX" value="1600" />
<option name="screenY" value="2560" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="husky" />
<option name="id" value="husky" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 8 Pro" />
<option name="screenDensity" value="390" />
<option name="screenX" value="1008" />
<option name="screenY" value="2244" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="30" />
<option name="brand" value="motorola" />
<option name="codename" value="java" />
<option name="id" value="java" />
<option name="labId" value="google" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="G20" />
<option name="screenDensity" value="280" />
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="komodo" />
<option name="id" value="komodo" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9 Pro XL" />
<option name="screenDensity" value="360" />
<option name="screenX" value="1008" />
<option name="screenY" value="2244" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="google" />
<option name="codename" value="komodo" />
<option name="id" value="komodo" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9 Pro XL" />
<option name="screenDensity" value="360" />
<option name="screenX" value="1008" />
<option name="screenY" value="2244" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="lynx" />
<option name="id" value="lynx" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 7a" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="motorola" />
<option name="codename" value="manaus" />
<option name="id" value="manaus" />
<option name="labId" value="google" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="edge 40 neo" />
<option name="screenDensity" value="400" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="motorola" />
<option name="codename" value="maui" />
<option name="id" value="maui" />
<option name="labId" value="google" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="moto g play - 2023" />
<option name="screenDensity" value="280" />
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="o1q" />
<option name="id" value="o1q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S21" />
<option name="screenDensity" value="421" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="31" />
<option name="brand" value="google" />
<option name="codename" value="oriole" />
<option name="id" value="oriole" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 6" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" />
<option name="codename" value="pa3q" />
<option name="id" value="pa3q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S25 Ultra" />
<option name="screenDensity" value="600" />
<option name="screenX" value="1440" />
<option name="screenY" value="3120" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="panther" />
<option name="id" value="panther" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 7" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="q5q" />
<option name="id" value="q5q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Z Fold5" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1812" />
<option name="screenY" value="2176" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="q6q" />
<option name="id" value="q6q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Z Fold6" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1856" />
<option name="screenY" value="2160" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="30" />
<option name="brand" value="google" />
<option name="codename" value="r11" />
<option name="formFactor" value="Wear OS" />
<option name="id" value="r11" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Watch" />
<option name="screenDensity" value="320" />
<option name="screenX" value="384" />
<option name="screenY" value="384" />
<option name="type" value="WEAR_OS" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="r11q" />
<option name="id" value="r11q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="SM-S711U" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="30" />
<option name="brand" value="google" />
<option name="codename" value="redfin" />
<option name="id" value="redfin" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 5" />
<option name="screenDensity" value="440" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="shiba" />
<option name="id" value="shiba" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 8" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="t2q" />
<option name="id" value="t2q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S21 Plus" />
<option name="screenDensity" value="394" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="tangorpro" />
<option name="formFactor" value="Tablet" />
<option name="id" value="tangorpro" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Tablet" />
<option name="screenDensity" value="320" />
<option name="screenX" value="1600" />
<option name="screenY" value="2560" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="google" />
<option name="codename" value="tegu" />
<option name="id" value="tegu" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9a" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2424" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="tokay" />
<option name="default" value="true" />
<option name="id" value="tokay" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2424" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="google" />
<option name="codename" value="tokay" />
<option name="default" value="true" />
<option name="id" value="tokay" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2424" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="xcover7" />
<option name="id" value="xcover7" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="SM-G556B" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2408" />
</PersistentDeviceSelectionData>
</list>
</option>
</component>
</project>
GSKMTOrange/release/HALEON-EGYPT-T.apk → GSKMTOrange/release/HaleonEgypt-PD-T.apk
BIN
View File
Binary file not shown.
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+8 -8
View File
@@ -115,7 +115,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
try { try {
db = this.getWritableDatabase(); db = this.getWritableDatabase();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.fillInStackTrace();
} }
} }
@@ -225,9 +225,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL(TableBean.getTable_ORDER_RECEIVED_STATUS());//--Added 08.12.2022 db.execSQL(TableBean.getTable_ORDER_RECEIVED_STATUS());//--Added 08.12.2022
db.execSQL(TableBean.getAdhocJourneyplanAdditional());//--Added 7.10.2019 db.execSQL(TableBean.getAdhocJourneyplanAdditional());//--Added 7.10.2019
db.execSQL(CommonString.CREATE_TABLE_IRPD); db.execSQL(CommonString.CREATE_TABLE_IRPD);
db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_DATA);
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.fillInStackTrace();
Toast.makeText(context, "Error -" + e.toString(), Toast.LENGTH_SHORT).show(); Toast.makeText(context, "Error -" + e.toString(), Toast.LENGTH_SHORT).show();
} }
@@ -7649,7 +7649,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list; return list;
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.fillInStackTrace();
return list; return list;
} }
@@ -7685,7 +7685,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list; return list;
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.fillInStackTrace();
return list; return list;
} }
@@ -7893,7 +7893,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list; return list;
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.fillInStackTrace();
return list; return list;
} }
@@ -7925,7 +7925,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list; return list;
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.fillInStackTrace();
return list; return list;
} }
@@ -7958,7 +7958,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list; return list;
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.fillInStackTrace();
return list; return list;
} }
GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+9
View File
@@ -1244,6 +1244,15 @@ public class CommonString {
public static final String TABLE_INSERT_STOCK = "Stock_Data"; public static final String TABLE_INSERT_STOCK = "Stock_Data";
public static final String CREATE_TABLE_INSERT_STOCK_DATA = "CREATE TABLE IF NOT EXISTS " + TABLE_INSERT_STOCK
+ " ("
+ KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+ "Store_Id INTEGER, " + KEY_VISIT_DATE + " VARCHAR,"
+ "Category_Id INTEGER," + "Brand_Id INTEGER,"
+ "SKU_ID INTEGER," + "SKU VARCHAR," + "SKU_SEQUENCE INTEGER,"
+ "MBQ INTEGER," + "STOCK INTEGER," + "COMPANY_ID INTEGER," + "TOGGLE_VALUE VARCHAR,"
+ "MUST_HAVE VARCHAR)";
public static final String CREATE_TABLE_INSERT_STOCK_ENTRY = "CREATE TABLE IF NOT EXISTS " public static final String CREATE_TABLE_INSERT_STOCK_ENTRY = "CREATE TABLE IF NOT EXISTS "
+ TABLE_INSERT_STOCK_ENTRY + TABLE_INSERT_STOCK_ENTRY
+ "(" + "("
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+52 -93
View File
@@ -1,5 +1,6 @@
package cpm.com.gskmtorange.dailyentry; package cpm.com.gskmtorange.dailyentry;
import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
@@ -41,6 +42,7 @@ import android.widget.Spinner;
import android.widget.TextView; import android.widget.TextView;
import android.widget.ToggleButton; import android.widget.ToggleButton;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import androidx.cardview.widget.CardView; import androidx.cardview.widget.CardView;
@@ -82,7 +84,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
ArrayList<AdditionalDialogGetterSetter> defdata = new ArrayList<AdditionalDialogGetterSetter>(); ArrayList<AdditionalDialogGetterSetter> defdata = new ArrayList<AdditionalDialogGetterSetter>();
Spinner spinner_brand, spinner_sku; Spinner spinner_brand, spinner_sku;
Spinner spinner_brand_list, spinner_sku_list; Spinner spinner_brand_list, spinner_sku_list;
AdditionalDialogGetterSetter additionalgeetersetter; AdditionalDialogGetterSetter additionalgeetersetter;
public static ArrayList<AddittionalGetterSetter> data = new ArrayList<AddittionalGetterSetter>(); public static ArrayList<AddittionalGetterSetter> data = new ArrayList<AddittionalGetterSetter>();
ToggleButton btntoggle; ToggleButton btntoggle;
@@ -90,7 +91,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
Button btnsku; //btnaddlayout; Button btnsku; //btnaddlayout;
GSKOrangeDB db; GSKOrangeDB db;
ArrayList<SkuGetterSetter> sku_list; ArrayList<SkuGetterSetter> sku_list;
String brand_name = "", brand_id = "", SKU_name = "", SKU_ID = "", brand_list_name = "", brand_list_id = "", sku_list_name = "", sku_list_id = "", display_planogram_url=""; String brand_name = "", brand_id = "", SKU_name = "", SKU_ID = "", brand_list_name = "", brand_list_id = "", sku_list_name = "", sku_list_id = "", display_planogram_url = "";
public ListView listview; public ListView listview;
LinearLayout linearlay; LinearLayout linearlay;
CardView cardlay; CardView cardlay;
@@ -104,13 +105,13 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
ArrayList<SkuGetterSetter> empty_list = new ArrayList<>(); ArrayList<SkuGetterSetter> empty_list = new ArrayList<>();
String _pathforcheck1, _pathforcheck2, _pathforcheck3, _path, str, msg; String _pathforcheck1, _pathforcheck2, _pathforcheck3, _path, str, msg;
private SharedPreferences preferences; private SharedPreferences preferences;
String store_id, date, intime, img_str1="", img_str2="", img_str3="", togglevalue = "1", CATEGORY_ID, camera_allow, store_type_id, class_id, key_account_id; String store_id, date, intime, img_str1 = "", img_str2 = "", img_str3 = "", togglevalue = "1", CATEGORY_ID, camera_allow, store_type_id, class_id, key_account_id;
ImageView img_cam, img_clicked, img_planogram; ImageView img_cam, img_clicked, img_planogram;
Button btn_add, btn_close; Button btn_add, btn_close;
EditText Edt_txt; EditText Edt_txt;
MyAdaptorStock adapterData; MyAdaptorStock adapterData;
ListView listviewlay; ListView listviewlay;
String errormsg, categoryName, categoryId,country_id, store_flag_str; String errormsg, categoryName, categoryId, country_id, store_flag_str;
MyAdaptorAdditionalStock adapteradditional; MyAdaptorAdditionalStock adapteradditional;
AddittionalGetterSetter adGt, newadd; AddittionalGetterSetter adGt, newadd;
LinearLayout brandlayout, diaplylayout, cameralayout; LinearLayout brandlayout, diaplylayout, cameralayout;
@@ -139,9 +140,9 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
store_type_id = preferences.getString(CommonString.KEY_STORETYPE_ID, ""); store_type_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
class_id = preferences.getString(CommonString.KEY_CLASS_ID, ""); class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
key_account_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, ""); key_account_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, ""); country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null); store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
Log.e("camera_allow", camera_allow + " CountryId - " + country_id);
CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, "")); CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
@@ -188,7 +189,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
///band List ///band List
//brand_list = db.getBrandMasterData(store_type_id, class_id,key_account_id,categoryId,store_id); //brand_list = db.getBrandMasterData(store_type_id, class_id,key_account_id,categoryId,store_id);
brand_list = db.getBrandMasterDataNew(key_account_id,categoryId,store_type_id,class_id); brand_list = db.getBrandMasterDataNew(key_account_id, categoryId, store_type_id, class_id);
BrandMasterGetterSetter brand = new BrandMasterGetterSetter(); BrandMasterGetterSetter brand = new BrandMasterGetterSetter();
String str = getResources().getString(R.string.select); String str = getResources().getString(R.string.select);
brand.setBRAND(str); brand.setBRAND(str);
@@ -223,16 +224,13 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
spinner_sku_list.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { spinner_sku_list.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override @Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) { public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
if (position != 0) { if (position != 0) {
img_planogram.setEnabled(true); img_planogram.setEnabled(true);
sku_list_name = DisplayMaster_list.get(position).getDISPLAY().get(0); sku_list_name = DisplayMaster_list.get(position).getDISPLAY().get(0);
sku_list_id = DisplayMaster_list.get(position).getDISPLAY_ID().get(0); sku_list_id = DisplayMaster_list.get(position).getDISPLAY_ID().get(0);
display_planogram_url = DisplayMaster_list.get(position).getIMAGE_PATH().get(0) + DisplayMaster_list.get(position).getIMAGE_URL().get(0); display_planogram_url = DisplayMaster_list.get(position).getIMAGE_PATH().get(0) + DisplayMaster_list.get(position).getIMAGE_URL().get(0);
} } else {
else {
img_planogram.setEnabled(false); img_planogram.setEnabled(false);
} }
} }
@@ -246,7 +244,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
/// maintable /// maintable
listdata = db.getAdditionalMainStock(store_id, categoryId); listdata = db.getAdditionalMainStock(store_id, categoryId);
for (int k = 0; k < listdata.size(); k++) { for (int k = 0; k < listdata.size(); k++) {
listdata.get(k).setSkuDialogList(db.getDialogStock(listdata.get(k).getKey_id())); listdata.get(k).setSkuDialogList(db.getDialogStock(listdata.get(k).getKey_id()));
@@ -523,7 +520,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
listdata.add(adGt); listdata.add(adGt);
editFlag = true; editFlag = true;
clearViews(); clearViews();
//listdata = db.getAdditionalStock(store_id, categoryId); //listdata = db.getAdditionalStock(store_id, categoryId);
@@ -769,7 +766,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
alertDialog.show(); alertDialog.show();
}else { } else {
togglevalue = "0"; togglevalue = "0";
btntoggle.setChecked(false); btntoggle.setChecked(false);
defdata.clear(); defdata.clear();
@@ -788,67 +785,55 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
if (camera_allow.equals("1")) { if (camera_allow.equals("1")) {
btnimage.setOnClickListener(view -> {
btnimage.setOnClickListener(new View.OnClickListener() { _pathforcheck1 = store_id + categoryId + "AdditionalImage1" + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
@Override _path = CommonString.getImagesFolder(context) + _pathforcheck1;
public void onClick(View view) { intime = CommonFunctions.getCurrentTimeWithLanguage(context);
_pathforcheck1 = store_id + categoryId + "AdditionalImage1" + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg"; startCameraActivity();
_path = CommonString.getImagesFolder(context)+ _pathforcheck1;
intime = CommonFunctions.getCurrentTimeWithLanguage(context);
startCameraActivity();
}
}); });
btnimage1.setOnClickListener(new View.OnClickListener() { btnimage1.setOnClickListener(view -> {
@Override _pathforcheck2 = store_id + categoryId + "AdditionalImage2" + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
public void onClick(View view) { _path = CommonString.getImagesFolder(context) + _pathforcheck2;
_pathforcheck2 = store_id + categoryId + "AdditionalImage2" + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg"; intime = CommonFunctions.getCurrentTimeWithLanguage(context);
startCameraActivity();
_path = CommonString.getImagesFolder(context)+ _pathforcheck2;
intime = CommonFunctions.getCurrentTimeWithLanguage(context);
startCameraActivity();
}
}); });
btnimage2.setOnClickListener(new View.OnClickListener() { btnimage2.setOnClickListener(view -> {
@Override _pathforcheck3 = store_id + categoryId + "AdditionalImage3" + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
public void onClick(View view) { _path = CommonString.getImagesFolder(context) + _pathforcheck3;
_pathforcheck3 = store_id + categoryId + "AdditionalImage3" + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg"; intime = CommonFunctions.getCurrentTimeWithLanguage(context);
startCameraActivity();
_path = CommonString.getImagesFolder(context)+ _pathforcheck3;
intime = CommonFunctions.getCurrentTimeWithLanguage(context);
startCameraActivity();
}
}); });
} else { } else {
btnimage.setBackgroundResource(R.mipmap.camera_grey); btnimage.setBackgroundResource(R.mipmap.camera_grey);
btnimage1.setBackgroundResource(R.mipmap.camera_grey); btnimage1.setBackgroundResource(R.mipmap.camera_grey);
btnimage2.setBackgroundResource(R.mipmap.camera_grey); btnimage2.setBackgroundResource(R.mipmap.camera_grey);
} }
/// new changes by jp
if (camera_allow.equals("1")) {
btnimage.setBackgroundResource(country_id.equals("6") ? R.mipmap.camera_orange : R.drawable.camera_orange_star_green);
btnimage1.setBackgroundResource(R.mipmap.camera_orange);
btnimage2.setBackgroundResource(R.mipmap.camera_orange);
} else {
btnimage.setBackgroundResource(R.mipmap.camera_grey);
btnimage1.setBackgroundResource(R.mipmap.camera_grey);
btnimage2.setBackgroundResource(R.mipmap.camera_grey);
}
btnsku.setOnClickListener(new View.OnClickListener() { btnsku.setOnClickListener(view -> showSkuDialog());
@Override
public void onClick(View view) {
showSkuDialog();
}
});
} }
@SuppressLint("MissingSuperCall")
@Override @Override
public void onBackPressed() { public void onBackPressed() {
//super.onBackPressed(); //super.onBackPressed();
showDataLostAlert(); showDataLostAlert();
} }
void showDataLostAlert(){ void showDataLostAlert() {
if(editFlag){ if (editFlag) {
android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(AdditionalVisibility.this); android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(AdditionalVisibility.this);
builder.setTitle("Parinaam"); builder.setTitle("Parinaam");
builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
@@ -867,14 +852,13 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
}); });
android.app.AlertDialog alert = builder.create(); android.app.AlertDialog alert = builder.create();
alert.show(); alert.show();
} } else {
else {
finish(); finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
} }
} }
void clearViews(){ void clearViews() {
spinner_brand_list.setSelection(0); spinner_brand_list.setSelection(0);
spinner_sku_list.setSelection(0); spinner_sku_list.setSelection(0);
img_str1 = ""; img_str1 = "";
@@ -885,29 +869,21 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
sku_list_name = ""; sku_list_name = "";
sku_list_id = ""; sku_list_id = "";
defdata.clear(); defdata.clear();
btnsku.setBackgroundResource(R.color.colorPrimary); btnsku.setBackgroundResource(R.color.colorPrimary);
if (camera_allow.equals("1")) { if (camera_allow.equals("1")) {
btnimage.setBackgroundResource(R.drawable.camera_orange_star_green); btnimage.setBackgroundResource(country_id.equals("6") ? R.mipmap.camera_orange : R.drawable.camera_orange_star_green);
btnimage1.setBackgroundResource(R.mipmap.camera_orange); btnimage1.setBackgroundResource(R.mipmap.camera_orange);
btnimage2.setBackgroundResource(R.mipmap.camera_orange); btnimage2.setBackgroundResource(R.mipmap.camera_orange);
} else { } else {
btnimage.setBackgroundResource(R.mipmap.camera_grey); btnimage.setBackgroundResource(R.mipmap.camera_grey);
btnimage1.setBackgroundResource(R.mipmap.camera_grey); btnimage1.setBackgroundResource(R.mipmap.camera_grey);
btnimage2.setBackgroundResource(R.mipmap.camera_grey); btnimage2.setBackgroundResource(R.mipmap.camera_grey);
} }
} }
public void showPlanogram(String planogram_image) { public void showPlanogram(String planogram_image) {
final Dialog dialog = new Dialog(AdditionalVisibility.this); final Dialog dialog = new Dialog(AdditionalVisibility.this);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
//dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
dialog.setContentView(R.layout.planogram_dialog_layout); dialog.setContentView(R.layout.planogram_dialog_layout);
dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT); dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
dialog.setCancelable(false); dialog.setCancelable(false);
@@ -922,21 +898,12 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
webView.getSettings().setAllowFileAccess(true); webView.getSettings().setAllowFileAccess(true);
webView.getSettings().setJavaScriptEnabled(true); webView.getSettings().setJavaScriptEnabled(true);
webView.getSettings().setBuiltInZoomControls(true); webView.getSettings().setBuiltInZoomControls(true);
String html = "<html><head></head><body><img src=\"" + planogram_image + "\"></body></html>"; String html = "<html><head></head><body><img src=\"" + planogram_image + "\"></body></html>";
webView.loadDataWithBaseURL("", html, "text/html", "utf-8", ""); webView.loadDataWithBaseURL("", html, "text/html", "utf-8", "");
dialog.show(); dialog.show();
ImageView cancel = (ImageView) dialog.findViewById(R.id.img_cancel); ImageView cancel = (ImageView) dialog.findViewById(R.id.img_cancel);
cancel.setOnClickListener(new View.OnClickListener() { cancel.setOnClickListener(v -> dialog.dismiss());
@Override
public void onClick(View v) {
//setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
dialog.dismiss();
}
});
} }
@Override @Override
@@ -990,7 +957,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
cdate = arabicToenglish(cdate); cdate = arabicToenglish(cdate);
}else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) { } else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
cdate = arabicToenglish(cdate); cdate = arabicToenglish(cdate);
} }
@@ -1035,12 +1002,13 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
} }
@Override @Override
public View getDropDownView(int position, View convertView, ViewGroup parent) { public View getDropDownView(int position, View convertView, @NonNull ViewGroup parent) {
return getCustomView(position, convertView, parent); return getCustomView(position, convertView, parent);
} }
@NonNull
@Override @Override
public View getView(int position, View convertView, ViewGroup parent) { public View getView(int position, View convertView, @NonNull ViewGroup parent) {
return getCustomView(position, convertView, parent); return getCustomView(position, convertView, parent);
} }
@@ -1199,7 +1167,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
Log.i("MakeMachine", "startCameraActivity()"); Log.i("MakeMachine", "startCameraActivity()");
File file = new File(_path); File file = new File(_path);
outputFileUri = FileProvider.getUriForFile(context, "cpm.com.gskmtorange.fileprovider", file); outputFileUri = FileProvider.getUriForFile(context, "cpm.com.gskmtorange.fileprovider", file);
String defaultCameraPackage = ""; String defaultCameraPackage = "";
final PackageManager packageManager = getPackageManager(); final PackageManager packageManager = getPackageManager();
@@ -1307,7 +1275,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id, categoryId, store_id); brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id, categoryId, store_id);
}*/ }*/
if (country_id.equals("7")||country_id.equals("8") ||country_id.equals("11") || country_id.equals("17")) { if (country_id.equals("7") || country_id.equals("8") || country_id.equals("11") || country_id.equals("17")) {
brandList = db.getBrandT2PData(null, null, null, categoryId, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE); brandList = db.getBrandT2PData(null, null, null, categoryId, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) { } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id, categoryId, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC); brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id, categoryId, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
@@ -1446,13 +1414,11 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
brand_id = brandList.get(position).getBRAND_ID().get(0); brand_id = brandList.get(position).getBRAND_ID().get(0);
brand_name = brandList.get(position).getBRAND().get(0); brand_name = brandList.get(position).getBRAND().get(0);
if(country_id.equals("7")||country_id.equals("8")||country_id.equals("11") ||country_id.equals("17")){ if (country_id.equals("7") || country_id.equals("8") || country_id.equals("11") || country_id.equals("17")) {
sku_list = db.getSkuT2PData(null, null, null, brand_id, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE); sku_list = db.getSkuT2PData(null, null, null, brand_id, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
} } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)){
sku_list = db.getSkuT2PData(store_type_id, class_id, key_account_id, brand_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC); sku_list = db.getSkuT2PData(store_type_id, class_id, key_account_id, brand_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
} } else {
else {
sku_list = db.getSkuT2PData(store_type_id, class_id, key_account_id, brand_id, store_id, CommonString.TABLE_MAPPING_STOCK); sku_list = db.getSkuT2PData(store_type_id, class_id, key_account_id, brand_id, store_id, CommonString.TABLE_MAPPING_STOCK);
} }
@@ -1639,10 +1605,8 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
holder.brand.setText(list.get(position1).getBrand().toString()); holder.brand.setText(list.get(position1).getBrand().toString());
holder.display.setText(list.get(position1).getSku_name().toString()); holder.display.setText(list.get(position1).getSku_name().toString());
holder.qty_bought.setText(list.get(position1).getQuantity()); holder.qty_bought.setText(list.get(position1).getQuantity());
holder.brand.setId(position1); holder.brand.setId(position1);
holder.display.setId(position1); holder.display.setId(position1);
holder.qty_bought.setId(position1); holder.qty_bought.setId(position1);
@@ -1692,11 +1656,9 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
@Override @Override
public View getView(final int position1, View convertView, ViewGroup parent) { public View getView(final int position1, View convertView, ViewGroup parent) {
final ViewHolder holder; final ViewHolder holder;
if (convertView == null) { if (convertView == null) {
convertView = mInflater.inflate(R.layout.additionallistlayout, null); convertView = mInflater.inflate(R.layout.additionallistlayout, null);
holder = new ViewHolder(); holder = new ViewHolder();
holder.brand = (TextView) convertView.findViewById(R.id.brand_name); holder.brand = (TextView) convertView.findViewById(R.id.brand_name);
holder.display = (TextView) convertView.findViewById(R.id.display_name); holder.display = (TextView) convertView.findViewById(R.id.display_name);
holder.qty_bought = (TextView) convertView.findViewById(R.id.qty_bought); holder.qty_bought = (TextView) convertView.findViewById(R.id.qty_bought);
@@ -1708,7 +1670,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
} }
holder.delete.setOnClickListener(new View.OnClickListener() { holder.delete.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(AdditionalVisibility.this); AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(AdditionalVisibility.this);
@@ -1802,9 +1763,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
} else if (camera_allow.equals("1")) { } else if (camera_allow.equals("1")) {
if (!country_id.equals("6") && (imageu == null || imageu.equalsIgnoreCase(""))) { if (!country_id.equals("6") && (imageu == null || imageu.equalsIgnoreCase(""))) {
flag = false; flag = false;
errormsg = getResources().getString(R.string.title_activity_take_image); errormsg = getResources().getString(R.string.title_activity_take_image);
} else if (skuList.size() == 0) { } else if (skuList.size() == 0) {
errormsg = getResources().getString(R.string.title_activity_fill_sku); errormsg = getResources().getString(R.string.title_activity_fill_sku);
flag = false; flag = false;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+24 -26
View File
@@ -1151,34 +1151,32 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
dialog.cancel(); dialog.cancel();
AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this); AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this);
builder.setTitle(getResources().getString(R.string.dialog_title)); builder.setTitle(getResources().getString(R.string.dialog_title));
builder.setMessage(R.string.first_geotag_the_store).setCancelable(false).setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() { builder.setMessage(R.string.first_geotag_the_store).setCancelable(false).setPositiveButton(getResources().getString(R.string.ok), (dialog1, id) -> {
public void onClick(DialogInterface dialog1, int id) { editor = preferences.edit();
editor = preferences.edit(); editor.putString(CommonString.KEY_STORE_FLAG_FACING_HIDE, current.getFACING_HIDE());
editor.putString(CommonString.KEY_STORE_FLAG_FACING_HIDE, current.getFACING_HIDE()); editor.putString(CommonString.KEY_STORE_ID, current.getSTORE_ID());
editor.putString(CommonString.KEY_STORE_ID, current.getSTORE_ID()); editor.putString(CommonString.KEY_STORE_NAME, current.getSTORE_NAME());
editor.putString(CommonString.KEY_STORE_NAME, current.getSTORE_NAME()); editor.putString(CommonString.KEY_VISIT_DATE, current.getVISIT_DATE());
editor.putString(CommonString.KEY_VISIT_DATE, current.getVISIT_DATE()); editor.putString(CommonString.KEY_CAMERA_ALLOW, current.getCAMERA_ALLOW());
editor.putString(CommonString.KEY_CAMERA_ALLOW, current.getCAMERA_ALLOW()); editor.putString(CommonString.KEY_CHECKOUT_STATUS, current.getCHECKOUT_STATUS());
editor.putString(CommonString.KEY_CHECKOUT_STATUS, current.getCHECKOUT_STATUS()); editor.putString(CommonString.KEY_CLASS_ID, current.getCLASS_ID());
editor.putString(CommonString.KEY_CLASS_ID, current.getCLASS_ID()); editor.putString(CommonString.KEY_EMP_ID, current.getEMP_ID());
editor.putString(CommonString.KEY_EMP_ID, current.getEMP_ID()); editor.putString(CommonString.KEY_GEO_TAG, current.getGEO_TAG());
editor.putString(CommonString.KEY_GEO_TAG, current.getGEO_TAG()); editor.putString(CommonString.KEY_KEYACCOUNT_ID, current.getKEYACCOUNT_ID());
editor.putString(CommonString.KEY_KEYACCOUNT_ID, current.getKEYACCOUNT_ID()); editor.putString(CommonString.KEY_STORETYPE_ID, current.getSTORETYPE_ID());
editor.putString(CommonString.KEY_STORETYPE_ID, current.getSTORETYPE_ID()); editor.putString(CommonString.KEY_POG_TYPE_ID, current.getPOG_TYPE_ID());
editor.putString(CommonString.KEY_POG_TYPE_ID, current.getPOG_TYPE_ID()); editor.putString(CommonString.KEY_UPLOAD_STATUS, current.getUPLOAD_STATUS());
editor.putString(CommonString.KEY_UPLOAD_STATUS, current.getUPLOAD_STATUS()); editor.putString(CommonString.KEY_STORE_FLAG, store_flag_str);
editor.putString(CommonString.KEY_STORE_FLAG, store_flag_str);
editor.commit(); editor.commit();
Intent in = new Intent(StoreListActivity.this, GeoTagActivity.class); Intent in = new Intent(StoreListActivity.this, GeoTagActivity.class);
in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str); in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID()); in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID());
in.putExtra(CommonString.KEY_STORE_FLAG_FACING_HIDE, store_facing_hide); in.putExtra(CommonString.KEY_STORE_FLAG_FACING_HIDE, store_facing_hide);
startActivity(in); startActivity(in);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out); overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
dialog1.cancel(); dialog1.cancel();
}
}); });
AlertDialog alert = builder.create(); AlertDialog alert = builder.create();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
-25
View File
@@ -584,22 +584,8 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
protected void startCameraActivity() { protected void startCameraActivity() {
try { try {
/*Log.i("MakeMachine", "startCameraActivity()");
File file = new File(_path);
Uri outputFileUri = FileProvider.getUriForFile(getApplicationContext(), "cpm.com.gskmtorange.fileprovider", file);
Intent intent = new Intent(
MediaStore.ACTION_IMAGE_CAPTURE);
intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
startActivityForResult(intent, 0);*/
Log.i("MakeMachine", "startCameraActivity()"); Log.i("MakeMachine", "startCameraActivity()");
File file = new File(_path); File file = new File(_path);
//android.os.FileUriExposedException: file:///storage/emulated/0/.GSK_MT_ORANGE_IMAGES/15024SI_01022019_120426.jpg exposed beyond app through ClipData.Item.getUri()
//outputFileUri = FileProvider.getUriForFile(getApplicationContext(), "cpm.com.gskmtorange.fileprovider", file);
outputFileUri = FileProvider.getUriForFile(context, "cpm.com.gskmtorange.fileprovider", file); outputFileUri = FileProvider.getUriForFile(context, "cpm.com.gskmtorange.fileprovider", file);
String defaultCameraPackage = ""; String defaultCameraPackage = "";
@@ -741,17 +727,6 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
/*protected void onStart() {
mGoogleApiClient.connect();
super.onStart();
}
protected void onStop() {
mGoogleApiClient.disconnect();
super.onStop();
}*/
@Override @Override
public void onLocationChanged(Location location) { public void onLocationChanged(Location location) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
+167 -258
View File
@@ -28,6 +28,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Objects;
import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter; import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter;
@@ -72,12 +73,11 @@ public class CategoryListActivity extends AppCompatActivity {
country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, null); country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, null);
store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null); store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
pog_type_id = preferences.getString(CommonString.KEY_POG_TYPE_ID, ""); pog_type_id = preferences.getString(CommonString.KEY_POG_TYPE_ID, "");
if (preferences.getString(CommonString.KEY_VISIT_ID, "") != null) { preferences.getString(CommonString.KEY_VISIT_ID, "");
visit_type_id = preferences.getString(CommonString.KEY_VISIT_ID, ""); visit_type_id = preferences.getString(CommonString.KEY_VISIT_ID, "");
}
toolbar.setTitle(getResources().getString(R.string.title_activity_category_list)); toolbar.setTitle(getResources().getString(R.string.title_activity_category_list));
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true); Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab_category); FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab_category);
fab.setOnClickListener(view -> Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG).setAction("Action", null).show()); fab.setOnClickListener(view -> Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG).setAction("Action", null).show());
} }
@@ -91,7 +91,6 @@ public class CategoryListActivity extends AppCompatActivity {
Log.e("country_data", country_id + "," + keyAccount_id); Log.e("country_data", country_id + "," + keyAccount_id);
if (country_id.equals("7") || country_id.equals("8") || country_id.equals("17")) { if (country_id.equals("7") || country_id.equals("8") || country_id.equals("17")) {
categoryList = db.getCategoryListData(null, null, null, store_id, "MAPPING_STOCK_STOREWISE"); categoryList = db.getCategoryListData(null, null, null, store_id, "MAPPING_STOCK_STOREWISE");
Log.d("catlistsize", String.valueOf(categoryList.size()));
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) { } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
categoryList = db.getCategoryListData(keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC); categoryList = db.getCategoryListData(keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)) { } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)) {
@@ -99,266 +98,52 @@ public class CategoryListActivity extends AppCompatActivity {
} else { } else {
categoryList = db.getCategoryListData(keyAccount_id, storeType_id, class_id, store_id, "MAPPING_STOCK"); categoryList = db.getCategoryListData(keyAccount_id, storeType_id, class_id, store_id, "MAPPING_STOCK");
} }
if (categoryList != null && !categoryList.isEmpty()) { if (categoryList != null && !categoryList.isEmpty()) {
for (int i = 0; i < categoryList.size(); i++) { for (int i = 0; i < categoryList.size(); i++) {
boolean flag_filled = false;
String category_id = categoryList.get(i).getCategory_id(); String category_id = categoryList.get(i).getCategory_id();
if (store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)) { boolean flag_filled = isCategoryComplete(category_id);
db.open(); int imageRes = getImageRes(flag_filled, category_id);
boolean flag_mapping_stock = db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADDITIONAL); categoryList.get(i).setCategory_img(imageRes);
if (flag_mapping_stock) {
if (db.checkStockData(store_id, category_id, visit_date)) {
flag_filled = true;
} else {
flag_filled = false;
}
}
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION) && country_id.equals("2") && visit_type_id.equals("3")) {
db.open();
if (db.additionalVisibilitydata(store_id, category_id)) {
flag_filled = true;
} else {
flag_filled = false;
}
} else {
//Additional_Visibility
if (db.additionalVisibilitydata(store_id, category_id)) {
boolean flag = true;
//MSL_Availability
boolean flag_mapping_stock;
//New MSL_Availability_StockFacing
if (country_id.equals("7")) {
flag_mapping_stock = db.isMappingStockDataStockFacing(category_id, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
flag_mapping_stock = db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
} else {
flag_mapping_stock = db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK);
}
if (flag_mapping_stock) {
if (!db.checkMsl_Availability_StockFacingDataNew(store_id, category_id, visit_date)) {
flag = false;
}
}
//Stock_Entry
boolean flag_stock_mapping_stock;
if (country_id.equals("10")) {
flag_stock_mapping_stock = db.isMappingStockDataStockFacing(category_id, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
flag_stock_mapping_stock = db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
} else {
flag_stock_mapping_stock = db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK);
}
if (flag_stock_mapping_stock) {
if (!db.checkStock_Entry_FacingDataNew(store_id, category_id, visit_date)) {
flag = false;
}
}
//Promo Compliance
if (flag) {
if (country_id.equals("7")) {
if (db.getPromoComplianceSkuwiseExistsAfterData(store_id, category_id).size() == 0) {
flag = false;
}
} else {
boolean isMappingPromotion_Flag;
if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
isMappingPromotion_Flag = db.isMappingPromotionData(store_id, category_id, CommonString.TABLE_MAPPING_PROMOTION_ADHOC);
} else {
isMappingPromotion_Flag = db.isMappingPromotionData(store_id, category_id, CommonString.TABLE_MAPPING_PROMOTION);
}
if (isMappingPromotion_Flag) {
if (!db.checkPromoComplianceData(store_id, category_id)) {
flag = false;
}
}
}
}
//T2P
if (flag) {
boolean flag_t2p_mapping;
if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
flag_t2p_mapping = db.isMappingT2PData(store_id, category_id, CommonString.TABLE_MAPPING_T2P_ADHOC);
} else {
flag_t2p_mapping = db.isMappingT2PData(store_id, category_id, CommonString.TABLE_MAPPING_T2P);
}
if (flag_t2p_mapping) {
if (!db.isFilledT2P(store_id, category_id)) {
flag = false;
}
}
}
//Category image
if (camera_allow.equals("1")) {
if (!db.isCategoryPictureData(store_id, category_id)) {
flag = false;
}
} else {
final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(category_id, store_id, country_id);
//if Sub Group Data exists for any Sub Category of the Category
boolean isSubGroupDataExists = false;
for (int j = 0; j < sub_category_list.size(); j++) {
if (db.getSkuGroupMasterData(category_id, sub_category_list.get(j).getSub_category_id()).size() > 0) {
isSubGroupDataExists = true;
break;
}
}
if (isSubGroupDataExists) {
if (db.getNoCameraCategoryDataInserted(store_id, category_id, null).size() == 0) {
flag = false;
}
}
}
//Order Taking Data
if (country_id.equals("15") || ((country_id.equals("17") && category_id.equals("2")))) {
if (!db.checkOrder_taking_Data(store_id, category_id)) {
flag = false;
}
}
if (flag) {
//changed on 23.10.2018
//ArrayList<AuditDataGetterSetter> question_list = getAuditAfterDeletion(category_id);
//changed on 03.12.2018
ArrayList<AuditDataGetterSetter> question_list = getAuditQnsRemoved(category_id);
if (question_list.size() > 0) {
/*if (!country_id.equals("6") && db.getAfterSaveAuditQuestionAnswerData(store_id, category_id).size() == 0) {
flag = false;
}*/
if (db.getAfterSaveAuditQuestionAnswerData(store_id, category_id).size() == 0) {
flag = false;
}
}
}
//new add UAE pharma
if (flag) {
if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) {
if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) {
flag = false;
}
}
if (country_id.equals("2")) {
if (camera_allow.equals("1")) {
if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) {
if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) {
flag = false;
}
}
} else {
flag = true;
}
} else {
if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) {
if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) {
flag = false;
}
}
}
}
if (flag) {
//Counterfeit Product Option - Egypt
if (country_id.equals("6")) {
if (db.getCounterfeitProductExistsAfterData(store_id, category_id).size() == 0) {
flag = false;
}
}
//usk
if (country_id.equals("6") && category_id.equals("2")) {
if (db.getCompetitionPromoExistsAfterData(store_id, category_id).size() == 0) {
flag = false;
}
}
}
//// 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.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;
}
}
if (flag_filled) {
switch (category_id) {
case "1":
categoryList.get(i).setCategory_img(R.mipmap.health_food_drink_tick);
break;
case "2":
categoryList.get(i).setCategory_img(R.mipmap.oralcare_tick);
break;
case "3":
categoryList.get(i).setCategory_img(R.mipmap.wellness_tick);
break;
case "4":
categoryList.get(i).setCategory_img(R.mipmap.nutritionals_tick);
break;
case "5":
categoryList.get(i).setCategory_img(R.mipmap.gastro_n_indigestion_tick);
break;
case "6":
case "10":
categoryList.get(i).setCategory_img(R.mipmap.cough_n_cold_tick);
break;
case "7":
case "9":
categoryList.get(i).setCategory_img(R.mipmap.analgesics_tick);
break;
case "8":
categoryList.get(i).setCategory_img(R.mipmap.first_aid_tick);
break;
}
} else {
switch (category_id) {
case "1":
categoryList.get(i).setCategory_img(R.mipmap.health_food_drink);
break;
case "2":
categoryList.get(i).setCategory_img(R.mipmap.oral_care);
break;
case "3":
categoryList.get(i).setCategory_img(R.mipmap.wellness);
break;
case "4":
categoryList.get(i).setCategory_img(R.mipmap.nutritionals);
break;
case "5":
categoryList.get(i).setCategory_img(R.mipmap.gastro_n_indigestion);
break;
case "6":
case "10":
categoryList.get(i).setCategory_img(R.mipmap.cough_n_cold);
break;
case "7":
case "9":
categoryList.get(i).setCategory_img(R.mipmap.analgesics);
break;
case "8":
categoryList.get(i).setCategory_img(R.mipmap.first_aid);
break;
}
}
} }
adapter = new CategoryListAdapter(CategoryListActivity.this, categoryList); adapter = new CategoryListAdapter(this, categoryList);
recyclerView.setAdapter(adapter); recyclerView.setAdapter(adapter);
recyclerView.setLayoutManager(new GridLayoutManager(context, 2)); recyclerView.setLayoutManager(new GridLayoutManager(context, 2));
updateStatus(); updateStatus();
} }
}
private int getImageRes(boolean flag_filled, String category_id) {
int imageRes = 0;
if (flag_filled) {
imageRes = switch (category_id) {
case "1" -> R.mipmap.health_food_drink_tick;
case "2" -> R.mipmap.oralcare_tick;
case "3" -> R.mipmap.wellness_tick;
case "4" -> R.mipmap.nutritionals_tick;
case "5" -> R.mipmap.gastro_n_indigestion_tick;
case "6", "10" -> R.mipmap.cough_n_cold_tick;
case "7", "9" -> R.mipmap.analgesics_tick;
case "8" -> R.mipmap.first_aid_tick;
default -> imageRes;
};
} else {
imageRes = switch (category_id) {
case "1" -> R.mipmap.health_food_drink;
case "2" -> R.mipmap.oral_care;
case "3" -> R.mipmap.wellness;
case "4" -> R.mipmap.nutritionals;
case "5" -> R.mipmap.gastro_n_indigestion;
case "6", "10" -> R.mipmap.cough_n_cold;
case "7", "9" -> R.mipmap.analgesics;
case "8" -> R.mipmap.first_aid;
default -> imageRes;
};
}
return imageRes;
} }
ArrayList<AuditDataGetterSetter> getAuditAfterDeletion(String category_id) { ArrayList<AuditDataGetterSetter> getAuditAfterDeletion(String category_id) {
@@ -494,6 +279,7 @@ public class CategoryListActivity extends AppCompatActivity {
public void onBindViewHolder(MyViewHolder holder, int position) { public void onBindViewHolder(MyViewHolder holder, int position) {
final CategoryGetterSetter categoryData = list.get(position); final CategoryGetterSetter categoryData = list.get(position);
holder.categoryName.setText(categoryData.getCategory()); holder.categoryName.setText(categoryData.getCategory());
Log.e("CatImg--", "" + categoryData.getCategory_img());
holder.categoryIcon.setImageResource(categoryData.getCategory_img()); holder.categoryIcon.setImageResource(categoryData.getCategory_img());
holder.lay_menu.setOnClickListener(view -> { holder.lay_menu.setOnClickListener(view -> {
Intent intent = new Intent(CategoryListActivity.this, CategoryWisePerformanceActivity.class); Intent intent = new Intent(CategoryListActivity.this, CategoryWisePerformanceActivity.class);
@@ -713,9 +499,8 @@ public class CategoryListActivity extends AppCompatActivity {
} }
} }
} }
if (flag_filled) { db.open();
db.updateCheckoutStatus(store_id, CommonString.KEY_VALID, CommonString.KEY_JOURNEY_PLAN); db.updateCheckoutStatus(store_id, flag_filled ? CommonString.KEY_VALID : CommonString.KEY_INVALID, CommonString.KEY_JOURNEY_PLAN);
}
} }
@@ -731,4 +516,128 @@ public class CategoryListActivity extends AppCompatActivity {
return ir_list; return ir_list;
} }
private boolean isCategoryComplete(String category_id) {
boolean flag_filled = true;
if (store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)) {
flag_filled = db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id, store_id,
CommonString.TABLE_MAPPING_STOCK_ADDITIONAL)
&& db.checkStockData(store_id, category_id, visit_date);
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)
&& country_id.equals("2") && visit_type_id.equals("3")) {
db.open();
flag_filled = db.additionalVisibilitydata(store_id, category_id);
} else {
db.open();
if (!db.additionalVisibilitydata(store_id, category_id)) {
return false;
}
// MSL & Stock Entry
if (!validateStk(category_id)) {
return false;
}
// T2P
if (db.isMappingT2PData(store_id, category_id,
store_flag_str.equals(CommonString.FROM_DEVIATION)
? CommonString.TABLE_MAPPING_T2P_ADHOC
: CommonString.TABLE_MAPPING_T2P)) {
if (!db.isFilledT2P(store_id, category_id)) {
return false;
}
}
// Camera
if (camera_allow.equals("1")) {
if (!db.isCategoryPictureData(store_id, category_id)) {
return false;
}
} else {
ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list =
db.getSubCategoryMaster(category_id, store_id, country_id);
boolean isSubGroupMissing = false;
for (MSL_AvailabilityStockFacingGetterSetter subCat : sub_category_list) {
if (db.getSkuGroupMasterData(category_id, subCat.getSub_category_id()).isEmpty()) {
isSubGroupMissing = true;
break;
}
}
if (isSubGroupMissing && db.getNoCameraCategoryDataInserted(store_id, category_id, null).isEmpty()) {
return false;
}
}
// Audit Questions
if (!getAuditQnsRemoved(category_id).isEmpty()
&& db.getAfterSaveAuditQuestionAnswerData(store_id, category_id).isEmpty()) {
return false;
}
// POG Upload
if (!db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).isEmpty()
&& db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).isEmpty()) {
return false;
}
// Egypt - Counterfeit & Promo
if (country_id.equals("6")) {
if (db.getCounterfeitProductExistsAfterData(store_id, category_id).isEmpty()) {
return false;
}
if (category_id.equals("2") && db.getCompetitionPromoExistsAfterData(store_id, category_id).isEmpty()) {
return false;
}
}
// Order Taking for country 15
if (country_id.equals("15") && !db.checkOrder_taking_Data(store_id, category_id)) {
return false;
}
// IR-PD Image Check
ArrayList<CategoryPictureGetterSetter> irList = isPdIRMapping(category_id);
if (irList != null && !irList.isEmpty() && camera_allow.equals("1")) {
if (!db.isFilledIRPDdata(store_id, visit_date, category_id)) {
return false;
}
}
}
return flag_filled;
}
private boolean validateStk(String category_id) {
boolean flag_filled = true;
if (isMappingStockData(category_id)) {
if (country_id.equals("10")) {
db.open();
if (!db.checkStock_Entry_FacingDataNew(store_id, category_id, visit_date)) {
flag_filled = false;
}
} else {
if (!db.checkMsl_Availability_StockFacingDataNew(store_id, category_id, visit_date)) {
flag_filled = false;
}
}
}
return flag_filled;
}
boolean isMappingStockData(String categoryId) {
boolean flag;
if (country_id.equals("7") || country_id.equals("8") || country_id.equals("17")) {
flag = db.isMappingStockDataStockFacing(categoryId, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
flag = db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
} else {
flag = db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK);
}
return flag;
}
} }
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
-2
View File
@@ -550,11 +550,9 @@ public class DailyDataMenuActivity extends AppCompatActivity {
} else { } else {
flag_t2p_mapping = db.isMappingT2PData(store_id, categoryId, CommonString.TABLE_MAPPING_T2P); flag_t2p_mapping = db.isMappingT2PData(store_id, categoryId, CommonString.TABLE_MAPPING_T2P);
} }
if (flag_t2p_mapping) { if (flag_t2p_mapping) {
if (db.isFilledT2P(store_id, categoryId)) { if (db.isFilledT2P(store_id, categoryId)) {
ArrayList<T2PGetterSetter> t2PList = db.getT2pComplianceData(store_id, categoryId); ArrayList<T2PGetterSetter> t2PList = db.getT2pComplianceData(store_id, categoryId);
for (int i = 0; i < t2PList.size(); i++) { for (int i = 0; i < t2PList.size(); i++) {
if (t2PList.get(i).getPresent() == 1) { if (t2PList.get(i).getPresent() == 1) {
t2p_flag = true; t2p_flag = true;
GSKMTOrange/src/main/res/layout/additionallistlayout.xml
+1
View File
@@ -109,6 +109,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:visibility="invisible"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="15dp"> android:paddingLeft="15dp">
library/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties
+1 -1
View File
@@ -1,4 +1,4 @@
#Fri Jun 06 19:00:06 IST 2025 #Tue Jun 24 16:39:12 IST 2025
com.androidbuts.multispinnerfilter.library-main-5\:/layout/textview_for_spinner.xml=D\:\\jeevanp_cpm_projects\\FromRavi\\Haleon_Kenya_pd\\HALEON_KENYA_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\textview_for_spinner.xml com.androidbuts.multispinnerfilter.library-main-5\:/layout/textview_for_spinner.xml=D\:\\jeevanp_cpm_projects\\FromRavi\\Haleon_Kenya_pd\\HALEON_KENYA_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\textview_for_spinner.xml
com.androidbuts.multispinnerfilter.library-main-5\:/layout/activity_main.xml=D\:\\jeevanp_cpm_projects\\FromRavi\\Haleon_Kenya_pd\\HALEON_KENYA_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\activity_main.xml com.androidbuts.multispinnerfilter.library-main-5\:/layout/activity_main.xml=D\:\\jeevanp_cpm_projects\\FromRavi\\Haleon_Kenya_pd\\HALEON_KENYA_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\activity_main.xml
com.androidbuts.multispinnerfilter.library-main-5\:/layout/alert_dialog_listview_search.xml=D\:\\jeevanp_cpm_projects\\FromRavi\\Haleon_Kenya_pd\\HALEON_KENYA_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\alert_dialog_listview_search.xml com.androidbuts.multispinnerfilter.library-main-5\:/layout/alert_dialog_listview_search.xml=D\:\\jeevanp_cpm_projects\\FromRavi\\Haleon_Kenya_pd\\HALEON_KENYA_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\alert_dialog_listview_search.xml