Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into ysy_turk

# Conflicts:
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java

GSKMTOrange/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "cpm.com.gskmtorange"
         minSdkVersion 15
         targetSdkVersion 22
-        versionCode 2
+        versionCode 4
-        versionName "1.1"
+        versionName "1.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java

@@ -7,6 +7,8 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Environment;
@@ -24,6 +26,7 @@ import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.DecimalFormat;
+import java.util.Locale;
 
 import cpm.com.gskmtorange.LoginActivity;
 import cpm.com.gskmtorange.R;
@@ -43,6 +46,8 @@ public class AutoUpdateActivity extends AppCompatActivity {
     ProgressBar progressBar;
     private boolean status;
 
+    private SharedPreferences preferences;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -51,11 +56,15 @@ public class AutoUpdateActivity extends AppCompatActivity {
 
         path = intent.getStringExtra(CommonString.KEY_PATH);
 
+        preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+        updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle("Parinaam");
-        builder.setMessage("New Update Available.")
+        builder.setMessage(getString(R.string.new_update_available))
                 .setCancelable(false)
-                .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
 
                         SharedPreferences preferences = PreferenceManager
@@ -116,7 +125,7 @@ public class AutoUpdateActivity extends AppCompatActivity {
                 versionCode = getPackageManager().getPackageInfo(
                         getPackageName(), 0).versionName;
 
-                data.name = "Upgraditing Version : " + versionCode;
+                data.name = "Upgrading Version : " + versionCode;
                 publishProgress(data);
 
                 // download application
@@ -280,4 +289,29 @@ public class AutoUpdateActivity extends AppCompatActivity {
         alert.show();
     }
 
+    private static boolean updateResources(Context context, String language) {
+
+        String lang;
+
+        if (language.equalsIgnoreCase("English")) {
+            lang = "EN";
+        } else if (language.equalsIgnoreCase("UAE")) {
+            lang = "AR";
+        } else {
+            lang = "TR";
+        }
+
+        Locale locale = new Locale(lang);
+        Locale.setDefault(locale);
+
+        Resources resources = context.getResources();
+
+        Configuration configuration = resources.getConfiguration();
+        configuration.locale = locale;
+
+        resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+        return true;
+    }
+
 }

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

@@ -101,7 +101,9 @@ public class NonWorkingReason extends AppCompatActivity implements
 
         _UserId = preferences.getString(CommonString.KEY_USERNAME, "");
         visit_date = preferences.getString(CommonString.KEY_DATE, null);
-        store_id = preferences.getString(CommonString.KEY_STORE_ID, "");
+
+        store_id = getIntent().getStringExtra(CommonString.KEY_STORE_ID);
+        //store_id = preferences.getString(CommonString.KEY_STORE_ID, "");
 
         database = new GSKOrangeDB(this);
         database.open();

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

@@ -567,6 +567,7 @@ public class StoreListActivity extends AppCompatActivity {
 
 
                                                 Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class);
+                                                in.putExtra(CommonString.KEY_STORE_ID,current.getSTORE_ID());
                                                 startActivity(in);
 
                                             }
@@ -587,6 +588,7 @@ public class StoreListActivity extends AppCompatActivity {
 
 
                         Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class);
+                        in.putExtra(CommonString.KEY_STORE_ID,current.getSTORE_ID());
                         startActivity(in);
                     }
 

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

@@ -1033,6 +1033,7 @@ public class UploadActivity extends AppCompatActivity {
                     }
                 }
 
+                return result.toString();
 
             } catch (MalformedURLException e) {
                 e.printStackTrace();
@@ -1044,7 +1045,7 @@ public class UploadActivity extends AppCompatActivity {
                 e.printStackTrace();
             }
 
-            return result.toString();
+            return "";
         }
 
         @Override

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

@@ -228,15 +228,6 @@
     <string name="no_data_for_upload">Yükleme İçin Veri Yok</string>
     <string name="title_activity_checkout">Çıkış yapmak</string>
 
-
-    <string name="coverage_data_uploading">Kapsam yükleniyor</string>
-    <string name="availability_data_uploading">Bulunurluk verisi paylaşılıyor</string>
-    <string name="stock_data_uploading">Stok verisi paylaşılıyor</string>
-    <string name="t2p_data_uploading">Kalıcı teşhir verisi paylaşılıyor</string>
-    <string name="additional_data_uploading">Ek teşhir verisi paylaşılıyor</string>
-    <string name="promo_data_uploading">Promosyon verisi paylaşılıyor</string>
-    <string name="no_data_for_upload">Yükleme İçin Veri Yok</string>
-    <string name="title_activity_checkout">Çıkış yapmak</string>
     <string name="Areyou_sure_take_backup">Verilerinizin yedeğini almak istediğinizden emin misiniz</string>
     <string name="data_exported_successfully">Veritabanı Başarıyla Gönderildi</string>
     <string name="first_geotag_the_store">İlk depoyu coğrafi etiketle göster</string>
@@ -244,6 +235,7 @@
     <string name="fill_gaps_data">Lütfen GAP verilerini doldurun</string>
 
     <string name="enter_the_values">Değerleri girin</string>
+
 </resources>
 
 

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

@@ -264,5 +264,6 @@
 
     <string name="first_geotag_the_store">First geotag the store</string>
 
+    <string name="new_update_available">New Update Available \n\n Yeni güncelleme var</string>
 
 </resources>