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 0dc7fb6..e05877c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -89,6 +89,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.execSQL(CommonString.CREATE_TABLE_STOCK_ADDITIONAL_STOCK_DATA); db.execSQL(CommonString.CREATE_TABLE_INSERT_ADDITIONAL_PROMO_COMPLIANCE); db.execSQL(CommonString.CREATE_TABLE_INSERT_PROMO_SKU); + db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_ADDITIONAL_VISIBILITY_MAIN); + db.execSQL(CommonString.CREATE_TABLE_STOCK_DIALOG_MAIN); //Gagan End } @@ -2037,13 +2039,17 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setCOMMON_ID(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_Common_ID))); + sb.setStore_id(cursordata.getString(cursordata + .getColumnIndexOrThrow(CommonString.KEY_STORE_ID))); + sb.setCategoryId(cursordata.getString(cursordata + .getColumnIndexOrThrow("categoryId"))); + sb.setBrand_id(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_BRAND_ID))); sb.setBrand(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_BRAND))); - sb.setQuantity(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_QUANTITY))); @@ -2053,7 +2059,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setSku_name(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_SKUNAME))); - productData.add(sb); cursordata.moveToNext(); } @@ -2081,6 +2086,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper { public void deleteStockEntry(String id) { try { db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, "KEY_ID" + "='" + id + "'", null); + db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_MAIN, "KEY_ID" + "='" + id + "'", null); + + } catch (Exception e) { System.out.println("" + e); } @@ -2089,8 +2097,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper { public void deleteStockEntryall(String storeid,String categoryid) { try { - db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, "Store_Id" + "='" + storeid +"categoryId" + "='" + categoryid + "'", null); - db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG, "Store_Id" + "='" + storeid +"categoryId" + "='" + categoryid + "'", null); + db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, "Store_Id" + "='" + storeid +"'AND categoryId" + "='" + categoryid + "'", null); + db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG, "Store_Id" + "='" + storeid +"'AND categoryId" + "='" + categoryid + "'", null); + + db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_MAIN, "Store_Id" + "='" + storeid +"'AND categoryId" + "='" + categoryid + "'", null); + + db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG_MAIN, "Store_Id" + "='" + storeid +"'AND categoryId" + "='" + categoryid + "'", null); } catch (Exception e) { System.out.println("" + e); @@ -2293,7 +2305,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Cursor dbcursor = null; try { - dbcursor = db.rawQuery("Select * from Stock_Additional_visibility " + "where categoryId='" + category_id + "' and Store_Id='" + store_id + "'", null); + dbcursor = db.rawQuery("Select * from Stock_Additional_visibility_Main " + "where categoryId='" + category_id + "' and Store_Id='" + store_id + "'", null); if (dbcursor != null) { if (dbcursor.moveToFirst()) { @@ -2326,7 +2338,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - cursordata = db.rawQuery("SELECT * FROM Stock_Additional_visibility WHERE Store_Id = '"+store_id +"'", null); + cursordata = db.rawQuery("SELECT * FROM Stock_Additional_visibility_Main WHERE Store_Id = '"+store_id +"'", null); if (cursordata != null) { cursordata.moveToFirst(); @@ -2375,4 +2387,98 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return productData; } + + public void InsertMainListAdditionalData(AddittionalGetterSetter Mainlist,ArrayList skulist,String categoryId) { + ContentValues values = new ContentValues(); + ContentValues values1 = new ContentValues(); + try { + + values.put("Store_Id", Mainlist.getStore_id()); + values.put("categoryId", categoryId); + values.put("brand_name", Mainlist.getBrand()); + values.put("brand_id", Mainlist.getBrand_id()); + values.put("image_url", Mainlist.getImage()); + values.put("sku_id", Mainlist.getSku_id()); + values.put("sku_name", Mainlist.getSku()); + values.put("toggle_value", Mainlist.getBtn_toogle()); + + long key_id = db.insert(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_MAIN, null, values); + + for(int j=0;j getDialogStockUpload(String keyid) { + Cursor cursordata = null; + ArrayList productData = new ArrayList(); + + try { + + cursordata = db.rawQuery("SELECT * FROM STOCK_DIALOG_MAIN WHERE COMMON_ID = '"+keyid + "'", null); + + if (cursordata != null) { + cursordata.moveToFirst(); + while (!cursordata.isAfterLast()) { + AdditionalDialogGetterSetter sb = new AdditionalDialogGetterSetter(); + + sb.setKEY_ID(cursordata.getString(cursordata + .getColumnIndexOrThrow(CommonString.KEY_ID))); + + sb.setCOMMON_ID(cursordata.getString(cursordata + .getColumnIndexOrThrow(CommonString.KEY_Common_ID))); + + sb.setStore_id(cursordata.getString(cursordata + .getColumnIndexOrThrow(CommonString.KEY_STORE_ID))); + sb.setCategoryId(cursordata.getString(cursordata + .getColumnIndexOrThrow("categoryId"))); + + sb.setBrand_id(cursordata.getString(cursordata + .getColumnIndexOrThrow(CommonString.KEY_BRAND_ID))); + + sb.setBrand(cursordata.getString(cursordata + .getColumnIndexOrThrow(CommonString.KEY_BRAND))); + + sb.setQuantity(cursordata.getString(cursordata + .getColumnIndexOrThrow(CommonString.KEY_QUANTITY))); + + sb.setSku_id(cursordata.getString(cursordata + .getColumnIndexOrThrow(CommonString.KEY_SKU_ID))); + + sb.setSku_name(cursordata.getString(cursordata + .getColumnIndexOrThrow(CommonString.KEY_SKUNAME))); + + productData.add(sb); + cursordata.moveToNext(); + } + cursordata.close(); + + } + + + } catch (Exception ex) { + + } + return productData; + + } + } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java index 8daca52..453da15 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java @@ -3,6 +3,7 @@ package cpm.com.gskmtorange.GeoTag; import android.Manifest; import android.app.AlertDialog; import android.app.Dialog; +import android.content.ActivityNotFoundException; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -114,6 +115,8 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb private static final String TAG = GeoTagActivity.class.getSimpleName(); String defaultCameraPackage = ""; File file; + String gallery_package = ""; + Uri outputFileUri; private int factor, k; ArrayList geotaglist = new ArrayList(); private TextView percentage, message; @@ -182,13 +185,13 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb GeoTagActivity.this); // Setting Dialog Title - alertDialog.setTitle("GPS IS DISABLED..."); + alertDialog.setTitle(getResources().getString(R.string.gps)); // Setting Dialog Message - alertDialog.setMessage("Click ok to enable GPS."); + alertDialog.setMessage(getResources().getString(R.string.gpsebale)); // Setting Positive "Yes" Button - alertDialog.setPositiveButton("YES", + alertDialog.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { @@ -199,7 +202,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb }); // Setting Negative "NO" Button - alertDialog.setNegativeButton("NO", + alertDialog.setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { // Write your code here to invoke NO event @@ -228,7 +231,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb } else { - Snackbar.make(view, "Please Take Image Before Save", Snackbar.LENGTH_LONG).setAction("Action", null).show(); + Snackbar.make(view, getResources().getString(R.string.takeimage), Snackbar.LENGTH_LONG).setAction("Action", null).show(); } @@ -251,7 +254,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb } } - _pathforcheck = storeid + "Store" + "Image" + getCurrentTime().replace(":", "") + ".jpg"; + _pathforcheck = storeid + getResources().getString(R.string.store) + getResources().getString(R.string.image) + getCurrentTime().replace(":", "") + ".jpg"; _path = CommonString.FILE_PATH + _pathforcheck; @@ -273,8 +276,8 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb GooglePlayServicesUtil.getErrorDialog(resultCode, this, PLAY_SERVICES_RESOLUTION_REQUEST).show(); } else { - Toast.makeText(getApplicationContext(), - "This device is not supported.", Toast.LENGTH_LONG) + Toast.makeText(getApplicationContext(),getResources().getString(R.string.notsuppoted) + , Toast.LENGTH_LONG) .show(); finish(); } @@ -426,59 +429,70 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb } protected void startCameraActivity() { - /* Log.i("MakeMachine", "startCameraActivity()"); - file = new File(_path); - Uri outputFileUri = Uri.fromFile(file); + try { + /*Log.i("MakeMachine", "startCameraActivity()"); + File file = new File(_path); + Uri outputFileUri = Uri.fromFile(file); + Intent intent = new Intent( + MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); - Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + startActivityForResult(intent, 0);*/ + Log.i("MakeMachine", "startCameraActivity()"); + File file = new File(_path); + outputFileUri = Uri.fromFile(file); - takePictureIntent.setPackage(defaultCameraPackage); + String defaultCameraPackage = ""; + final PackageManager packageManager = getPackageManager(); + List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES); + for (int n = 0; n < list.size(); n++) { + if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) { + Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString()); + Log.e("TAG", "package name : " + list.get(n).packageName); - takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); - - startActivityForResult(takePictureIntent, 1);*/ - - Log.i("MakeMachine", "startCameraActivity()"); - File file = new File(_path); - Uri outputFileUri = Uri.fromFile(file); - - String defaultCameraPackage=""; - final PackageManager packageManager = getPackageManager(); - List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES); - for (int n=0;n= Build.VERSION_CODES.KITKAT) { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { - defaultCameraPackage = list.get(n).packageName; - break; - } - } else { + //temp value in case camera is gallery app above jellybean if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { - defaultCameraPackage = list.get(n).packageName; - break; + gallery_package = list.get(n).packageName; + } + + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { + defaultCameraPackage = list.get(n).packageName; + break; + } + } else { + if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + defaultCameraPackage = list.get(n).packageName; + break; + } } } } + //com.android.gallery3d + + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + intent.setPackage(defaultCameraPackage); + startActivityForResult(intent, 0); } + catch (ActivityNotFoundException e) { + e.printStackTrace(); - Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); - - - takePictureIntent.setPackage(defaultCameraPackage); - - takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); - - startActivityForResult(takePictureIntent, 1); - + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + intent.setPackage(gallery_package); + startActivityForResult(intent, 0); + } + catch (Exception e) { + e.printStackTrace(); + } } + protected void onActivityResult(int requestCode, int resultCode, Intent data) { Log.i("MakeMachine", "resultCode: " + resultCode); @@ -541,7 +555,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb dialog = new Dialog(context); dialog.setContentView(R.layout.custom); - dialog.setTitle("Uploading Data"); + dialog.setTitle(getResources().getString(R.string.uploaddata)); dialog.setCancelable(false); dialog.show(); pb = (ProgressBar) dialog.findViewById(R.id.progressBar1); @@ -577,7 +591,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb k = k + factor; pb.setProgress(k); percentage.setText(k + "%"); - message.setText("Uploading Geotag Data..."); + message.setText(getResources().getString(R.string.geotagdata)); } }); @@ -709,7 +723,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb AlertMessage message = new AlertMessage( GeoTagActivity.this, AlertMessage.MESSAGE_DATA_NOT - + result, "failure", null); + + result, getResources().getString(R.string.failure), null); message.showMessage(); @@ -739,7 +753,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb dialog = new Dialog(context); dialog.setContentView(R.layout.custom); - dialog.setTitle("Uploading Geotag Images"); + dialog.setTitle(getResources().getString(R.string.uploadimge)); dialog.setCancelable(false); dialog.show(); pb = (ProgressBar) dialog.findViewById(R.id.progressBar1); @@ -776,7 +790,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb k = k + factor; pb.setProgress(k); percentage.setText(k + "%"); - message.setText("Uploading Geotag Images..."); + message.setText(getResources().getString(R.string.uploadimge)); } }); @@ -879,7 +893,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb AlertMessage message = new AlertMessage( GeoTagActivity.this, AlertMessage.MESSAGE_ERROR - + result, "success", null); + + result, getResources().getString(R.string.success), null); message.showMessage(); @@ -889,7 +903,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb AlertMessage message = new AlertMessage( GeoTagActivity.this, AlertMessage.MESSAGE_DATA_NOT - + result, "failure", null); + + result, getResources().getString(R.string.failure), null); message.showMessage(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java index ea12923..46727d1 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java @@ -74,11 +74,6 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi db = new GSKOrangeDB(GeoTagStoreList.this); db.open(); - - - - - fab.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -88,7 +83,6 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi finish(); - } }); @@ -109,10 +103,8 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi fab.setVisibility(View.VISIBLE); } - } - @Override public boolean onOptionsItemSelected(MenuItem item) { // Handle action bar item clicks here. The action bar will @@ -255,11 +247,9 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi imageview=(ImageView) itemView.findViewById(R.id.imageView1); } - } - + } } - public List getdata() { List data = new ArrayList<>(); @@ -267,24 +257,17 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi StoreBean storelistdata=new StoreBean(); - for(int i=0;i list = new ArrayList(); ArrayList listdata = new ArrayList(); - + ArrayList additionalVisibilitySkuList; + ArrayList additionalVisibilityinsertSkuList; ArrayList uploadlist = new ArrayList(); ArrayList defdata = new ArrayList(); Spinner spinner_brand, spinner_sku; Spinner spinner_brand_list, spinner_sku_list; + AdditionalDialogGetterSetter additionalgeetersetter; public static ArrayList data = new ArrayList(); ToggleButton btntoggle; ImageView btnimage, btnedit; @@ -96,10 +102,14 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl ListView listviewlay; String errormsg,categoryName,categoryId; MyAdaptorAdditionalStock adapteradditional; - AddittionalGetterSetter adGt; + AddittionalGetterSetter adGt,newadd; LinearLayout brandlayout, diaplylayout, cameralayout; + FloatingActionButton fab; //RelativeLayout skulayout; CardView cardvew; + String gallery_package = ""; + Uri outputFileUri; + ////String brand_id,SKU_ID; protected void onCreate(Bundle savedInstanceState) { // TODO Auto-generated method stub @@ -138,7 +148,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl brandlayout = (LinearLayout) findViewById(R.id.tv_brandlayout); diaplylayout = (LinearLayout) findViewById(R.id.tv_displaylayout); cameralayout = (LinearLayout) findViewById(R.id.tv_cameralayout); - + fab = (FloatingActionButton) findViewById(R.id.fab); //skulayout = (RelativeLayout) findViewById(R.id.tv_skulayout); btntoggle.setChecked(true); @@ -149,7 +159,8 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl ///band List brand_list = db.getBrandMasterData(store_id); BrandMasterGetterSetter brand = new BrandMasterGetterSetter(); - brand.setBRAND("select"); + String str= getResources().getString(R.string.select); + brand.setBRAND(str); brand_list.add(0, brand); CustomAdapter adapter = new CustomAdapter(AdditionalVisibility.this, R.layout.custom_spinner_item, brand_list); @@ -160,7 +171,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl skuMaster_list = db.getSKUMasterData(store_id); SkuMasterGetterSetter select = new SkuMasterGetterSetter(); - select.setSKU("Select"); + select.setSKU(str); skuMaster_list.add(0, select); CustomSkuMasterAdpter skuadapter = new CustomSkuMasterAdpter(AdditionalVisibility.this, R.layout.custom_spinner_item, skuMaster_list); spinner_sku_list.setAdapter(skuadapter); @@ -210,7 +221,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl if(tooglevalue.equalsIgnoreCase("0")) { - btnaddlayout.setVisibility(View.INVISIBLE); cardvew.setVisibility(View.INVISIBLE); listviewlay.setVisibility(View.INVISIBLE); @@ -221,8 +231,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl btnsku.setVisibility(View.INVISIBLE); } - - /* String KeyID = listdata.get(k).getKey_id(); uploadlist = db.getDialogStock(KeyID);*/ @@ -230,9 +238,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } - if (listdata.size() > 0) { - for (int i = 0; i < listdata.size(); i++) { if (listdata.get(i).getBtn_toogle().equalsIgnoreCase("0")) { listviewlay.setVisibility(View.INVISIBLE); @@ -250,13 +256,71 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + listdata = db.getAdditionalStock(store_id,categoryId); + + if(listdata.size()>0) + { + AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( + AdditionalVisibility.this); + // set title + alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_save)); + // set dialog message + alertDialogBuilder + .setMessage("") + .setCancelable(false) + .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + for (int J = 0; J < listdata.size(); J++) { + newadd = new AddittionalGetterSetter(); + newadd.setBrand(listdata.get(J).getBrand_id()); + newadd.setBrand_id(listdata.get(J).getBrand_id()); + newadd.setImage(listdata.get(J).getImage()); + newadd.setSku(listdata.get(J).getSku()); + newadd.setSku_id(listdata.get(J).getSku_id()); + newadd.setStore_id(listdata.get(J).getStore_id()); + newadd.setBtn_toogle(listdata.get(J).getBtn_toogle()); + newadd.setCategoryId(listdata.get(J).getCategoryId()); + + String KeyID = listdata.get(J).getKey_id(); + additionalVisibilitySkuList = db.getDialogStock(KeyID); + + db.InsertMainListAdditionalData(newadd, additionalVisibilitySkuList,categoryId); + + /*Intent in =new Intent(AdditionalVisibility.this, DailyDataMenuActivity.class); + + startActivity(in);*/ + + KeyID=""; + additionalVisibilitySkuList.clear(); + } + finish(); + } + }) + .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // if this button is clicked, just close + // the dialog box and do nothing + dialog.cancel(); + } + }); + + // create alert dialog + AlertDialog alertDialog = alertDialogBuilder.create(); + + // show it + alertDialog.show(); + + }else + { + Snackbar.make(view, getResources().getString(R.string.title_activity_Want_add), Snackbar.LENGTH_LONG).setAction("Action", null).show(); + } + + }}); - /* if (listdata.size() > 0) { - adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); - listviewlay.setAdapter(adapteradditional); - listviewlay.invalidateViews(); - }*/ btnaddlayout.setOnClickListener(new View.OnClickListener() { @Override @@ -272,46 +336,32 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl adGt.setBtn_toogle(togglevalue); adGt.setCategoryId(categoryId); - if (validateData(adGt, defdata)) { - AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AdditionalVisibility.this); - // set title - alertDialogBuilder.setTitle("Do You Want To Save"); - + alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_add)); // set dialog message alertDialogBuilder .setMessage("") .setCancelable(false) - .setPositiveButton("Yes", new DialogInterface.OnClickListener() { + .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { db.InsertAdditionalData(adGt, defdata,categoryId); - spinner_brand_list.setSelection(0); - spinner_sku_list.setSelection(0); - img_str = ""; brand_list_name = ""; brand_list_id = ""; sku_list_name = ""; sku_list_id = ""; - defdata.clear(); - // btntoggle.setChecked(true); - btnimage.setBackgroundResource(R.mipmap.camera); - // togglevalue = "1"; - listdata = db.getAdditionalStock(store_id,categoryId); - if (listdata.size() > 0) { - for(int i=0;i0) + { + AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( + AdditionalVisibility.this); + // set title + alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete)); + // set dialog message + alertDialogBuilder + .setMessage("") + .setCancelable(false) + .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + togglevalue = "1"; + db.deleteStockEntryall(store_id,categoryId); + brandlayout.setVisibility(View.VISIBLE); + diaplylayout.setVisibility(View.VISIBLE); + cameralayout.setVisibility(View.VISIBLE); + btnsku.setVisibility(View.VISIBLE); + btnaddlayout.setVisibility(View.VISIBLE); + cardvew.setVisibility(View.VISIBLE); + listviewlay.setVisibility(View.VISIBLE); - btnaddlayout.setVisibility(View.VISIBLE); - cardvew.setVisibility(View.VISIBLE); - listviewlay.setVisibility(View.VISIBLE); + listdata = db.getAdditionalStock(store_id,categoryId); + adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); + listviewlay.setAdapter(adapteradditional); + listviewlay.invalidateViews(); + } + }) + .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // if this button is clicked, just close + // the dialog box and do nothing + dialog.cancel(); + } + }); + + // create alert dialog + AlertDialog alertDialog = alertDialogBuilder.create(); + // show it + alertDialog.show(); + + }else + { + togglevalue = "1"; + brandlayout.setVisibility(View.VISIBLE); + diaplylayout.setVisibility(View.VISIBLE); + cameralayout.setVisibility(View.VISIBLE); + btnsku.setVisibility(View.VISIBLE); + btnaddlayout.setVisibility(View.VISIBLE); + cardvew.setVisibility(View.VISIBLE); + listviewlay.setVisibility(View.VISIBLE); + + } } else { - db.deleteStockEntryall(store_id,categoryId); + listdata = db.getAdditionalStock(store_id,categoryId); + + if(listdata.size()>0) + { + AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( + AdditionalVisibility.this); + // set title + alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete)); + + // set dialog message + alertDialogBuilder + .setMessage("") + .setCancelable(false) + .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + db.deleteStockEntryall(store_id,categoryId); + togglevalue = "0"; + defdata.clear(); + brandlayout.setVisibility(View.INVISIBLE); + diaplylayout.setVisibility(View.INVISIBLE); + cameralayout.setVisibility(View.INVISIBLE); + btnsku.setVisibility(View.INVISIBLE); + + listdata = db.getAdditionalStock(store_id,categoryId); + adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); + listviewlay.setAdapter(adapteradditional); + listviewlay.invalidateViews(); + + + + } + }) + .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // if this button is clicked, just close + // the dialog box and do nothing + dialog.cancel(); + } + }); + + // create alert dialog + AlertDialog alertDialog = alertDialogBuilder.create(); + // show it + alertDialog.show(); + } + else + { + togglevalue = "0"; + defdata.clear(); + brandlayout.setVisibility(View.INVISIBLE); + diaplylayout.setVisibility(View.INVISIBLE); + cameralayout.setVisibility(View.INVISIBLE); + btnsku.setVisibility(View.INVISIBLE); + } - togglevalue = "0"; - defdata.clear(); - brandlayout.setVisibility(View.INVISIBLE); - diaplylayout.setVisibility(View.INVISIBLE); - cameralayout.setVisibility(View.INVISIBLE); - btnsku.setVisibility(View.INVISIBLE); } } }); @@ -399,8 +534,8 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl btnimage.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - _pathforcheck = store_id + "Store" - + "Image" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; + _pathforcheck = store_id + getResources().getString(R.string.store) + +getResources().getString(R.string.image) + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; _path = CommonString.FILE_PATH + _pathforcheck; intime = getCurrentTime(); @@ -497,7 +632,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl if (position == 0) { // Default selected Spinner item - label.setText("Select"); + label.setText(getResources().getString(R.string.select)); //sub.setText(""); } else { // Set values for spinner each row @@ -559,7 +694,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl if (position == 0) { // Default selected Spinner item - label.setText("Select"); + label.setText(getResources().getString(R.string.select)); //sub.setText(""); } else { // Set values for spinner each row @@ -622,7 +757,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl if (position == 0) { // Default selected Spinner item - label.setText("Select"); + label.setText(getResources().getString(R.string.select)); //sub.setText(""); } else { // Set values for spinner each row @@ -635,12 +770,20 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl protected void startCameraActivity() { - try { + /*Log.i("MakeMachine", "startCameraActivity()"); + File file = new File(_path); + Uri outputFileUri = Uri.fromFile(file); + + Intent intent = new Intent( + MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + + startActivityForResult(intent, 0);*/ Log.i("MakeMachine", "startCameraActivity()"); File file = new File(_path); - Uri outputFileUri = Uri.fromFile(file); + outputFileUri = Uri.fromFile(file); String defaultCameraPackage = ""; final PackageManager packageManager = getPackageManager(); @@ -650,6 +793,11 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString()); Log.e("TAG", "package name : " + list.get(n).packageName); + //temp value in case camera is gallery app above jellybean + if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + gallery_package = list.get(n).packageName; + } + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { defaultCameraPackage = list.get(n).packageName; @@ -662,21 +810,28 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } } } - } + //com.android.gallery3d + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); intent.setPackage(defaultCameraPackage); startActivityForResult(intent, 0); + } + catch (ActivityNotFoundException e) { + e.printStackTrace(); + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + intent.setPackage(gallery_package); + startActivityForResult(intent, 0); - } catch (Exception e) { - + } + catch (Exception e) { e.printStackTrace(); } } - @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { @@ -708,7 +863,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl public void showSkuDialog() { final ArrayList brandList = db.getBrandT2PData("1", "1", "1"); BrandMasterGetterSetter brand = new BrandMasterGetterSetter(); - brand.setBRAND("select"); + brand.setBRAND(getResources().getString(R.string.select)); brandList.add(0, brand); // ArrayList skuMasterGetterSetterArrayList = db.getSkuT2PData("1", "1", "1",) final Dialog dialog = new Dialog(AdditionalVisibility.this); @@ -820,7 +975,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl ArrayList empty_list = new ArrayList<>(); SkuGetterSetter select = new SkuGetterSetter(); - select.setSKU("Select"); + select.setSKU(getResources().getString(R.string.select)); empty_list.add(select); CustomSkuAdapter skuadapter = new CustomSkuAdapter(AdditionalVisibility.this, R.layout.custom_spinner_item, empty_list); spinner_sku.setAdapter(skuadapter); @@ -836,7 +991,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl sku_list = db.getSkuT2PData("1", "1", "1", brand_id); SkuGetterSetter select = new SkuGetterSetter(); - select.setSKU("Select"); + select.setSKU(getResources().getString(R.string.select)); sku_list.add(0, select); // Create custom adapter object ( see below CustomSkuAdapter.java ) CustomSkuAdapter skuadapter = new CustomSkuAdapter(AdditionalVisibility.this, R.layout.custom_spinner_item, sku_list); @@ -976,13 +1131,13 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle("Do You Want To Delete?"); + alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete1)); // set dialog message alertDialogBuilder - .setMessage("Click Yes To Delete!") + .setMessage(getResources().getString(R.string.title_activity_click_delete)) .setCancelable(false) - .setPositiveButton("Yes", new DialogInterface.OnClickListener() { + .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { // db.deletedialogStockEntry(list.get(position1).getKEY_ID()); @@ -1002,7 +1157,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } }) - .setNegativeButton("No", new DialogInterface.OnClickListener() { + .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { // if this button is clicked, just close // the dialog box and do nothing @@ -1106,24 +1261,29 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle("Do You Want To Delete?"); + alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete1)); // set dialog message alertDialogBuilder - .setMessage("Click Yes To Delete!") + .setMessage(getResources().getString(R.string.title_activity_click_delete)) .setCancelable(false) - .setPositiveButton("Yes", new DialogInterface.OnClickListener() { + .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { db.deleteStockEntry(listdata.get(position1).getKey_id()); + + adapteradditional.notifyDataSetChanged(); listdata = db.getAdditionalStock(store_id,categoryId); - /* adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); + + + adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); listviewlay.setAdapter(adapteradditional); - listviewlay.invalidateViews();*/ + + listviewlay.invalidateViews(); if (listdata.size() > 0) { @@ -1144,12 +1304,9 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } - - - } }) - .setNegativeButton("No", new DialogInterface.OnClickListener() { + .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { // if this button is clicked, just close // the dialog box and do nothing @@ -1197,16 +1354,16 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl if (brandid.equalsIgnoreCase("") || skuid.equalsIgnoreCase("")) { flag = false; - errormsg = "Please Select dropdown"; + errormsg = getResources().getString(R.string.title_activity_select_dropdown); } else if (imageu == null || imageu.equalsIgnoreCase("")) { flag = false; - errormsg = "Please Take a image"; + errormsg = getResources().getString(R.string.title_activity_take_image); } else if (dialog.size() == 0) { - errormsg = "Please fill sku data"; + errormsg = getResources().getString(R.string.title_activity_fill_sku); flag = false; @@ -1232,13 +1389,13 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl if (brandid.equalsIgnoreCase("") || brandid == null) { flag = false; - msg = "Please Select Dropdown"; + msg = getResources().getString(R.string.title_activity_select_dropdown); } else if (displayid == null || displayid.equalsIgnoreCase("")) { flag = false; - msg = "Please Select Dropdown"; + msg = getResources().getString(R.string.title_activity_select_dropdown); } else if (QTy.equalsIgnoreCase("") || QTy == null) { flag = false; - msg = "Please enter Quantity"; + msg = getResources().getString(R.string.title_activity_enter_quantity); } else { flag = true; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java index 540cffa..6ff18bb 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -105,6 +105,10 @@ public class StoreListActivity extends AppCompatActivity { storelist = db.getStoreData(date); coverage=db.getCoverageData(date); + + + + if (storelist.size() > 0) { //list.setAdapter(new MyAdaptor()); adapter = new StoreListActivity.ValueAdapter(getApplicationContext(), storelist); @@ -394,7 +398,7 @@ public class StoreListActivity extends AppCompatActivity { AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this); builder.setMessage(CommonString.DATA_DELETE_ALERT_MESSAGE) .setCancelable(false) - .setPositiveButton("Yes", + .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -409,7 +413,7 @@ public class StoreListActivity extends AppCompatActivity { } }) - .setNegativeButton("No", + .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -466,3 +470,6 @@ public class StoreListActivity extends AppCompatActivity { } } + + + diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java index 147164f..67e04fb 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java @@ -150,8 +150,8 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic case R.id.img_cam_selfie: - _pathforcheck = store_id + "Store" - + "Image" + visit_date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; + _pathforcheck = store_id + getResources().getString(R.string.store) + + getResources().getString(R.string.image) + visit_date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; _path = CommonString.FILE_PATH + _pathforcheck; @@ -166,9 +166,9 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic if (img_str != null) { AlertDialog.Builder builder = new AlertDialog.Builder(StoreimageActivity.this); - builder.setMessage("Do you want to save the data ") + builder.setMessage(getResources().getString(R.string.title_activity_save_data)) .setCancelable(false) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { + .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { alert.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false); @@ -203,7 +203,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic finish(); } }) - .setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.cancel(); } @@ -213,7 +213,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic alert.show(); } else { - Toast.makeText(getApplicationContext(), "Please click the image", Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), getResources().getString(R.string.clickimage), Toast.LENGTH_SHORT).show(); } break; } 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 9f76527..a8ea3b7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -454,7 +454,7 @@ public class UploadActivity extends AppCompatActivity { String KeyID = additionalVisibilityList.get(J).getKey_id(); - additionalVisibilitySkuList = db.getDialogStock(KeyID); + additionalVisibilitySkuList = db.getDialogStockUpload(KeyID); if(additionalVisibilitySkuList.size()>0) { @@ -469,9 +469,9 @@ public class UploadActivity extends AppCompatActivity { + "[KEY_ID]" + additionalVisibilitySkuList.get(k).getCOMMON_ID() + "[/KEY_ID]" - /* + "[DIALOG_BRAND_ID]" - + additionalVisibilitySkuList.get(k).getBrand_id() - + "[/DIALOG_BRAND_ID]"*/ + + "[CATEGORY_ID]" + + additionalVisibilitySkuList.get(k).getCategoryId() + + "[/CATEGORY_ID]" + "[SKU_ID]" + additionalVisibilitySkuList.get(k).getSku_id() + "[/SKU_ID]" @@ -513,6 +513,10 @@ public class UploadActivity extends AppCompatActivity { + "[/ADDITIONAL_VISIBILITY_DATA]"; additional_visibility_data_xml = additional_visibility_data_xml + onXML; + KeyID=""; + additionalVisibilitySkuList.clear(); + + additional_visibility_dialog_xml=""; } diff --git a/GSKMTOrange/src/main/res/layout/additionaldialoglayout.xml b/GSKMTOrange/src/main/res/layout/additionaldialoglayout.xml index d3cad5b..8e8b2ef 100644 --- a/GSKMTOrange/src/main/res/layout/additionaldialoglayout.xml +++ b/GSKMTOrange/src/main/res/layout/additionaldialoglayout.xml @@ -30,7 +30,7 @@ android:layout_height="match_parent" android:layout_weight="10" - android:text="Brand Name" + android:text="@string/brandname" android:textStyle="bold" /> + android:text="@string/delete" /> diff --git a/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml b/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml index 7855508..cd601f1 100644 --- a/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml +++ b/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml @@ -9,6 +9,15 @@ + diff --git a/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml b/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml index 68f45c8..1494793 100644 --- a/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml +++ b/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml @@ -62,8 +62,8 @@ android:id="@+id/btntoggle" android:layout_width="0dp" android:layout_height="wrap_content" - android:textOn="Yes" - android:textOff="No" + android:textOn="@string/yes" + android:textOff="@string/no" android:layout_weight=".5" /> diff --git a/GSKMTOrange/src/main/res/layout/contentstoreimage.xml b/GSKMTOrange/src/main/res/layout/contentstoreimage.xml index 4abae3d..1b8fb1a 100644 --- a/GSKMTOrange/src/main/res/layout/contentstoreimage.xml +++ b/GSKMTOrange/src/main/res/layout/contentstoreimage.xml @@ -24,7 +24,7 @@ + android:textSize="18sp" /> @@ -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/storeviewlist.xml b/GSKMTOrange/src/main/res/layout/storeviewlist.xml index 810d74a..8f3af54 100644 --- a/GSKMTOrange/src/main/res/layout/storeviewlist.xml +++ b/GSKMTOrange/src/main/res/layout/storeviewlist.xml @@ -44,7 +44,7 @@ android:layout_height="wrap_content" android:layout_alignTop="@+id/storelistviewxml_storeico" android:layout_toRightOf="@+id/storelistviewxml_storeico" - android:text="GSK MT ORANGE STORE" + android:text="@string/GSKMT" android:textColor="#1F3A6C" android:textSize="16sp" android:textStyle="bold" /> @@ -55,7 +55,7 @@ android:layout_height="wrap_content" android:layout_alignLeft="@+id/storelistviewxml_storename" android:layout_below="@+id/storelistviewxml_storename" - android:text="C 126, Okhla II, " + android:text="@string/address" android:textColor="#666666" android:textSize="10sp" android:textStyle="normal" /> diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/checkout.png b/GSKMTOrange/src/main/res/mipmap-hdpi/checkout.png new file mode 100644 index 0000000..cdf97c6 Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/checkout.png differ diff --git a/GSKMTOrange/src/main/res/mipmap-tr/checkout.png b/GSKMTOrange/src/main/res/mipmap-tr/checkout.png new file mode 100644 index 0000000..6aa707a Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-tr/checkout.png differ diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 4c6b7b6..64266c5 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -36,6 +36,16 @@ Cancel Yes No + Brand Name + SKU Name + Quantity + Delete + Store Visited + GSK MT ORANGE STORE + C 126, Okhla II, + Click Store Front Image + + Please select language @@ -126,5 +136,30 @@ Photo Additional Visibility Non-Work Reason + Do You Want To Save + Please Add Data + Do You Want To Add + Do You Want To Delete Data + store + Do You Want To Delete + Click Yes To Delete! + Please Select dropdown + Please Take a image + + Please fill sku data + Please enter Quantity + Do you want to save the data + + OK + Please click the image + GPS IS DISABLED... + Click ok to enable GPS. + Please Take Image Before Save + This device is not supported. + Uploading Data + Uploading Geotag Data... + failure + Uploading Geotag Images + success