Merge pull request #63 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/AshishDataImage

newcode

GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java

@@ -884,7 +884,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
 
 
                 AlertMessage message = new AlertMessage(
-                        GeoTagActivity.this, AlertMessage.MESSAGE_SUCCESS
+                        GeoTagActivity.this, getResources().getString(R.string.uploadeddata)
                         + result, getResources().getString(R.string.success), null);
                 message.showMessage();
 

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

@@ -98,7 +98,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
     ArrayList<SkuGetterSetter> empty_list = new ArrayList<>();
     String _pathforcheck, _path, str, msg;
     private SharedPreferences preferences;
-    String store_id, date, intime, img_str, togglevalue = "1",CATEGORY_ID;
+    String store_id, date, intime, img_str, togglevalue = "1",CATEGORY_ID,camera_allow;
     ImageView img_cam, img_clicked;
     Button btn_add, btn_close;
     EditText Edt_txt;
@@ -110,7 +110,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
     LinearLayout brandlayout, diaplylayout, cameralayout;
     FloatingActionButton fab;
     //RelativeLayout skulayout;
-    CardView cardvew;
+    CardView cardvew,maincard;
     String gallery_package = "";
     Uri outputFileUri;
 
@@ -127,7 +127,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
 
         preferences = PreferenceManager.getDefaultSharedPreferences(this);
         store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
-
+        camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
         updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
 
         categoryName = getIntent().getStringExtra("categoryName");
@@ -142,8 +142,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
         spinner_brand_list = (Spinner) findViewById(R.id.spinner_Brand1);
         spinner_sku_list = (Spinner) findViewById(R.id.spinner_SkuMaster);
         cardvew = (CardView) findViewById(R.id.cardviewid);
-
-
         btntoggle = (ToggleButton) findViewById(R.id.btntoggle);
         btnimage = (ImageView) findViewById(R.id.btn_image);
         btnedit = (ImageView) findViewById(R.id.btn_edit);
@@ -154,11 +152,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
         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);
+        maincard = (CardView) findViewById(R.id.cardviewid);
 
         btntoggle.setChecked(true);
 
-
         str = CommonString.FILE_PATH;
 
         ///band List
@@ -229,6 +226,8 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
                 btnaddlayout.setVisibility(View.INVISIBLE);
                 cardvew.setVisibility(View.INVISIBLE);
                 listviewlay.setVisibility(View.INVISIBLE);
+
+                maincard.setVisibility(View.INVISIBLE);
                 btntoggle.setChecked(false);
                 brandlayout.setVisibility(View.INVISIBLE);
                 diaplylayout.setVisibility(View.INVISIBLE);
@@ -247,6 +246,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
             for (int i = 0; i < listdata.size(); i++) {
                 if (listdata.get(i).getBtn_toogle().equalsIgnoreCase("0")) {
                     listviewlay.setVisibility(View.INVISIBLE);
+                    maincard.setVisibility(View.INVISIBLE);
                     cardvew.setVisibility(View.INVISIBLE);
                     btnaddlayout.setVisibility(View.INVISIBLE);
                 } else {
@@ -256,6 +256,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
                     btnaddlayout.setVisibility(View.VISIBLE);
                     cardvew.setVisibility(View.VISIBLE);
                     listviewlay.setVisibility(View.VISIBLE);
+                    maincard.setVisibility(View.VISIBLE);
                 }
             }
 
@@ -275,7 +276,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
                 alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_save));
                 // set dialog message
                 alertDialogBuilder
-                        .setMessage("")
+                        .setMessage(getResources().getString(R.string.title_activity_save_data))
                         .setCancelable(false)
                         .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int id) {
@@ -346,7 +347,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
                     alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_add));
                     // set dialog message
                     alertDialogBuilder
-                            .setMessage("")
+                            .setMessage(getResources().getString(R.string.adddatatoclick))
                             .setCancelable(false)
                             .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialog, int id) {
@@ -361,7 +362,15 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
                                     sku_list_id = "";
                                     defdata.clear();
 
-                                    btnimage.setBackgroundResource(R.mipmap.camera);
+                                    if(camera_allow.equals("1"))
+                                    {
+                                        btnimage.setBackgroundResource(R.mipmap.camera_orange);
+                                    }else
+                                    {
+                                        btnimage.setBackgroundResource(R.mipmap.camera_grey);
+                                    }
+
+
 
                                     listdata = db.getAdditionalStock(store_id,categoryId);
                                     if (listdata.size() > 0) {
@@ -370,6 +379,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
                                             if(listdata.get(i).getBtn_toogle().equalsIgnoreCase("0"))
                                             {
                                                 listviewlay.setVisibility(View.INVISIBLE);
+                                                maincard.setVisibility(View.INVISIBLE);
                                                 cardvew.setVisibility(View.INVISIBLE);
                                                 btnaddlayout.setVisibility(View.INVISIBLE);
                                             }
@@ -381,6 +391,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
                                                 btnaddlayout.setVisibility(View.VISIBLE);
                                                 cardvew.setVisibility(View.VISIBLE);
                                                 listviewlay.setVisibility(View.VISIBLE);
+                                                maincard.setVisibility(View.VISIBLE);
 
                                             }
                                         }
@@ -426,7 +437,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
                         alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete));
                         // set dialog message
                         alertDialogBuilder
-                                .setMessage("")
+                                .setMessage(getResources().getString(R.string.title_activity_click_delete))
                                 .setCancelable(false)
                                 .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
                                     public void onClick(DialogInterface dialog, int id) {
@@ -439,7 +450,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
                                         btnaddlayout.setVisibility(View.VISIBLE);
                                         cardvew.setVisibility(View.VISIBLE);
                                         listviewlay.setVisibility(View.VISIBLE);
-
+                                        maincard.setVisibility(View.VISIBLE);
                                         listdata = db.getAdditionalStock(store_id,categoryId);
 
                                         adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata);
@@ -470,6 +481,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
                         btnaddlayout.setVisibility(View.VISIBLE);
                         cardvew.setVisibility(View.VISIBLE);
                         listviewlay.setVisibility(View.VISIBLE);
+                        maincard.setVisibility(View.VISIBLE);
 
                     }
 
@@ -486,7 +498,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
 
                         // set dialog message
                         alertDialogBuilder
-                                .setMessage("")
+                                .setMessage(getResources().getString(R.string.title_activity_click_delete))
                                 .setCancelable(false)
                                 .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
                                     public void onClick(DialogInterface dialog, int id) {
@@ -534,18 +546,38 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
             }
         });
 
-        btnimage.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                _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();
-                startCameraActivity();
 
-            }
+
-        });
+        if(camera_allow.equals("1")){
+
+            btnimage.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    _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();
+                    startCameraActivity();
+
+                }
+            });
+
+        }
+        else {
+            btnimage.setBackgroundResource(R.mipmap.camera_grey);
+
+
+        }
+
+
+
+
+
+
+
+
 
 
         btnsku.setOnClickListener(new View.OnClickListener() {
@@ -849,7 +881,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
                 if (_pathforcheck != null && !_pathforcheck.equals("")) {
                     if (new File(str + _pathforcheck).exists()) {
 
-                        btnimage.setBackgroundResource(R.mipmap.camera_done);
+                        btnimage.setBackgroundResource(R.mipmap.camera_green);
 
                         img_str = _pathforcheck;
                         _pathforcheck = "";
@@ -1305,6 +1337,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
                                                 listviewlay.setVisibility(View.INVISIBLE);
                                                 cardvew.setVisibility(View.INVISIBLE);
                                                 btnaddlayout.setVisibility(View.INVISIBLE);
+                                                maincard.setVisibility(View.INVISIBLE);
                                             } else {
                                                 adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata);
                                                 listviewlay.setAdapter(adapteradditional);
@@ -1312,6 +1345,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
                                                 btnaddlayout.setVisibility(View.VISIBLE);
                                                 cardvew.setVisibility(View.VISIBLE);
                                                 listviewlay.setVisibility(View.VISIBLE);
+                                                maincard.setVisibility(View.VISIBLE);
                                             }
                                         }
                                     }
@@ -1363,18 +1397,23 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
             flag = true;
         } else {
 
-
             if (brandid.equalsIgnoreCase("") || skuid.equalsIgnoreCase("")) {
                 flag = false;
 
                 errormsg = getResources().getString(R.string.title_activity_select_dropdown);
 
-            } else if (imageu == null || imageu.equalsIgnoreCase("")) {
+            }
-                flag = false;
+            else if(camera_allow.equals("1"))
+            {
+                if (imageu == null || imageu.equalsIgnoreCase("")) {
+                    flag = false;
 
-                errormsg = getResources().getString(R.string.title_activity_take_image);
+                    errormsg = getResources().getString(R.string.title_activity_take_image);
 
-            } else if (dialog.size() == 0) {
+                }
+
+            }
+             else if (dialog.size() == 0) {
 
                 errormsg = getResources().getString(R.string.title_activity_fill_sku);
                 flag = false;

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

@@ -1,6 +1,7 @@
 package cpm.com.gskmtorange.dailyentry;
 
 import android.app.AlertDialog;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -69,7 +70,8 @@ public class NonWorkingReason extends AppCompatActivity implements
     AlertDialog alert;
     ImageButton camera;
     RelativeLayout reason_lay, rel_cam;
-
+    String gallery_package = "";
+    Uri outputFileUri;
     boolean leave_flag = false;
 
     ArrayList<StoreBean> jcp;
@@ -179,12 +181,21 @@ public class NonWorkingReason extends AppCompatActivity implements
     }
 
     protected void startCameraActivity() {
-
         try {
-            Log.i("MakeMachine", "startCameraActivity()");
+            /*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);
+            outputFileUri = Uri.fromFile(file);
+
             String defaultCameraPackage = "";
             final PackageManager packageManager = getPackageManager();
             List<ApplicationInfo> list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
@@ -193,6 +204,11 @@ public class NonWorkingReason extends AppCompatActivity implements
                     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;
@@ -207,18 +223,26 @@ public class NonWorkingReason extends AppCompatActivity implements
                 }
             }
 
-            Intent intent = new Intent(
+            //com.android.gallery3d
-                    android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
+
+            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) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         }
     }
 
+
     @SuppressWarnings("deprecation")
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -297,9 +321,9 @@ public class NonWorkingReason extends AppCompatActivity implements
 
                         AlertDialog.Builder builder = new AlertDialog.Builder(
                                 NonWorkingReason.this);
-                        builder.setMessage("Do you want to save the data ")
+                        builder.setMessage( R.string.title_activity_save_data)
                                 .setCancelable(false)
-                                .setPositiveButton("OK",
+                                .setPositiveButton(R.string.ok,
                                         new DialogInterface.OnClickListener() {
                                             public void onClick(
                                                     DialogInterface dialog,
@@ -398,7 +422,7 @@ public class NonWorkingReason extends AppCompatActivity implements
                                                 finish();
                                             }
                                         })
-                                .setNegativeButton("Cancel",
+                                .setNegativeButton(R.string.closed,
                                         new DialogInterface.OnClickListener() {
                                             public void onClick(
                                                     DialogInterface dialog,
@@ -411,17 +435,16 @@ public class NonWorkingReason extends AppCompatActivity implements
                         alert.show();
 
                     } else {
-                        Toast.makeText(getApplicationContext(),
+                        Toast.makeText(getApplicationContext(), R.string.title_activity_select_dropdown,
-                                "Please enter required remark reason",
                                 Toast.LENGTH_SHORT).show();
                     }
                 } else {
                     Toast.makeText(getApplicationContext(),
-                            "Please Capture Image", Toast.LENGTH_SHORT).show();
+                            R.string.title_activity_take_image, Toast.LENGTH_SHORT).show();
                 }
             } else {
                 Toast.makeText(getApplicationContext(),
-                        "Please Select a Reason", Toast.LENGTH_SHORT).show();
+                        R.string.title_activity_select_dropdown, Toast.LENGTH_SHORT).show();
 
             }
         }

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

@@ -302,24 +302,6 @@ public class StoreListActivity extends AppCompatActivity {
                     }
 
 
-
-                        /*{
-
-                            for (int i = 0; i < coverage.size(); i++) {
-
-                                if (coverage.get(i).getStoreId().equals(store_id)) {
-                                    if (coverage.get(i).getStatus().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) {
-                                        Snackbar.make(v, R.string.title_store_list_activity_already_store_closed, Snackbar.LENGTH_LONG).setAction("Action", null).show();
-                                    }
-                                }
-
-                            }
-
-                        }
-                    }*/
-
-
-
                     else {
 
                         // PUT IN PREFERENCES
@@ -399,7 +381,7 @@ public class StoreListActivity extends AppCompatActivity {
 
                                         }
                                     })
-                            .setNegativeButton(R.string.cancel,
+                            .setNegativeButton(R.string.closed,
                                     new DialogInterface.OnClickListener() {
                                         public void onClick(
                                                 DialogInterface dialog, int id) {

GSKMTOrange/src/main/java/cpm/com/gskmtorange/messgae/AlertMessage.java

@@ -6,6 +6,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 
 import cpm.com.gskmtorange.GeoTag.GeoTagStoreList;
+import cpm.com.gskmtorange.R;
 
 /**
  * Created by ashishc on 03-01-2017.
@@ -63,9 +64,9 @@ public class AlertMessage {
     public void ShowAlert1(String str) {
 
         AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-        builder.setTitle("Parinaam");
+        builder.setTitle(R.string.dialog_title);
         builder.setMessage(str).setCancelable(false)
-                .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
 
                         Intent i = new Intent(activity, GeoTagStoreList.class);
@@ -84,9 +85,9 @@ public class AlertMessage {
     public void ShowAlertSocket(String str) {
 
         AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-        builder.setTitle("Parinaam");
+        builder.setTitle(R.string.dialog_title);
         builder.setMessage(str).setCancelable(false)
-                .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
 
                         Intent i = new Intent(activity, GeoTagStoreList.class);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java

@@ -865,6 +865,36 @@ public class UploadActivity extends AppCompatActivity {
 
                             //// ashish close image
 
+                            ///////Start store images
+
+                            if (coverageList.size() > 0) {
+                                for (int i1 = 0; i1 < coverageList.size(); i1++) {
+
+                                    if (coverageList.get(i1).getImage() != null && !coverageList.get(i1).getImage().equals("")) {
+                                        if (new File(CommonString.FILE_PATH + coverageList.get(i1).getImage()).exists()) {
+
+                                            try {
+                                                result = UploadImage(coverageList.get(i1).getImage(), "StoreImages");
+
+                                                if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+                                                    return "StoreImages";
+                                                }
+
+                                                runOnUiThread(new Runnable() {
+                                                    public void run() {
+                                                        message.setText("StoreImages Uploaded");
+                                                    }
+                                                });
+                                            } catch (Exception e) {
+                                                e.printStackTrace();
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+
+
+                            ///////close store images
 
                             for (int m = 0; m < t2PGetterSetters.size(); m++) {
 

GSKMTOrange/src/main/res/layout/additionallistlayout.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" />
 
             <TextView
@@ -59,7 +59,7 @@
                 android:layout_height="match_parent"
 
                 android:layout_weight="10"
-                android:text="SKU Name"
+                android:text="@string/displayname"
                 android:textStyle="bold" />
 
             <TextView
@@ -118,7 +118,7 @@
                 android:layout_marginLeft="30dp"
                 android:layout_weight="10"
                 android:background="@color/grey_background"
-                android:text="Delete" />
+                android:text="@string/delete" />
 
         </LinearLayout>
 

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

@@ -154,14 +154,15 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+
                     android:background="@color/grey_background">
 
                     <ImageView
                         android:id="@+id/btn_image"
-                        android:layout_width="wrap_content"
+                        android:layout_width="40dp"
-                        android:layout_height="wrap_content"
+                        android:layout_height="40dp"
-
+                        android:layout_centerInParent="true"
-                        android:background="@mipmap/new_camera" />
+                        android:background="@mipmap/camera_orange" />
                 </RelativeLayout>
 
                 <RelativeLayout
@@ -228,6 +229,7 @@
         android:padding="10dp"
         card_view:cardBackgroundColor="@color/colorOrange"
         card_view:cardCornerRadius="20dp"
+        android:visibility="gone"
         >
 
 

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

@@ -120,42 +120,48 @@
 
     <string name="select_language_item">Dil Seçimi</string>
 
-    <string name="title_activity_Want_save"> Do You Want To Save</string>
+    <string name="title_activity_Want_save">Veriyi saklamak istiyor musunuz?</string>
-    <string name="title_activity_Want_add"> Please Add Data</string>
+    <string name="title_activity_Want_add">Tüm alanlari doldurunuz</string>
-    <string name="title_activity_Want_to_add">Do You Want To Add</string>
+    <string name="title_activity_Want_to_add">Veri eklemek istiyor musun</string>
-    <string name="title_activity_Want_to_delete"> Do You Want To Delete Data</string>
+    <string name="title_activity_Want_to_delete"> Verileri silmek istiyor musun</string>
-    <string name="store"> store</string>
+    <string name="store"> Mağazalar</string>
-    <string name="title_activity_Want_to_delete1"> Do You Want To Delete</string>
+    <string name="title_activity_Want_to_delete1"> Verileri silmek istiyor musun</string>
-    <string name="title_activity_click_delete">Click Yes To Delete!</string>
+    <string name="title_activity_click_delete">Silme için Evet tıklayın</string>
     <string name="title_activity_select_dropdown">Please Select dropdown</string>
-    <string name="title_activity_take_image">Please Take a image</string>
+    <string name="title_activity_take_image">En az bir fotoğraf çekiniz</string>
-
-    <string name="title_activity_fill_sku">Please fill sku data</string>
-    <string name="title_activity_enter_quantity">Please enter Quantity</string>
-    <string name="title_activity_save_data">Do you want to save the data</string>
-
-
-    <string name="clickimage">Please click the image</string>
-    <string name="gps">GPS IS DISABLED...</string>
-    <string name="gpsebale">Click ok to enable GPS.</string>
-    <string name="takeimage"> Please Take Image Before Save</string>
-    <string name="notsuppoted">This device is not supported.</string>
-    <string name="uploaddata">Uploading Data</string>
-    <string name="geotagdata">Uploading Geotag Data...</string>
-    <string name="failure">failure</string>
-    <string name="uploadimge">Uploading Geotag Images</string>
-    <string name="success">success</string>
-    <string name="wantcheckout">Are you sure you want to Checkout</string>
-    <string name="nonetwork"> No Network</string>
-
-    <string name="click_image">Please click image</string>
-
-
-
 
+    <string name="title_activity_fill_sku">Ürün ekle</string>
+    <string name="title_activity_enter_quantity">Teşhir Sayısı Doldur  </string>
+    <string name="title_activity_save_data">Veriyi saklamak istiyor musunuz?</string>
 
 
+    <string name="clickimage">En az bir fotoğraf çekiniz</string>
+    <string name="gps">GPS devre dışı</string>
+    <string name="gpsebale">Etkinleştir GPS</string>
+    <string name="takeimage">En az bir fotoğraf çekiniz</string>
+    <string name="notsuppoted">Bu cihaz desteklenmiyor</string>
+    <string name="uploaddata">Veri paylaşılıyor</string>
+    <string name="geotagdata">Coğrafi Konum paylaşılıyor</string>
+    <string name="failure">Başarısızlık</string>
+    <string name="uploadimge">Fotoğraflar paylaşılıyor</string>
+    <string name="success">Başarı</string>
+    <string name="wantcheckout">Mağazadan çıkmak istiyor musunuz?</string>
+    <string name="nonetwork">No Network Connection. Please check your Internet Connection</string>
+    <string name="click_image">En az bir fotoğraf çekiniz</string>
 
+    <string name="title_store_list_activity_already_store_closed">Store Already Closed</string>
+    <string name="title_store_list_activity_store_closed">Store Closed</string>
+    <string name="title_store_list_activity_store_already_done">Store Already Uploaded</string>
+    <string name="title_store_list_activity_store_data_uploaded">Store Data Uploaded</string>
+    <string name="title_store_list_activity_store_already_checkout">Store Already Checkout</string>
+    <string name="title_store_list_activity_store_again_uploaded">Please Store data again Uploaded</string>
+    <string name="title_store_list_checkout_current">Please checkout from current store</string>
+    <string name="title_store_list_checkout_Already_filled">Data already filled</string>
+    <string name="NetworkError">Network Error ,</string>
+    <string name="uploadeddata"> Uploaded Data ,</string>
+    <string name="DataNot"> Data Not Uploaded ,</string>
+    <string name="delete">Delete</string>
+    <string name="adddatatoclick">Click Yes To Add Data</string>
 
 
 

GSKMTOrange/src/main/res/values/strings.xml

@@ -175,7 +175,7 @@
     <string name="uploadimge">Uploading Geotag Images</string>
     <string name="success">success</string>
     <string name="wantcheckout">Are you sure you want to Checkout</string>
-    <string name="nonetwork"> No Network</string>
+    <string name="nonetwork"> No Network Connection. Please check your Internet Connection</string>
 
     <string name="title_activity_Non_Work">Non Working Reason</string>
     <string name="closed">Close</string>
@@ -214,12 +214,16 @@
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="title_activity_checkout">CheckoutActivity</string>
     <string name="checkout_successful">Checkout Success</string>
-    <string name="title_activity_service">Service</string>
 
+    <string name="NetworkError">Network Error ,</string>
+    <string name="DataNot"> Data Not Uploaded ,</string>
+    <string name="displayname">Display Name</string>
+    <string name="adddatatoclick">Click Yes To Add Data</string>
+
+    <string name="title_activity_service">Service</string>
+  
     <string name="data_downloaded_successfully">Data downloaded successfully</string>
     <string name="export_database">Export Database</string>
     <string name="data_exported_successfully">Database Exported Successfully</string>
 
-
-
 </resources>