From 2ea7345c0f1684e556912ee6319752062bbf46e9 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Fri, 24 Feb 2017 14:57:33 +0530 Subject: [PATCH] camera handle for arabic language --- .../com/gskmtorange/Database/GSKOrangeDB.java | 28 ++++++- .../CategoryPictureGetterSetter.java | 13 ++-- .../dailyentry/CategoryPicture.java | 72 ++++++++---------- .../dailyentry/T2PComplianceActivity.java | 6 +- .../download/DownloadActivity.java | 40 ++++++++++ ...pingSubCategoryImageAllowGetterSetter.java | 48 ++++++++++++ .../xmlGetterSetter/TableBean.java | 10 +++ .../gskmtorange/xmlHandlers/XMLHandlers.java | 32 ++++++++ .../res/drawable/camera_orange_star_green.png | Bin 0 -> 10278 bytes .../res/layout/activity_category_picture.xml | 4 +- .../res/layout/content_category_picture.xml | 2 +- .../res/layout/contentcatgoryadpterlayout.xml | 14 ++-- GSKMTOrange/src/main/res/values-ar/string.xml | 10 +-- 13 files changed, 208 insertions(+), 71 deletions(-) create mode 100644 GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingSubCategoryImageAllowGetterSetter.java create mode 100644 GSKMTOrange/src/main/res/drawable/camera_orange_star_green.png diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index a7a382b..b6d3e15 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/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()); + } + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/CategoryPictureGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/CategoryPictureGetterSetter.java index 82c4c3c..bc91b03 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/CategoryPictureGetterSetter.java +++ b/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; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java index 5eae2cc..b73165a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java +++ b/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 - { - im1.setBackgroundResource(R.mipmap.camera_orange); + } else { + im1.setBackgroundResource(R.drawable.camera_orange_star_green); } - 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; - }else - { + img_str3 = image3; + } else { im3.setBackgroundResource(R.mipmap.camera_orange); } - if(image4 !=null) - { + if (image4 != null) { im4.setBackgroundResource(R.mipmap.camera_green); - img_str4=image4; - }else - { + img_str4 = image4; + } 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; } - - } 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 af14e11..baa86ab 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/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; 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 3de08cc..3299c7e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/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; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingSubCategoryImageAllowGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingSubCategoryImageAllowGetterSetter.java new file mode 100644 index 0000000..36cdab7 --- /dev/null +++ b/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 COUNTRY_ID = new ArrayList<>(); + ArrayList SUB_CATEGORY_ID = new ArrayList<>(); + ArrayList 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 getCOUNTRY_ID() { + return COUNTRY_ID; + } + + public void setCOUNTRY_ID(String COUNTRY_ID) { + this.COUNTRY_ID.add(COUNTRY_ID); + } + + public ArrayList 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 getIMAGE_ALLOW() { + return IMAGE_ALLOW; + } + + public void setIMAGE_ALLOW(String IMAGE_ALLOW) { + this.IMAGE_ALLOW.add(IMAGE_ALLOW); + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java index b520c85..74fccba 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java +++ b/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; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java index 863482c..d8641ef 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/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; + } + } diff --git a/GSKMTOrange/src/main/res/drawable/camera_orange_star_green.png b/GSKMTOrange/src/main/res/drawable/camera_orange_star_green.png new file mode 100644 index 0000000000000000000000000000000000000000..c8219e03434c2672cd1f5ef6ca6074f2d023e471 GIT binary patch literal 10278 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 literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/layout/activity_category_picture.xml b/GSKMTOrange/src/main/res/layout/activity_category_picture.xml index 6542273..74b1e73 100644 --- a/GSKMTOrange/src/main/res/layout/activity_category_picture.xml +++ b/GSKMTOrange/src/main/res/layout/activity_category_picture.xml @@ -21,6 +21,8 @@ + + - - diff --git a/GSKMTOrange/src/main/res/layout/content_category_picture.xml b/GSKMTOrange/src/main/res/layout/content_category_picture.xml index 3b0b302..b80c9d3 100644 --- a/GSKMTOrange/src/main/res/layout/content_category_picture.xml +++ b/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" /> diff --git a/GSKMTOrange/src/main/res/layout/contentcatgoryadpterlayout.xml b/GSKMTOrange/src/main/res/layout/contentcatgoryadpterlayout.xml index e7a40d6..0f07547 100644 --- a/GSKMTOrange/src/main/res/layout/contentcatgoryadpterlayout.xml +++ b/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:padding="10sp"> + android:layout_alignParentTop="true"> -