Merge pull request #22 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Error_Correction

camera handle for arabic language

GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java

@@ -27,6 +27,7 @@ import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
 import cpm.com.gskmtorange.constant.CommonString;
 import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
@@ -60,7 +61,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
  */
 
 public class GSKOrangeDB extends SQLiteOpenHelper {
-    public static final String DATABASE_NAME = "GSK_ORANGE_DB";
+    public static final String DATABASE_NAME = "GSK_ORANGE_DB1";
     public static final int DATABASE_VERSION = 13;
     TableBean tableBean;
     private SQLiteDatabase db;
@@ -147,6 +148,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
 
             db.execSQL(CommonString.CREATE_TABLE_INSERT_CATEGORY_PICTURE);
 
+            db.execSQL(TableBean.getMappingSubCategoryImageAllow());
+
         } catch (SQLException e) {
             e.printStackTrace();
             Toast.makeText(context, "Error -" + e.toString(), Toast.LENGTH_SHORT).show();
@@ -4164,10 +4167,11 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         Cursor dbcursor = null;
         try {
 
-            dbcursor = db.rawQuery("SELECT  DISTINCT SB.SUB_CATEGORY_ID, SB.SUB_CATEGORY FROM MAPPING_STOCK M INNER JOIN SKU_MASTER SK ON M.SKU_ID = SK.SKU_ID" +
+            dbcursor = db.rawQuery("SELECT  DISTINCT SB.SUB_CATEGORY_ID, MIA.IMAGE_ALLOW,SB.SUB_CATEGORY FROM MAPPING_STOCK M INNER JOIN SKU_MASTER SK ON M.SKU_ID = SK.SKU_ID" +
                     " INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID" +
                     " INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID" +
                     " INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID" +
+                    " INNER JOIN MAPPING_SUB_CATEGORY_IMAGE_ALLOW MIA ON SB.SUB_CATEGORY_ID=MIA.SUB_CATEGORY_ID "+
                     " WHERE M.KEYACCOUNT_ID = '" + key_account_id + " 'AND M.STORETYPE_ID = '" + store_type_id + "' AND M.CLASS_ID = '" + class_id + "' AND CA.CATEGORY_ID = '" + categoryId + "'", null);
 
 
@@ -4179,6 +4183,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
 
                     CPGS.setSUB_CATEGORY(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY")));
                     CPGS.setSUB_CATEGORY_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
+                    CPGS.setImage_allow(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE_ALLOW")));
 
                     CPGS.setSubCategoryCamera1("");
                     CPGS.setSubCategoryCamera2("");
@@ -4676,8 +4681,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
     }
 
 
-
-
     public boolean isPlanogramAddShelfSaveData(String store_id, String category_id) {
         boolean filled = false;
         Cursor dbcursor = null;
@@ -4704,4 +4707,21 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         return filled;
     }
 
+    public void InsertMappingSubCategoryImageAllow(MappingSubCategoryImageAllowGetterSetter data) {
+        db.delete("MAPPING_SUB_CATEGORY_IMAGE_ALLOW", null, null);
+
+        ContentValues values = new ContentValues();
+        try {
+            for (int i = 0; i < data.getSUB_CATEGORY_ID().size(); i++) {
+
+                values.put("COUNTRY_ID", data.getCOUNTRY_ID().get(i));
+                values.put("SUB_CATEGORY_ID", data.getSUB_CATEGORY_ID().get(i));
+                values.put("IMAGE_ALLOW", data.getIMAGE_ALLOW().get(i));
+
+                db.insert("MAPPING_SUB_CATEGORY_IMAGE_ALLOW", null, values);
+            }
+        } catch (Exception ex) {
+            Log.d("Exception ", " in MAPPING_SUB_CATEGORY_IMAGE_ALLOW " + ex.toString());
+        }
+    }
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/CategoryPictureGetterSetter.java

@@ -11,6 +11,8 @@ public class CategoryPictureGetterSetter {
     String CategoryImage3="";
     String CategoryImage4="";
 
+    String image_allow = "0";
+
     public String getCategoryId() {
         return categoryId;
     }
@@ -161,10 +163,11 @@ public class CategoryPictureGetterSetter {
     }
 
 
+    public String getImage_allow() {
+        return image_allow;
+    }
 
-
+    public void setImage_allow(String image_allow) {
-
+        this.image_allow = image_allow;
-
+    }
-
-
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java

@@ -91,6 +91,8 @@ public class CategoryPicture extends AppCompatActivity {
         im4 = (ImageView) findViewById(R.id.image4);
         listview = (ListView) findViewById(R.id.listview);
 
+        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+
 
         adddata = db.getCategoryPictureData(store_id, categoryId);
 
@@ -107,43 +109,35 @@ public class CategoryPicture extends AppCompatActivity {
                 String image3 = adddata.get(k).getCategoryImage3();
                 String image4 = adddata.get(k).getCategoryImage4();
 
-                if(image1 !=null)
+                if (image1 != null) {
-                {
                     im1.setBackgroundResource(R.mipmap.camera_green);
 
-                    img_str1=image1;
+                    img_str1 = image1;
 
-                }else
+                } else {
-                {
+                    im1.setBackgroundResource(R.drawable.camera_orange_star_green);
-                    im1.setBackgroundResource(R.mipmap.camera_orange);
                 }
 
 
-                if(image2 !=null)
+                if (image2 != null) {
-                {
                     im2.setBackgroundResource(R.mipmap.camera_green);
 
-                    img_str2=image2;
+                    img_str2 = image2;
 
-                }else
+                } else {
-                {
                     im2.setBackgroundResource(R.mipmap.camera_orange);
                 }
-                if(image3 !=null)
+                if (image3 != null) {
-                {
                     im3.setBackgroundResource(R.mipmap.camera_green);
-                    img_str3=image3;
+                    img_str3 = image3;
-                }else
+                } else {
-                {
                     im3.setBackgroundResource(R.mipmap.camera_orange);
                 }
-                if(image4 !=null)
+                if (image4 != null) {
-                {
                     im4.setBackgroundResource(R.mipmap.camera_green);
 
-                    img_str4=image4;
+                    img_str4 = image4;
-                }else
+                } else {
-                {
                     im4.setBackgroundResource(R.mipmap.camera_orange);
                 }
 
@@ -161,8 +155,6 @@ public class CategoryPicture extends AppCompatActivity {
         adapteradditional = new CategoryPicture.CategoryAdapter(CategoryPicture.this, listdat);
         listview.setAdapter(adapteradditional);
 
-
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -177,14 +169,12 @@ public class CategoryPicture extends AppCompatActivity {
                 CP.setCamera_allow(camera_allow);
 
 
-
                 if (validateData(CP, listdat)) {
 
                     db.InsertCategoryPictureData(CP, listdat, categoryId);
 
                     finish();
 
-
                 } else {
                     Snackbar.make(view, "Please take image", Snackbar.LENGTH_LONG).setAction("Action", null).show();
 
@@ -279,7 +269,6 @@ public class CategoryPicture extends AppCompatActivity {
 
     private static boolean updateResources(Context context, String language) {
 
-       
 
         String lang;
 
@@ -294,7 +283,7 @@ public class CategoryPicture extends AppCompatActivity {
 
         } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
             lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
-        }else{
+        } else {
             lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
         }
 
@@ -328,18 +317,18 @@ public class CategoryPicture extends AppCompatActivity {
 
                     //temp value in case camera is gallery app above jellybean
                     String packag = list.get(n).loadLabel(packageManager).toString();
-                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") ||packag.equalsIgnoreCase("الاستوديو") ) {
+                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") || packag.equalsIgnoreCase("الاستوديو")) {
                         gallery_package = list.get(n).packageName;
                     }
 
                     if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) {
                             defaultCameraPackage = list.get(n).packageName;
                             break;
                         }
                     } else {
 
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) {
 
                             defaultCameraPackage = list.get(n).packageName;
                             break;
@@ -496,7 +485,6 @@ public class CategoryPicture extends AppCompatActivity {
 
                 holder.brand = (TextView) convertView.findViewById(R.id.textviewname);
 
-
                 holder.camera1 = (Button) convertView.findViewById(R.id.button3);
                 holder.camera2 = (Button) convertView.findViewById(R.id.cameranew);
                 convertView.setTag(holder);
@@ -546,6 +534,8 @@ public class CategoryPicture extends AppCompatActivity {
                 holder.camera1.setBackgroundResource(R.mipmap.camera_green);
 
 
+            } else if (listdat.get(position1).getImage_allow().equals("1")) {
+                holder.camera1.setBackgroundResource(R.drawable.camera_orange_star_green);
             } else {
                 holder.camera1.setBackgroundResource(R.mipmap.camera_orange);
             }
@@ -575,26 +565,28 @@ public class CategoryPicture extends AppCompatActivity {
 
         if (cameraImage1 == null) {
             flag = false;
-
         }
 
 
-        for (int i = 0; i < list.size(); i++) {
+        if (flag) {
+            for (int i = 0; i < list.size(); i++) {
 
-            String imageu = list.get(i).getSubCategoryCamera1();
+                if (list.get(i).getImage_allow().equals("1")) {
 
-            if (imageu.equalsIgnoreCase("")) {
+                    String imageu = list.get(i).getSubCategoryCamera1();
+
+                    if (imageu.equalsIgnoreCase("")) {
+
+                        flag = false;
+                        break;
+                    }
+                }
 
-                flag = false;
             }
-
         }
 
-
         return flag;
     }
 
 
-
-
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java

@@ -187,10 +187,6 @@ public class T2PComplianceActivity extends AppCompatActivity {
                 t2PGetterSetters.get(i).setGapsChecklist(gapsList);
                 t2PGetterSetters.get(i).setSkulist(skuList);
                 t2PGetterSetters.get(i).setBrandlist(brandList);
-
-
-
-
             }
 
         }
@@ -937,7 +933,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
                     error_msg = getResources().getString(R.string.click_image);
                     break;
                 }
-                else if (t2PGetterSetters.get(i).getBrandlist().size() == 0) {
+                else if (camera_allow.equals("0") && t2PGetterSetters.get(i).getBrandlist().size() == 0) {
                     flag = false;
                     error_msg = getResources().getString(R.string.title_activity_fill_brand);
                     break;

GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java

@@ -57,6 +57,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter
 import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter;
@@ -89,6 +90,7 @@ public class DownloadActivity extends AppCompatActivity {
     MAPPING_SOS_TARGET_MasterGetterSetter mapping_sos_target_masterGetterSetter;
     MAPPING_PLANOGRAM_MasterGetterSetter mapping_planogram_masterGetterSetter;
     ShelfMasterGetterSetter shelfMasterGetterSetter;
+    MappingSubCategoryImageAllowGetterSetter mappingSubCategoryImageAllowGetterSetter;
 
     private Dialog dialog;
     private ProgressBar pb;
@@ -813,6 +815,42 @@ public class DownloadActivity extends AppCompatActivity {
                 publishProgress(data);
 
 
+                //MAPPING_SUB_CATEGORY_IMAGE_ALLOW
+                request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
+                request.addProperty("UserName", userId);
+                request.addProperty("Type", "MAPPING_SUB_CATEGORY_IMAGE_ALLOW");
+                request.addProperty("cultureid", culture_id);
+
+                envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+                envelope.dotNet = true;
+                envelope.setOutputSoapObject(request);
+
+                androidHttpTransport = new HttpTransportSE(CommonString.URL);
+                androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
+
+                result = envelope.getResponse();
+
+                if (result.toString() != null) {
+                    xpp.setInput(new StringReader(result.toString()));
+                    xpp.next();
+                    eventType = xpp.getEventType();
+                    mappingSubCategoryImageAllowGetterSetter = XMLHandlers.mappingSubCategoryImageAllowXMLHandler(xpp, eventType);
+
+                    String table_ShelfMaster = mappingSubCategoryImageAllowGetterSetter.getTable_MAPPING_SUB_CATEGORY_IMAGE_ALLOW();
+                    if (table_ShelfMaster != null) {
+                        resultHttp = CommonString.KEY_SUCCESS;
+                        TableBean.setMappingSubCategoryImageAllow(table_ShelfMaster);
+                    }
+
+                    if (mappingSubCategoryImageAllowGetterSetter.getSUB_CATEGORY_ID().size() > 0) {
+                        data.value = 96;
+                        data.name = "MAPPING_SUB_CATEGORY_IMAGE_ALLOW " + getResources().getString(R.string.download_data);
+                    }
+                }
+                publishProgress(data);
+
+
+
                 //Images DownLoads
 
                 //MAPPING_PLANOGRAM Image save into folder
@@ -953,6 +991,8 @@ public class DownloadActivity extends AppCompatActivity {
                 db.InsertMAPPING_SOS_TARGET(mapping_sos_target_masterGetterSetter);
                 db.InsertSHELF_MASTER(shelfMasterGetterSetter);
 
+                db.InsertMappingSubCategoryImageAllow(mappingSubCategoryImageAllowGetterSetter);
+
             } catch (MalformedURLException e) {
 
                 ResultFlag = false;

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingSubCategoryImageAllowGetterSetter.java

@@ -0,0 +1,48 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+import java.util.ArrayList;
+
+/**
+ * Created by yadavendras on 28-12-2016.
+ */
+
+public class MappingSubCategoryImageAllowGetterSetter {
+
+    String table_MAPPING_SUB_CATEGORY_IMAGE_ALLOW;
+
+    ArrayList<String> COUNTRY_ID = new ArrayList<>();
+    ArrayList<String> SUB_CATEGORY_ID = new ArrayList<>();
+    ArrayList<String> IMAGE_ALLOW = new ArrayList<>();
+
+    public String getTable_MAPPING_SUB_CATEGORY_IMAGE_ALLOW() {
+        return table_MAPPING_SUB_CATEGORY_IMAGE_ALLOW;
+    }
+
+    public void setTable_MAPPING_SUB_CATEGORY_IMAGE_ALLOW(String table_MAPPING_SUB_CATEGORY_IMAGE_ALLOW) {
+        this.table_MAPPING_SUB_CATEGORY_IMAGE_ALLOW = table_MAPPING_SUB_CATEGORY_IMAGE_ALLOW;
+    }
+
+    public ArrayList<String> getCOUNTRY_ID() {
+        return COUNTRY_ID;
+    }
+
+    public void setCOUNTRY_ID(String COUNTRY_ID) {
+        this.COUNTRY_ID.add(COUNTRY_ID);
+    }
+
+    public ArrayList<String> getSUB_CATEGORY_ID() {
+        return SUB_CATEGORY_ID;
+    }
+
+    public void setSUB_CATEGORY_ID(String SUB_CATEGORY_ID) {
+        this.SUB_CATEGORY_ID.add(SUB_CATEGORY_ID);
+    }
+
+    public ArrayList<String> getIMAGE_ALLOW() {
+        return IMAGE_ALLOW;
+    }
+
+    public void setIMAGE_ALLOW(String IMAGE_ALLOW) {
+        this.IMAGE_ALLOW.add(IMAGE_ALLOW);
+    }
+}

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java

@@ -25,6 +25,7 @@ public class TableBean {
     public static String MAPPING_PLANOGRAM;
     public static String MAPPING_SOS_TARGET;
     public static String SHELF_MASTER;
+    public static String MAPPING_SUB_CATEGORY_IMAGE_ALLOW;
 
 
     public static String getAdditionalDisplay() {
@@ -178,4 +179,13 @@ public class TableBean {
     }
 
     //Gagan end code
+
+
+    public static String getMappingSubCategoryImageAllow() {
+        return MAPPING_SUB_CATEGORY_IMAGE_ALLOW;
+    }
+
+    public static void setMappingSubCategoryImageAllow(String mappingSubCategoryImageAllow) {
+        MAPPING_SUB_CATEGORY_IMAGE_ALLOW = mappingSubCategoryImageAllow;
+    }
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java

@@ -20,6 +20,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter
 import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter;
@@ -815,4 +816,35 @@ public class XMLHandlers {
         return st;
     }
 
+    public static MappingSubCategoryImageAllowGetterSetter mappingSubCategoryImageAllowXMLHandler(XmlPullParser xpp, int eventType) {
+        MappingSubCategoryImageAllowGetterSetter st = new MappingSubCategoryImageAllowGetterSetter();
+
+        try {
+            while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
+                if (xpp.getEventType() == XmlPullParser.START_TAG) {
+
+                    if (xpp.getName().equals("META_DATA")) {
+                        st.setTable_MAPPING_SUB_CATEGORY_IMAGE_ALLOW(xpp.nextText());
+                    }
+                    if (xpp.getName().equals("COUNTRY_ID")) {
+                        st.setCOUNTRY_ID(xpp.nextText());
+                    }
+                    if (xpp.getName().equals("SUB_CATEGORY_ID")) {
+                        st.setSUB_CATEGORY_ID(xpp.nextText());
+                    }
+                    if (xpp.getName().equals("IMAGE_ALLOW")) {
+                        st.setIMAGE_ALLOW(xpp.nextText());
+                    }
+
+                }
+                xpp.next();
+            }
+        } catch (XmlPullParserException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return st;
+    }
+
 }

GSKMTOrange/src/main/res/layout/activity_category_picture.xml

@@ -21,6 +21,8 @@
 
     </android.support.design.widget.AppBarLayout>
 
+    <include layout="@layout/content_category_picture" />
+
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
@@ -29,6 +31,4 @@
         android:layout_margin="@dimen/fab_margin"
         app:srcCompat="@drawable/save_icon" />
 
-    <include layout="@layout/content_category_picture" />
-
 </android.support.design.widget.CoordinatorLayout>

GSKMTOrange/src/main/res/layout/content_category_picture.xml

@@ -30,7 +30,7 @@
                 android:layout_width="50dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="5dp"
-                android:background="@mipmap/camera_orange" />
+                android:background="@drawable/camera_orange_star_green" />
 
 
         </LinearLayout>

GSKMTOrange/src/main/res/layout/contentcatgoryadpterlayout.xml

@@ -21,33 +21,30 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
-            android:layout_alignParentTop="true"
+            android:layout_alignParentTop="true">
-
-            android:padding="10sp">
 
 
             <TextView
                 android:id="@+id/textviewname"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentTop="true"
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="6sp"
                 android:layout_marginTop="7dp"
+                android:gravity="center"
                 android:text="Text View "
                 android:textSize="15sp"
                 android:textStyle="bold" />
 
-
             <Button
                 android:id="@+id/cameranew"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
-                android:layout_alignParentBottom="true"
                 android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
                 android:layout_marginRight="20dp"
-                android:layout_alignParentTop="true"
                 android:background="@mipmap/camera_orange"
                 android:focusable="false" />
 
@@ -56,11 +53,10 @@
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:layout_alignParentRight="true"
-                android:layout_alignParentTop="true"
+                android:layout_centerVertical="true"
                 android:layout_marginRight="80dp"
                 android:background="@mipmap/camera_orange" />
 
-
         </RelativeLayout>
     </android.support.v7.widget.CardView>
 </RelativeLayout>

GSKMTOrange/src/main/res/values-ar/string.xml

@@ -216,10 +216,10 @@
 
     <string name="stock_planogram_data_add_shelf_position_already_exists">الرف/ الموقع موجود بالفعل</string>
 
-    <string name="stock_planogram_add_shelf">Add Shelf</string>
+    <string name="stock_planogram_add_shelf">إضافة الرف</string>
-    <string name="stock_planogram_add_sku">Add Sku</string>
+    <string name="stock_planogram_add_sku">الصنف إضافة</string>
-    <string name="stock_planogram_add_sku_to_shelf">Add Sku to Shelf</string>
+    <string name="stock_planogram_add_sku_to_shelf">إضافة منتج إلى الجرف</string>
-    <string name="stock_planogram_planogram_tracker">Planogram Tracker</string>
+    <string name="stock_planogram_planogram_tracker">صورة مقطعية المقتفي</string>
-    <string name="stock_planogram_position_on_shelf">Position on Shelf</string>
+    <string name="stock_planogram_position_on_shelf">موقف بشأن الجرف</string>
 
 </resources>