From f4a8b065ea92386059472d7c61b3ada1b203214b Mon Sep 17 00:00:00 2001
From: ashishandroid <ashish004.2009@gmail.com>
Date: Wed, 18 Jan 2017 15:40:45 +0530
Subject: [PATCH 1/2] newcode

---
 GSKMTOrange/src/main/AndroidManifest.xml             |  4 ++--
 .../cpm/com/gskmtorange/GeoTag/GeoTagActivity.java   | 12 ++++++++++--
 .../com/gskmtorange/dailyentry/NonWorkingReason.java |  2 +-
 .../cpm/com/gskmtorange/messgae/AlertMessage.java    |  1 -
 GSKMTOrange/src/main/res/layout/nonworking.xml       |  4 ++--
 GSKMTOrange/src/main/res/values-tr/string.xml        | 12 +++++++++---
 GSKMTOrange/src/main/res/values/strings.xml          |  4 +++-
 7 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml
index 5543158..9d8b764 100644
--- a/GSKMTOrange/src/main/AndroidManifest.xml
+++ b/GSKMTOrange/src/main/AndroidManifest.xml
@@ -49,12 +49,12 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".GeoTag.GeoTagStoreList"
-            android:label="@string/title_activity_store_list_geotag"
+            android:label="@string/title_activity_store_list"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".dailyentry.StoreListActivity"
-            android:label="@string/title_activity_store_list_geotag"
+            android:label="@string/title_activity_store_list"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
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 73213c6..6c1fa7f 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
@@ -719,13 +719,13 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
 
                 new GeoTagImageUpload(GeoTagActivity.this).execute();
 
-               /* Intent intent = new Intent(
+                Intent intent = new Intent(
                         GeoTagActivity.this,
                         GeoTagStoreList.class);
 
                 startActivity(intent);
 
-                GeoTagActivity.this.finish();*/
+                GeoTagActivity.this.finish();
 
             }
             else if(!result.equals(CommonString.KEY_SUCCESS))
@@ -888,6 +888,14 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
                         + result, getResources().getString(R.string.success), null);
                 message.showMessage();
 
+                Intent intent = new Intent(
+                        GeoTagActivity.this,
+                        GeoTagStoreList.class);
+
+                startActivity(intent);
+
+                GeoTagActivity.this.finish();
+
 
             }
             else if(!result.equals(CommonString.KEY_SUCCESS))
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 7797fbd..b9f39ec 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
@@ -435,7 +435,7 @@ public class NonWorkingReason extends AppCompatActivity implements
                         alert.show();
 
                     } else {
-                        Toast.makeText(getApplicationContext(), R.string.title_activity_select_dropdown,
+                        Toast.makeText(getApplicationContext(), R.string.pleaseenterRemarks,
                                 Toast.LENGTH_SHORT).show();
                     }
                 } else {
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/messgae/AlertMessage.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/messgae/AlertMessage.java
index 3ca2f7d..be9b4da 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/messgae/AlertMessage.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/messgae/AlertMessage.java
@@ -58,7 +58,6 @@ public class AlertMessage {
          }
 
 
-
     }
 
     public void ShowAlert1(String str) {
diff --git a/GSKMTOrange/src/main/res/layout/nonworking.xml b/GSKMTOrange/src/main/res/layout/nonworking.xml
index 40e9007..34874d3 100644
--- a/GSKMTOrange/src/main/res/layout/nonworking.xml
+++ b/GSKMTOrange/src/main/res/layout/nonworking.xml
@@ -92,7 +92,7 @@
             android:layout_above="@+id/reasontxt"
 
             android:paddingLeft="10dp"
-            android:text="Remark"
+            android:text="@string/Remark"
             android:textColor="@color/colorPrimary"
             android:textSize="18sp"
             android:textStyle="bold" />
@@ -120,7 +120,7 @@
             android:layout_height="40sp"
             android:layout_centerInParent="true"
             android:background="@color/colorPrimary"
-            android:text="SAVE"
+            android:text="@string/save"
             android:textColor="#ffffff"
             android:textSize="17sp" />
     </RelativeLayout>
diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml
index 93cf68e..5256dbf 100644
--- a/GSKMTOrange/src/main/res/values-tr/string.xml
+++ b/GSKMTOrange/src/main/res/values-tr/string.xml
@@ -161,10 +161,16 @@
     <string name="uploadeddata">Veriler Paylaşılıyor ,</string>
     <string name="DataNot">Veriler Paylaşılmadı ,</string>
     <string name="delete">Sil</string>
-    <string name="adddatatoclick">Click Yes To Add Data</string>
+    <string name="adddatatoclick">Veri Eklemek İçin Evet tıklayın</string>
     <string name="displayname">Teşhir Türü</string>
-
-
+    <string name="storefront">Click Store Front Image</string>
+    <string name="brandname">Brand Name</string>
+    <string name="skuname">SKU Name</string>
+    <string name="quantity">Teşhir Sayısı</string>
+    <string name="title_activity_store_geotag">Coğrafi Konum</string>
+    <string name="title_activity_store_list">Store List</string>
+    <string name="Remark">Remark</string>
+    <string name="pleaseenterRemarks">Please fill Remark</string>
 
 </resources>
 
diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml
index e25072c..16b7bb4 100644
--- a/GSKMTOrange/src/main/res/values/strings.xml
+++ b/GSKMTOrange/src/main/res/values/strings.xml
@@ -50,7 +50,7 @@
     <string name="select_language">Please select language</string>
     <string name="title_activity_select_language">Select Language</string>
 
-    <string name="title_activity_store_list_geotag">Store List</string>
+    <string name="title_activity_store_list">Store List</string>
 
     <string name="title_activity_store_geotag">Geo Tag</string>
 
@@ -218,6 +218,8 @@
     <string name="DataNot"> Data Not Uploaded ,</string>
     <string name="displayname">Display Name</string>
     <string name="adddatatoclick">Click Yes To Add Data</string>
+    <string name="Remark">Remark</string>
+    <string name="pleaseenterRemarks">Please fill Remark</string>
 
 
 </resources>

From e7ca0ef7a5d2c93f57528b755b4d9cabb0f12589 Mon Sep 17 00:00:00 2001
From: ashishandroid <ashish004.2009@gmail.com>
Date: Wed, 18 Jan 2017 16:09:42 +0530
Subject: [PATCH 2/2] newcode

---
 .../gskmtorange/GeoTag/GeoTagActivity.java    | 50 ++++++++++++++++---
 1 file changed, 44 insertions(+), 6 deletions(-)

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 6c1fa7f..0a2e278 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
@@ -694,12 +694,25 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
 
             } catch (SocketException ex) {
                 ex.printStackTrace();
+                Intent intent = new Intent(
+                        GeoTagActivity.this,
+                        GeoTagStoreList.class);
 
+                startActivity(intent);
+
+                GeoTagActivity.this.finish();
 
             } catch (Exception ex) {
 
 
                 ex.printStackTrace();
+                Intent intent = new Intent(
+                        GeoTagActivity.this,
+                        GeoTagStoreList.class);
+
+                startActivity(intent);
+
+                GeoTagActivity.this.finish();
             }
 
 
@@ -719,13 +732,13 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
 
                 new GeoTagImageUpload(GeoTagActivity.this).execute();
 
-                Intent intent = new Intent(
+              /*  Intent intent = new Intent(
                         GeoTagActivity.this,
                         GeoTagStoreList.class);
 
                 startActivity(intent);
 
-                GeoTagActivity.this.finish();
+                GeoTagActivity.this.finish();*/
 
             }
             else if(!result.equals(CommonString.KEY_SUCCESS))
@@ -843,11 +856,29 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
             catch (SocketException ex) {
 
                 ex.printStackTrace();
+
+                Intent intent = new Intent(
+                        GeoTagActivity.this,
+                        GeoTagStoreList.class);
+
+                startActivity(intent);
+
+                GeoTagActivity.this.finish();
+
             }
 
             catch (Exception ex) {
                 ex.printStackTrace();
 
+
+                Intent intent = new Intent(
+                        GeoTagActivity.this,
+                        GeoTagStoreList.class);
+
+                startActivity(intent);
+
+                GeoTagActivity.this.finish();
+
             }
 
             return "";
@@ -883,10 +914,10 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
 
 
 
-                AlertMessage message = new AlertMessage(
+               /* AlertMessage message = new AlertMessage(
                         GeoTagActivity.this, getResources().getString(R.string.uploadeddata)
                         + result, getResources().getString(R.string.success), null);
-                message.showMessage();
+                message.showMessage();*/
 
                 Intent intent = new Intent(
                         GeoTagActivity.this,
@@ -896,17 +927,24 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
 
                 GeoTagActivity.this.finish();
 
+            Toast.makeText(getApplicationContext(),getResources().getString(R.string.success),Toast.LENGTH_LONG).show();
 
             }
             else if(!result.equals(CommonString.KEY_SUCCESS))
             {
 
-                AlertMessage message = new AlertMessage(
+               /* AlertMessage message = new AlertMessage(
                         GeoTagActivity.this, AlertMessage.MESSAGE_DATA_NOT
                         + result, getResources().getString(R.string.failure), null);
-                message.showMessage();
+                message.showMessage();*/
+                Toast.makeText(getApplicationContext(),getResources().getString(R.string.failure),Toast.LENGTH_LONG).show();
+                Intent intent = new Intent(
+                        GeoTagActivity.this,
+                        GeoTagStoreList.class);
 
+                startActivity(intent);
 
+                GeoTagActivity.this.finish();
             }