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 337a47e..0107028 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
@@ -473,7 +473,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
break;
}
} else {
- if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) {
+ if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) {
defaultCameraPackage = list.get(n).packageName;
break;
}
@@ -565,7 +565,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
dialog = new Dialog(context);
dialog.setContentView(R.layout.custom);
- dialog.setTitle(getResources().getString(R.string.uploaddata));
+ dialog.setTitle(getResources().getString(R.string.dialog_title));
dialog.setCancelable(false);
dialog.show();
pb = (ProgressBar) dialog.findViewById(R.id.progressBar1);
@@ -776,7 +776,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
dialog = new Dialog(context);
dialog.setContentView(R.layout.custom);
- dialog.setTitle(getResources().getString(R.string.uploadimge));
+ dialog.setTitle(getResources().getString(R.string.dialog_title));
dialog.setCancelable(false);
dialog.show();
pb = (ProgressBar) dialog.findViewById(R.id.progressBar1);
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SplashScreenActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SplashScreenActivity.java
index 1fecee1..2cbca02 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SplashScreenActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SplashScreenActivity.java
@@ -24,7 +24,7 @@ public class SplashScreenActivity extends AppCompatActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_splash_screen);
+ setContentView(R.layout.activity_splash_main_layout);
StartAnimations();
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
index d70e87e..bf5fb8e 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
@@ -952,7 +952,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
break;
}
} else {
- if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) {
+ if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) {
defaultCameraPackage = list.get(n).packageName;
break;
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
index 33a5d5d..a8189cf 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
@@ -215,7 +215,7 @@ public class NonWorkingReason extends AppCompatActivity implements
break;
}
} else {
- if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) {
+ if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) {
defaultCameraPackage = list.get(n).packageName;
break;
}
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 902f405..b688348 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
@@ -430,7 +430,10 @@ public class StoreListActivity extends AppCompatActivity {
address = (TextView) itemView.findViewById(R.id.storelistviewxml_storeaddress);
relativelayout = (RelativeLayout) itemView.findViewById(R.id.storenamelistview_layout);
- imageview = (ImageView) itemView.findViewById(R.id.imageView2);
+ //imageview = (ImageView) itemView.findViewById(R.id.imageView2);
+
+ imageview = (ImageView) itemView.findViewById(R.id.storelistviewxml_storeico);
+
chkbtn = (Button) itemView.findViewById(R.id.chkout);
Cardbtn = (CardView) itemView.findViewById(R.id.card_view);
@@ -482,7 +485,7 @@ public class StoreListActivity extends AppCompatActivity {
if (checkout_status.equals(CommonString.KEY_INVALID) || checkout_status.equals(CommonString.KEY_VALID)) {
AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this);
- builder.setMessage(CommonString.DATA_DELETE_ALERT_MESSAGE)
+ builder.setMessage(R.string.DELETE_ALERT_MESSAGE)
.setCancelable(false)
.setPositiveButton(getResources().getString(R.string.yes),
new DialogInterface.OnClickListener() {
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 61cb227..727c101 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
@@ -262,7 +262,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
break;
}
} else {
- if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) {
+ if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) {
defaultCameraPackage = list.get(n).packageName;
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 d23e73e..bc590dc 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
@@ -956,7 +956,7 @@ public class DownloadActivity extends AppCompatActivity {
AlertDialog.Builder builder = new AlertDialog.Builder(DownloadActivity.this);
builder.setTitle("Parinaam");
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, StorelistActivity.class);
diff --git a/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml b/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml
index c68fe9e..b15d425 100644
--- a/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml
+++ b/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml
@@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
- app:srcCompat="@android:drawable/ic_menu_save"
+ app:srcCompat="@drawable/save_icon"
app:backgroundTint="@color/colorAccent"
/>
@@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|left"
android:layout_margin="@dimen/fab_margin"
- android:src="@android:drawable/ic_menu_camera"
+ android:src="@mipmap/camera_orange"
app:backgroundTint="@color/colorAccent"
/>
diff --git a/GSKMTOrange/src/main/res/layout/activity_splash_main_layout.xml b/GSKMTOrange/src/main/res/layout/activity_splash_main_layout.xml
new file mode 100644
index 0000000..08d4874
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/activity_splash_main_layout.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml b/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml
index 3234393..9ae41ff 100644
--- a/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml
+++ b/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml
@@ -15,7 +15,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
- app:srcCompat="@android:drawable/ic_menu_save"
+ app:srcCompat="@drawable/save_icon"
app:backgroundTint="@color/colorAccent"
/>
diff --git a/GSKMTOrange/src/main/res/layout/custom.xml b/GSKMTOrange/src/main/res/layout/custom.xml
index d289b4a..3ff50fa 100644
--- a/GSKMTOrange/src/main/res/layout/custom.xml
+++ b/GSKMTOrange/src/main/res/layout/custom.xml
@@ -35,7 +35,7 @@
android:layout_marginTop="15dp"
android:paddingBottom="20dp"
android:paddingLeft="5dp"
- android:text="Uploading Data"
+ android:text="@string/uploaddata"
android:textSize="@dimen/text_size_small" />
@@ -107,7 +108,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
- android:text="Please download data"
+ android:text="@string/Pleasedownaloaddata"
android:textSize="25sp"
android:textStyle="bold" />
diff --git a/GSKMTOrange/src/main/res/layout/storeviewlist.xml b/GSKMTOrange/src/main/res/layout/storeviewlist.xml
index 3dfe5f1..0ef657d 100644
--- a/GSKMTOrange/src/main/res/layout/storeviewlist.xml
+++ b/GSKMTOrange/src/main/res/layout/storeviewlist.xml
@@ -34,7 +34,7 @@
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginRight="6sp"
- android:background="@mipmap/store"
+
android:layout_marginTop="10dp"
android:paddingTop="25sp" />
diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml
index e5e9790..d69968b 100644
--- a/GSKMTOrange/src/main/res/values-tr/string.xml
+++ b/GSKMTOrange/src/main/res/values-tr/string.xml
@@ -118,9 +118,9 @@
Dil Seçimi
- Veriyi saklamak istiyor musunuz?
+ Kaydetmek İstediğinizden Emin misiniz?
Tüm alanlari doldurunuz
- Veri eklemek istiyor musun
+ Eklemek İstediğinden Emin misin
Verileri silmek istiyor musun
Mağazalar
Verileri silmek istiyor musun
@@ -195,6 +195,11 @@
Hata! paylaşılıyor
Veri kaydedilmedi. İlerlemek
+ Veri başarıyla indirildi
+ Kaydedilen veriler kaybolacak - Devam etmek istiyor musunuz?
+ Veri yok
+ Lütfen verileri indirin
+
İptal etmek
Boş
@@ -206,6 +211,7 @@
Promosyon değerini seçin
Seçiniz
+
diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml
index 6a4fd5e..c7d65c6 100644
--- a/GSKMTOrange/src/main/res/values/strings.xml
+++ b/GSKMTOrange/src/main/res/values/strings.xml
@@ -101,7 +101,7 @@
Store Already Uploaded
Store Data Uploaded
Store Already Checkout
- Please Store data again Uploaded
+ Please Upload data again
Store Closed
Store Already Closed
@@ -148,9 +148,9 @@
Photo
Additional Visibility
- Do You Want To Save
+ Are you sure You Want To Save
Please Add Data
- Do You Want To Add
+ Are you sure You Want To Add
Do You Want To Delete Data
store
Do You Want To Delete
@@ -181,7 +181,7 @@
Please click image
Please fill SKU data
Please fill GAP data
- Want to proceed usaved data will be deleted
+ Want to proceed unsaved data will be deleted
Downloading Data
Store Visited
@@ -233,6 +233,10 @@
Error Uploading
+ Saved data will be lost - Do you want to continue?
+ No data available
+ Please download data
+
Empty
Faceup can not be greater than stock value
@@ -244,4 +248,5 @@
+