AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_StockFacing_No_camera_image

Browse Source 
//Add language method in stock facing planogram
This commit is contained in:
YadavendraSinghYaduvanshi
2017-02-23 09:46:46 +05:30
committed by GitHub
parent a0767ecb26 74b4aa7589
commit c6bfab9c6e
6 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+1 -1
View File
@@ -694,7 +694,7 @@ public class LoginActivity extends AppCompatActivity {
if (language.equalsIgnoreCase("English")) {
lang = "EN";
} else if (language.equalsIgnoreCase("UAE")) {
} else if (language.equalsIgnoreCase("ARABIC-KSA")) {
lang = "AR";
} else {
lang = "TR";
GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java
+1 -1
View File
@@ -130,7 +130,7 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On
if(language.equalsIgnoreCase("English")){
lang = "EN";
}
else if(language.equalsIgnoreCase("UAE")) {
else if(language.equalsIgnoreCase("ARABIC-KSA")) {
lang = "AR";
} else {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
+2 -2
View File
@@ -462,7 +462,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
lin_camera3.setVisibility(View.GONE);
lin_camera4.setVisibility(View.GONE);
camera1.setBackgroundResource(R.mipmap.camera_grey);
camera1.setBackgroundResource(R.mipmap.new_no_camera);
lin_camera1.setOnClickListener(new View.OnClickListener() {
@Override
@@ -1093,7 +1093,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
//Planogram List for check and delete on backPress
prepareDefaultList();
if (planogramShelfHeaderDataList.size() > 0) {
camera1.setBackgroundResource(R.mipmap.camera_grey);
camera1.setBackgroundResource(R.mipmap.new_no_camera_done_edit);
}
break;
GSKMTOrange/src/main/res/values-ar/string.xml
+3
View File
@@ -213,4 +213,7 @@
<string name="stock_planogram_already_exists">is already exists</string>
<string name="stock_planogram_data_select_one_sku">Please select atleast one sku</string>
<string name="stock_planogram_data_add_shelf">Add sku, shelf can not be empty</string>
<string name="language">ARABIC-KSA</string>
<string name="language_return">AR</string>
</resources>
GSKMTOrange/src/main/res/values-tr/string.xml
+3
View File
@@ -251,6 +251,9 @@
<string name="stock_planogram_already_exists">Zaten var</string>
<string name="stock_planogram_data_select_one_sku">En azindan 1 SKU seçmelisiniz</string>
<string name="stock_planogram_data_add_shelf">SKU ekleyin, raf boş olamaz</string>
<string name="language">English</string>
<string name="language_return">TR</string>
</resources>
GSKMTOrange/src/main/res/values/strings.xml
+3
View File
@@ -286,4 +286,7 @@
<string name="stock_planogram_data_select_one_sku">Please select atleast one sku</string>
<string name="stock_planogram_data_add_shelf">Add sku, shelf can not be empty</string>
<string name="language">English</string>
<string name="language_return">EN</string>
</resources>