From 96b2ff2eb674206d9270e8760d3476d306e85634 Mon Sep 17 00:00:00 2001 From: yadavendras Date: Thu, 12 Jan 2017 17:49:12 +0530 Subject: [PATCH] T2P upload data new --- .idea/misc.xml | 2 +- GSKMTOrange/src/main/AndroidManifest.xml | 6 +- .../com/gskmtorange/Database/GSKOrangeDB.java | 4 +- .../gskmtorange/GeoTag/GeoTagStoreList.java | 4 +- .../cpm/com/gskmtorange/LoginActivity.java | 13 +++ .../cpm/com/gskmtorange/MainActivity.java | 8 +- .../dailyentry/NonWorkingReason.java | 2 +- .../dailyentry/T2PComplianceActivity.java | 8 +- .../download/DownloadActivity.java | 28 +++--- .../gskmtorange/upload/UploadActivity.java | 35 +++++++ .../src/main/res/drawable/toggle_green.png | Bin 0 -> 3959 bytes .../src/main/res/drawable/toggle_grey.png | Bin 0 -> 3928 bytes .../drawable/toggle_selector_background.xml | 4 +- .../src/main/res/layout/activity_login.xml | 87 +----------------- .../res/layout/activity_splash_screen.xml | 6 +- .../main/res/layout/activity_storeimage.xml | 1 - .../res/layout/content_daily_main_menu.xml | 2 +- .../src/main/res/layout/content_main.xml | 7 +- .../res/layout/content_promo_compliance.xml | 5 +- .../src/main/res/layout/contentstoreimage.xml | 4 +- .../res/layout/custom_dialog_progress.xml | 2 +- GSKMTOrange/src/main/res/layout/dialogbox.xml | 6 +- .../layout/item_msl_availability_child.xml | 2 +- .../src/main/res/layout/nav_header_main.xml | 2 +- .../src/main/res/layout/nonworking.xml | 2 +- .../src/main/res/layout/t2p_item_layout.xml | 14 +-- .../main/res/layout/t2p_sku_dialog_layout.xml | 54 +++++------ .../main/res/menu/activity_main_drawer.xml | 18 ++-- .../main/res/mipmap-hdpi/download_grey.png | Bin 0 -> 2451 bytes .../src/main/res/mipmap-hdpi/entry_grey.png | Bin 0 -> 2029 bytes .../src/main/res/mipmap-hdpi/exit_grey.png | Bin 0 -> 1941 bytes .../src/main/res/mipmap-hdpi/geotag_grey.png | Bin 0 -> 2667 bytes .../main/res/mipmap-hdpi/services_grey.png | Bin 0 -> 3351 bytes .../main/res/mipmap-hdpi/settings_grey.png | Bin 0 -> 3364 bytes .../src/main/res/mipmap-hdpi/upload_grey.png | Bin 0 -> 2450 bytes GSKMTOrange/src/main/res/values-tr/string.xml | 26 +++++- GSKMTOrange/src/main/res/values/strings.xml | 20 +++- 37 files changed, 187 insertions(+), 185 deletions(-) create mode 100644 GSKMTOrange/src/main/res/drawable/toggle_green.png create mode 100644 GSKMTOrange/src/main/res/drawable/toggle_grey.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/download_grey.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/entry_grey.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/exit_grey.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/geotag_grey.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/services_grey.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/settings_grey.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/upload_grey.png diff --git a/.idea/misc.xml b/.idea/misc.xml index b15ecee..b8dc4d6 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -41,7 +41,7 @@ - + diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index ac805bc..c363469 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -14,7 +14,7 @@ @@ -34,7 +34,7 @@ android:theme="@style/AppTheme.NoActionBar" /> (this, android.R.layout.simple_spinner_item); - reason_adapter.add("Select Reason"); + reason_adapter.add(getResources().getString(R.string.select_reason)); for (int i = 0; i < reasondata.size(); i++) { reason_adapter.add(reasondata.get(i).getREASON().get(0)); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index 9f1ab57..e748e66 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -215,7 +215,7 @@ public class T2PComplianceActivity extends AppCompatActivity { @Override public void onClick(View v) { - mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase("Yes")); + mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase(getResources().getString(R.string.yes))); t2PAdapter.notifyDataSetChanged(); } @@ -406,7 +406,7 @@ public class T2PComplianceActivity extends AppCompatActivity { spinner_brand.setSelection(0); SkuGetterSetter select = new SkuGetterSetter(); - select.setSKU("Select"); + select.setSKU(getString(R.string.select)); sku_list.clear(); sku_list.add(select); CustomSkuAdapter skuadapter = new CustomSkuAdapter(T2PComplianceActivity.this, R.layout.custom_spinner_item, sku_list); @@ -438,7 +438,7 @@ public class T2PComplianceActivity extends AppCompatActivity { SkuGetterSetter select = new SkuGetterSetter(); - select.setSKU("Select"); + select.setSKU(getString(R.string.select)); sku_list.add(select); CustomSkuAdapter skuadapter = new CustomSkuAdapter(T2PComplianceActivity.this, R.layout.custom_spinner_item, sku_list); spinner_sku.setAdapter(skuadapter); @@ -463,7 +463,7 @@ public class T2PComplianceActivity extends AppCompatActivity { } SkuGetterSetter select = new SkuGetterSetter(); - select.setSKU("Select"); + select.setSKU(getString(R.string.select)); sku_list.add(0, select); // Create custom adapter object ( see below CustomSkuAdapter.java ) CustomSkuAdapter skuadapter = new CustomSkuAdapter(T2PComplianceActivity.this, R.layout.custom_spinner_item, sku_list); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java index c6a0484..bceb406 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -116,7 +116,7 @@ public class DownloadActivity extends AppCompatActivity { data = new Data(); data.value = 10; - data.name = "JCP Data Downloading"; + data.name = "JCP "+getResources().getString(R.string.download_data); publishProgress(data); XmlPullParserFactory factory = XmlPullParserFactory.newInstance(); @@ -157,7 +157,7 @@ public class DownloadActivity extends AppCompatActivity { } data.value = 10; - data.name = "JCP Data Downloading"; + data.name = "JCP "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -193,7 +193,7 @@ public class DownloadActivity extends AppCompatActivity { } data.value = 20; - data.name = "SKU_MASTER Data Download"; + data.name = "SKU_MASTER "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -229,7 +229,7 @@ public class DownloadActivity extends AppCompatActivity { } data.value = 30; - data.name = "BRAND_MASTER Data Download"; + data.name = "BRAND_MASTER "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -264,7 +264,7 @@ public class DownloadActivity extends AppCompatActivity { return "SUB_CATEGORY_MASTER"; } data.value = 40; - data.name = "SUB_CATEGORY_MASTER Data Download"; + data.name = "SUB_CATEGORY_MASTER "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -299,7 +299,7 @@ public class DownloadActivity extends AppCompatActivity { return "CATEGORY_MASTER"; } data.value = 50; - data.name = "CATEGORY_MASTER Data Download"; + data.name = "CATEGORY_MASTER "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -334,7 +334,7 @@ public class DownloadActivity extends AppCompatActivity { return "DISPLAY_MASTER"; } data.value = 60; - data.name = "DISPLAY_MASTER Data Download"; + data.name = "DISPLAY_MASTER "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -369,7 +369,7 @@ public class DownloadActivity extends AppCompatActivity { return "MAPPING_STOCK"; } data.value = 80; - data.name = "MAPPING_STOCK Data Download"; + data.name = "MAPPING_STOCK "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -404,7 +404,7 @@ public class DownloadActivity extends AppCompatActivity { //return "MAPPING_T2P"; } data.value = 100; - data.name = "MAPPING_T2P Data Download"; + data.name = "MAPPING_T2P "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -438,7 +438,7 @@ public class DownloadActivity extends AppCompatActivity { return "DISPLAY_CHECKLIST_MASTER"; } data.value = 100; - data.name = "DISPLAY_CHECKLIST_MASTER Data Download"; + data.name = "DISPLAY_CHECKLIST_MASTER "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -472,7 +472,7 @@ public class DownloadActivity extends AppCompatActivity { //return "MAPPING_DISPLAY_CHECKLIST"; } data.value = 100; - data.name = "MAPPING_DISPLAY_CHECKLIST Data Download"; + data.name = "MAPPING_DISPLAY_CHECKLIST "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -507,7 +507,7 @@ public class DownloadActivity extends AppCompatActivity { return "NON_WORKING_REASON"; } data.value = 100; - data.name = "NON_WORKING_REASON Data Download"; + data.name = "NON_WORKING_REASON "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -542,7 +542,7 @@ public class DownloadActivity extends AppCompatActivity { //return "MAPPING_PROMOTION"; }*/ data.value = 100; - data.name = "MAPPING_PROMOTION Data Download"; + data.name = "MAPPING_PROMOTION "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -580,7 +580,7 @@ public class DownloadActivity extends AppCompatActivity { //return "MAPPING_ADDITIONAL_PROMOTION"; }*/ data.value = 100; - data.name = "MAPPING_ADDITIONAL_PROMOTION Data Download"; + data.name = "MAPPING_ADDITIONAL_PROMOTION "+getResources().getString(R.string.download_data); } publishProgress(data); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java index 1ebb27d..78b9c94 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -465,6 +465,8 @@ public class UploadActivity extends AppCompatActivity { } gaps_child = "[GAPS]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + "[CHECK_LIST_ID]" + gapsList.get(l).getChecklist_id() + "[/CHECK_LIST_ID]" @@ -474,6 +476,9 @@ public class UploadActivity extends AppCompatActivity { + "[PRESENT]" + present + "[/PRESENT]" + + "[COMMON_ID]" + + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + + "[/COMMON_ID]" + "[/GAPS]"; gaps_xml = gaps_xml + gaps_child; } @@ -484,6 +489,8 @@ public class UploadActivity extends AppCompatActivity { for (int k = 0; k < skuList.size(); k++) { sku_child = "[SKU]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + "[SKU_ID]" + skuList.get(k).getSKU_ID() + "[/SKU_ID]" @@ -493,6 +500,9 @@ public class UploadActivity extends AppCompatActivity { + "[STOCK]" + skuList.get(k).getSTOCK() + "[/STOCK]" + + "[COMMON_ID]" + + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + + "[/COMMON_ID]" + "[/SKU]"; sku_xml = sku_xml + sku_child; } @@ -621,6 +631,31 @@ public class UploadActivity extends AppCompatActivity { } + for(int m=0;mKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000D{NklRWcbwd_6#n}#6SR0Nr4l;3qzoA zFa~C4WM^Rd&+(t}qRUn3Lk`CGynhq|Nmkl7!LTtK*UwVlnGxLd}@7rieBM> zEeryMgCPopgC(V~g~1_*W75L@lF|SG00960A{Y(?!%0d|nt|;YCjI~b00960qPRR5 z@bZM>WF#dh&A@t<@ju&1I^(m9|0R?q6(Aw-cYyFe2HAm+f>8&II$%&a;6DQc!{7f5 z3`~qnG{MY_%n*8<)quEo65xfb)zpc`JuJB#rT;}521ub=+^*!QXa!}L#CAEtlG zq#K_4DgF85XQu}|7XSbN0RR6QZ4Zn(fJt0mT!`Er8b#PqL{m~iih=2;`z&M%da8{upZJ9!4?8P{{3KB`*t-+!x9;N3jJf8DIyZGq4=#4gR<>K0 z%7Y?Fe?tF3f&WNEM4@=pItm`zp*k0eSRxthKu3cF*L^<^D;YFiyvWSFf$twMALb2j z-kW#r>jRlzpUC_pXaTMpV7L@edU|6%|51N0Z0c`?O}&@uw)B4YdhY$;$dErYFsvK^ z(b6ZL85P%ziEApU&NCy@CASbNK(F)fyd*Q1Q8~Z`a`qiy0W5$8umBdo0$2bGU;!+E z1+W0IA5L`srb}YxssIAC1eVHA*qD4rSPl6w)ksufHDrBagT?;Gv|{$fE(H+av<<7{ zZ+TN$;X&yUGk%R)&upTa@oPNnn`32sjaOqYIc>)y{0E@uoD+HW<2j#ye@grq504rw zA1>oK@vAIyGGtvcsKx^zNwxb(&^00bm2 zIq^VTkYdVnLAs^z7eI>QxUYL&3{(TZJR6Lb>p`_#4{oQnJHhnLg~9vkSVd?~90VhI zX^U_Eh-VJPHM`=P?bPO(9VyBliUZ)tiJ~Uwne)BsRz_+^QB&+xIO_ms0{|}u)V%^R RfOh}@002ovPDHLkV1g}pTO0rY literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/drawable/toggle_grey.png b/GSKMTOrange/src/main/res/drawable/toggle_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..3e650b89ac42c10f3cc1d430a460da6eeb89298f GIT binary patch literal 3928 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 m^pRQ=013(f0000 - - + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/activity_login.xml b/GSKMTOrange/src/main/res/layout/activity_login.xml index 4131c23..454e513 100644 --- a/GSKMTOrange/src/main/res/layout/activity_login.xml +++ b/GSKMTOrange/src/main/res/layout/activity_login.xml @@ -1,80 +1,3 @@ - + android:background="@drawable/gsklogo"> @@ -226,7 +149,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:text="Version" + android:text="Version/Versiyon" android:textSize="@dimen/text_size_normal" /> diff --git a/GSKMTOrange/src/main/res/layout/activity_splash_screen.xml b/GSKMTOrange/src/main/res/layout/activity_splash_screen.xml index 4188c60..bf5cccd 100644 --- a/GSKMTOrange/src/main/res/layout/activity_splash_screen.xml +++ b/GSKMTOrange/src/main/res/layout/activity_splash_screen.xml @@ -34,10 +34,10 @@ + android:background="@drawable/gsklogo" /> diff --git a/GSKMTOrange/src/main/res/layout/activity_storeimage.xml b/GSKMTOrange/src/main/res/layout/activity_storeimage.xml index af63741..cabf5f6 100644 --- a/GSKMTOrange/src/main/res/layout/activity_storeimage.xml +++ b/GSKMTOrange/src/main/res/layout/activity_storeimage.xml @@ -24,5 +24,4 @@ - diff --git a/GSKMTOrange/src/main/res/layout/content_daily_main_menu.xml b/GSKMTOrange/src/main/res/layout/content_daily_main_menu.xml index 43ca858..8ce5f5a 100644 --- a/GSKMTOrange/src/main/res/layout/content_daily_main_menu.xml +++ b/GSKMTOrange/src/main/res/layout/content_daily_main_menu.xml @@ -21,7 +21,7 @@ android:paddingBottom="10dp" android:paddingLeft="20dp" android:paddingTop="10dp" - android:text="Daily Data Menu" + android:text="@string/daily_activity_menu" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@android:color/black" android:visibility="gone"/> diff --git a/GSKMTOrange/src/main/res/layout/content_main.xml b/GSKMTOrange/src/main/res/layout/content_main.xml index 6ebb7b6..ab35d58 100644 --- a/GSKMTOrange/src/main/res/layout/content_main.xml +++ b/GSKMTOrange/src/main/res/layout/content_main.xml @@ -49,11 +49,12 @@ + android:orientation="vertical" + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true"> diff --git a/GSKMTOrange/src/main/res/layout/custom_dialog_progress.xml b/GSKMTOrange/src/main/res/layout/custom_dialog_progress.xml index 3828f3a..e49e71f 100644 --- a/GSKMTOrange/src/main/res/layout/custom_dialog_progress.xml +++ b/GSKMTOrange/src/main/res/layout/custom_dialog_progress.xml @@ -28,7 +28,7 @@ android:layout_alignParentLeft="true" android:layout_marginTop="15dp" android:paddingLeft="5dp" - android:text="Downloading Data" + android:text="@string/download_data" android:textSize="@dimen/text_size_normal" android:paddingBottom="20dp" android:textColor="@color/white" diff --git a/GSKMTOrange/src/main/res/layout/dialogbox.xml b/GSKMTOrange/src/main/res/layout/dialogbox.xml index 7274c69..f57a5e7 100644 --- a/GSKMTOrange/src/main/res/layout/dialogbox.xml +++ b/GSKMTOrange/src/main/res/layout/dialogbox.xml @@ -9,7 +9,7 @@ @@ -28,7 +28,7 @@ android:id="@+id/yes" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Yes" + android:text="@string/yes" android:textColor="#000000" android:background="@color/colorPrimary"/> @@ -42,7 +42,7 @@ android:id="@+id/no" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="No" + android:text="@string/no" android:textColor="#000000" android:background="@color/colorPrimary"/> diff --git a/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml b/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml index 9979c83..6a3f232 100644 --- a/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml +++ b/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml @@ -91,7 +91,7 @@ diff --git a/GSKMTOrange/src/main/res/layout/nav_header_main.xml b/GSKMTOrange/src/main/res/layout/nav_header_main.xml index 837a560..d07841e 100644 --- a/GSKMTOrange/src/main/res/layout/nav_header_main.xml +++ b/GSKMTOrange/src/main/res/layout/nav_header_main.xml @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="60dp" android:layout_marginTop="5dp" - android:src="@drawable/gsk_logo" /> + android:src="@drawable/gsklogo" /> diff --git a/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml b/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml index d847b68..1963196 100644 --- a/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml +++ b/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml @@ -91,8 +91,8 @@ android:id="@+id/toggle_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textOn="Yes" - android:textOff="No" + android:textOn="@string/yes" + android:textOff="@string/no" android:background="@drawable/toggle_selector_background" android:layout_centerInParent="true"/> @@ -127,9 +127,10 @@ android:layout_height="50dp" android:text="@string/image" android:layout_weight="1" - android:layout_centerInParent="true" - android:background="@drawable/cam_active" - android:padding="@dimen/custom_margin"/> + android:background="@mipmap/camera_orange" + android:padding="@dimen/custom_margin" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" /> @@ -137,7 +138,8 @@ + android:layout_weight="1" + android:visibility="gone"> - + android:choiceMode="singleChoice" + android:divider="#ff9933" + android:dividerHeight="2dp" + android:fastScrollEnabled="true" + android:smoothScrollbar="true"> + + --> diff --git a/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml b/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml index 93d14c2..d696f57 100644 --- a/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml +++ b/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml @@ -4,28 +4,24 @@ - @@ -33,11 +29,11 @@ diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/download_grey.png b/GSKMTOrange/src/main/res/mipmap-hdpi/download_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..1478765c66dbac4ea661d21823f3223e4ce7e68e GIT binary patch literal 2451 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 literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/exit_grey.png b/GSKMTOrange/src/main/res/mipmap-hdpi/exit_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..98cf3684162ba01516304844faca88af4789ccdd GIT binary patch literal 1941 zcmaJ?dsGv58l8xdM*&#^HDC?npe?RT9+(6&5M+`eCemO8TtcxnA(@aM$;4y~fsH zecw4#p-5d5;1})(06>6Dil&iclIQhVKzKId;>44V_fVv`R)n!|;8d^jc+ zd~!i#G>cXTr=gN3vB;GW(i4OkX0Zwi3YZ0}n7AdE#SsVu9*vloXc7@^Ei@5od$h?K zIjewTR*l7ACJeX<^eC!x@U4UpBAxzz1f%(>tjYQ$O=QAYcD0$sVX{3(ngz<`{~u~J zK1ExJH0+t*KNYrS6q+$s8fL|}S~O(gbdjD=W>{>&)C6wH!14UqEGqOkfm`*s85F1U z!Kh4wNsAX)S3Jhc<*>|TCDbMjCPRe~slYTCv@n8jxLj^5ipC*44kww9NDz?(MPm6} zKAX>$2xhq`uGwnDOvEf#`;41BC)d*oMl%^1#ViIJrj=N5Bl!5puwia5qB-@RaJ6%L z5zonGk!Dz)!v3Mqvs+~Mc&1O=mRvk-e9T04yM=7)mg>O?0GRJ9Ly-*o@a^}qrJ)G@ z^bofl%*x7odzp>4KWg%g&{7$iF`UwuJ|77Z?hgs}K}yj&Xs?S~RLN{w{uktcaM`64 zbZ|$oH2CY%bKrBK>weuC3_!zVhW4FCr9-+8e+wBw7*HwrDtt zdaur?;QSbVXveLq|N4GY_G|0c*X;Ir5T44uMQcq7@vEeqe*1N%Cb9zLMD&HXn1RJ<)IOwrincRJojUNGVsWyL)cT&s)?cEKO z@^wE){c>IO-8ZX~Y64?u!wW}BJG^=muL;4xN_K1J-nI1XsPiT7AM?w(_^HpxU~rN@ z=txlt?ojvo_Q+Oma0A8nkC?9}Zq&uE?7V_thX6XdX7HMMs-(BRBBoD`n(ZiX%<0~1?#jhbB2mjCSzO?bOVvF~5`I&DYUa}9tNXXsiVd%=} zhg~UxHsH*I!|vuzszS*kXv5CVvyITB;_=K0;S61L^+<8?)UYEkp0lYCU>7fKeb*g+ zwBO;}Fh07RxyvRxV5`bx0RDHbZxX%K-cKkO6K%^`lQc*MJiC$93y~*Q_(tKu64P7! zFIj8nI}vxu;-<@L@w^Cjciz2*1k;{o#_6rEZ<;q2XfhS#O3%Hro~LrK%Uq0G8~rPm z=C>b{)TJN49qOz#$K@+adeDP`ZvR`QBkoV^gS;m1q0|TI5qBe;|7j)CQ}ZOE9Njz3 zKl_cu=9lzDQM)p>FpKho>HaO}c>nIs8e1>Usig*;{O6@!=|=VTn`})5~kdL@)n1;6liab$KjiOZVm@!f}x&eRM9 u0IUAHK;^1gdUQkg*MXOSqyzQ9Bbo|0|ISJLBU59)=SL|^PDPtVD%Wpni|VWZ literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/geotag_grey.png b/GSKMTOrange/src/main/res/mipmap-hdpi/geotag_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..27d1f9b021331c8f084b309726bc1a1a9b7f4503 GIT binary patch literal 2667 zcmaJ@dpwi-AAdGh=2Dsn$7Nq=y^W4PnlaEeIpVBhAQFyai6Fq4Er@`yo_tmmn7M@t3iy_+C5)wnFO;(ZfVNR0WP#BTjE#VzxG{9xbWJ@D%VpDXLAFd1 zQ|JnDxSRHhApgDI0pQ+f(4LLk=!m6BsB!^51hcRbJ}*X0mC$jYbgAA1g>3TFCZT?HZtYinsu07+I>SPI3`%Ep#Lv9iFDNmgVcN&Zp@RyI^y3YEM8`}x7i zqlws&R6mCM=UDO;9mj!TA(cpsi;J_2v$hn7qKH=Z_V!B}WHLdHAc&1JiNxO#d!{FZ?PSBmR6$@&hAESVE$eC26UoFF+>q|3mrw zuV^vs2mO=p{}dJnNQDs54-yOZh(LMcB8`_q38}6khy@Eo0RjQ<%PIPD1h7EN5eTua z{uHcf5I2S`h!d~>gl96To-tyW6$3(^3_4D(V9DjOsrGKxZf*=a8-|^;t(BD<#l_X$ z#>K_P-P+xrWMgkf{=#Jlz&(5@2L8fj|HHNYCU?mSe4#ut0}^p#A-20nz{h?nnacfk zF63|Oede;ios0E1xkPy~#HGgmSEIjd$=$Ow{c2nJ;;ZqY7`fX;a$B4J{NoM)SoXw| z;T#|t9NNB;x5Hn1W5Tvb*UPMaPabFtCz)v&yW<8I8%KA{n3y^B`~=^to1$rl`MP7n!#hW+S8HnO|FjE3LTRH;GF4yr3?|1GYnGuVHgDb>A9^SE`9Z)` z-`Q3pAGHOw?7P?=#C<@35bVz|{-}dI{oW?P2ML08g9R33rXJ zD(i{bLjk3HL?+ouRUArB3|oOhgiiY0@#s85SK=jS-OO!eIv-c4xT_bn{<2+}K#2h; zIvDg7%HW;Zf6_HvuGxz!8h<@$GTZAQJFGqJQ=j0DZ2!f}|ATG#Rr8TdZ|N`7ZF-w` zPkrxs1?XtrQ5INvL-&?unW9!kSc=)H&V3p6CM>PwhD%P@vODKf+{|X6RV}$!v&lEE z162CVYaLnKRfC2^4~&v}$g+FW8Ndm4DQVBaM2n|dX2i9`koJ4)S|3Vzk-n5TEui_H z@3pKMf;x74>S-s-bla<(qagMHD@ZHLW2A&ue9NB};?B`p7368F$5}C{dwEDb{P8HV zphizEc~{z!LqKOb$qOYmlchJ4vvxj{a%l>o{r2t z+E?-R8ZS{bROdWR(@vF^mU(@qH()5f=8Puq(9ymX2wJah+vtWgmyunO8|&*q%Y9+z z2v=~8S7-z7ev#2yLd&e??i#h!_WQZswZBPsFLF#p*$u(};&G1+=px1{b4itb>ky~D z8@hM8Z9~`7y1@3bJG|6n|6oIzg#j5Kt`wb&iBjkZzHlLN%R9ku!P7^PL0E%zXecflb=Eihj!`w)|$#f)r59^_?@PjGcR}>2ub-b#Usr6QkX{;?hrTYHEi@v)n3X)3kMp)UnQ;eoUg8cLPjzF2OJ4Bxhqb8u`SK^K(Hjr0}LD0!~Uv3XiTSY4Bzl=r4aG_WeW ztXA?t)ZRPMVs;n}G)6?u@3Lyh#_KwvNhznMQ+Ugn4ob6daMg*zd^q&?d3)#NfxMuo z3F(4=>WujP9~!?c0#e#=S8y=~S(NWIviz>mq1kxElg!Zs4WK#6c?60DF}3Cg46C!a zbI8`&=v!zk`r5?9&6w2uf@lrWJIs;zY2yH=G=lTOq2R2S2u=E7O`rD|MOx>X+0u4x zz4NKuDlap{mOX1#k6Zr=$85gnRdBG5vHnP$K}%p;6=3vCBf#f!!Ty31ufpe`mV!H@ zxi9zKX&|6Cjs~t-(cd>Y+xYz- zq25&&e00p_wdah|z4e7U*c9)yljeiDeW@r3S8P<6x3DGOtE~1Ia!tEKCBWA@@7pzP^qN&*7US`l}koZa?14^RMx9DdAit5dRC Py8d~(c{47$g#Yj#>=IK~ literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/services_grey.png b/GSKMTOrange/src/main/res/mipmap-hdpi/services_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..3abc6209dc881cd82ac8f988543ee24c9c778e31 GIT binary patch literal 3351 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 literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/upload_grey.png b/GSKMTOrange/src/main/res/mipmap-hdpi/upload_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..4c34d2ef5b62a82854dd22d32396151ce0e8af53 GIT binary patch literal 2450 zcmaJ@d00~E9!5~i-K=>c$4NwU!DJIi88lH`(A<|uOG7*gB};G=)N-iwj!T7GTDGB; zcFod8%hED5bINSSOw)47xvBnji{!p7n8NHQ6NCz8ly{2C+yhbLfh+K23dCsIgc3Slks(}mJ{ z6D1{6BItgfd}%EY6bA%_6f9OEkzgdQ7=b7Si+6W-U(g^BT(k%maRwh`NnQA2+eHOB zAZClWLXa!qBNr4|iGnoH1Er1huM~K~&$4{+r!r{^hLy5}SUd)|kkTSBIQaiVdA!eP zF&F{-9q<1X7Dr_W0c->y7Nm*T+Quc@F1Qj>d_({X6o{e(g4D$-hH(U-K+F*ckv@@R zq~iuIKS>}FJAK3l2U8e)G05Vx0S4UzrB%Rixk(fgAeev(=O7E_1isBM<5V5oI$5WNguw7 zD)d%6OOtN&@nXaoVt8HRUVQXG z-Q(-t&71?~eF*RBYTBvTyHU8rIA5gW4b(*D{w({Dp|RIPS03;r@gmW;O@i^Pnckgm z#ayLt1@;lga#^H|*~p=Xzia!@JU zg6R7(T&3G*_)3=yi}UJvGgb+43@$tj>(xJ(Ptg0eGq3SBLt)C)K~=VWqZ9U?kVjG? zew@O}e)qC%JT4PWoz5b^UuC=;>MDCFgL;Sqr`Gt7`K%0ul-GOTE(pLII;F+df zF%y9kON3_d*6~vpe;&%j8MvAB`i&g+u!X>$nc+ha4Rbv$twzJT8eJkJ5>TH)OkiL} zFW_iw(7^&vPf{R+;sJYNGqDueQdp-C;ftq~pmA!gjq}SBPUPZtSXfSbw(Apv>Lyg4 zd>7j3+6tx-^=8J+DTCpv7jq>CYRXb*Bcp_rTTkFR@|EWyj-d{KSzqXHbMat1IdJUu zeNeamFi6Ada+AmD1XYHms?H?nt;xh zzs(pObdq&oWe4qtKt44N@uE2|hpfMuBxpytYYoq z`|;)ewRuKqhn#g~jLPXHo7)d|UAhR{l%(#vA7ECmh*8_OtWo|ka=2r<*lxVXX6{|N z73$uN@$Cf{fZFw5`M*p$8E|EPu$o#0qmWZj_NAz9xx9| zV@%dk2aE0%sgJZ<-!$>G7oPD9^(@?M>a5A8L{y$#ro#bOb-ire0cY<1K7=_|?+V0Ps9%lJk#dM#4$6&QCTL7!Yesl=n*DU$m40h_XM2dQV{__2=dV?$OQkVp zPJM4I@?4a;h9kAZ8NOLxUkUHA)_eNaPNkCXICJ!L_@R@7kF%Aq5)$9e(zPrn=B&}% zWywl(jV4G|vJaHb-amdJQ>bGAK8wGrT6R&dcVM3+{IP8Cx7#A;vYM~u6$yb*Out!M zlUGJ;2iA1vN*6=9mK$5;fF7Iz<^n}T1IK|I5^h*Frpte{dV0pftZm$OBOOWs@pdLX zL+D){5h@#ltkwR-kP(vAVLz3NoY7cHopLXzJaYb8MUMc~G~e~HcvUeL2pym4fp(TP zG*KoEGbYq!{&vHym7S~R=LmA!M!X&zqjzzl|4DW7q4L~dLpcheBKY$hm983SLIMjCa@SGR*yT-ytQ#yOSuFl_TUV7rYY<5@EoeslXfq&eE4?+3vtDZSWUZ%B3 zk!mZY+|2X(bsnZ+Dc&HU`VRCe{g`FN%Rgq6n(2T2o5S7yw13v*(TV%tF?`#a9YuS= z7$xyu0e!v4M(FhDy!nQlvE*@i?Z%A#Su~Yxo*be9qtr}Y; E-posta - Şifre (isteğe bağlı) - Giriş yapın veya kayıt olun oturum aç Bu e-posta adresi geçersiz Bu şifre çok kısa @@ -26,6 +24,7 @@ Store Uploaded Store Geo Data Uploaded Store Already Geotagged + GSK Turuncu Mağaza Sakla @@ -38,7 +37,7 @@ Teşhir var mı? Ekle - Seç + Seçiniz Kalıcı Teşhir @@ -46,5 +45,26 @@ Hayır Veri Paylaş + Veri Indir + Mağaza ziyaret edildi mi? + Mağaza girişinin fotoğrafını çekiniz + + Mağaza Girişi Fotoğrafı + Çalışmama Sebebi + Sebep + Bir sebep seçiniz + Günlük Veri Menüsü + + Bulunurluk + Raf Payı + Kalıcı Teşhir + Ek Teşhir + Promosyon + Rakip Bilgisi + Competition Promo + kapalı + + Promosyon + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index b138052..ab02dc9 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -1,5 +1,6 @@ - GSKMTOrange + GSK MT Orange + GSK Orange Stores Open navigation drawer Close navigation drawer @@ -9,9 +10,9 @@ E Mail - User Id - Password - Login + Username/Kullanıcı Adı + Password/Şifre + Login/Giriş Yap Sign in This email address is invalid This password is too short @@ -127,7 +128,7 @@ Display Photo Additional Visibility - Non-Work Reason + Non Working Reason Close Please click image @@ -135,5 +136,14 @@ Please fill GAP data Want to proceed usaved data will be deleted + Downloading Data + Store Visited + Click Store Front Image + + Store Front Image + Reason + Select Reason + Daily Data Menu +