diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 992c541..213644a 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -14,8 +14,8 @@ android { applicationId "cpm.com.gskmtorange" minSdkVersion 15 targetSdkVersion 22 - versionCode 1 - versionName "1.0" + versionCode 2 + versionName "1.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java index e8909fc..9ae5d11 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java @@ -105,7 +105,7 @@ public class CheckoutActivity extends AppCompatActivity { dialog = new Dialog(context); dialog.setContentView(R.layout.custom); - dialog.setTitle("Sending Checkout Data"); + dialog.setTitle(getString(R.string.title_activity_checkout)); dialog.setCancelable(false); dialog.show(); pb = (ProgressBar) dialog.findViewById(R.id.progressBar1); 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 10871b5..270f5bf 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -13,6 +13,7 @@ import android.os.AsyncTask; import android.preference.PreferenceManager; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.support.v7.widget.Toolbar; import android.view.WindowManager; import android.widget.ProgressBar; import android.widget.TextView; @@ -79,10 +80,13 @@ public class UploadActivity extends AppCompatActivity { private int factor, k = 0; Object result = ""; + Toolbar toolbar; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_upload); + setContentView(R.layout.activity_main); + toolbar = (Toolbar) findViewById(R.id.toolbar); getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); @@ -199,7 +203,7 @@ public class UploadActivity extends AppCompatActivity { super.onPreExecute(); dialog = new Dialog(context); dialog.setContentView(R.layout.custom); - dialog.setTitle("Uploading Data"); + dialog.setTitle(getString(R.string.uploaddata)); dialog.setCancelable(false); dialog.show(); @@ -342,7 +346,7 @@ public class UploadActivity extends AppCompatActivity { } } data.value = 10; - data.name = "MSL_Availability Uploading"; + data.name = getString(R.string.availability_data_uploading); publishProgress(data); @@ -467,7 +471,7 @@ public class UploadActivity extends AppCompatActivity { } } data.value = 20; - data.name = "Stock Facing Uploading"; + data.name = getString(R.string.stock_data_uploading); publishProgress(data); @@ -526,7 +530,7 @@ public class UploadActivity extends AppCompatActivity { } } data.value = 30; - data.name = "Promotion Data Uploading"; + data.name = getString(R.string.promo_data_uploading); publishProgress(data); @@ -585,7 +589,7 @@ public class UploadActivity extends AppCompatActivity { } } data.value = 35; - data.name = "Additional Promotion Data Uploading"; + data.name = getString(R.string.additional_data_uploading); publishProgress(data); @@ -700,9 +704,8 @@ public class UploadActivity extends AppCompatActivity { } } - data.value = 35; - data.name = "Additional Visibility Data"; + data.name = getString(R.string.additional_data_uploading); publishProgress(data); /////ashish close @@ -845,7 +848,7 @@ public class UploadActivity extends AppCompatActivity { } data.value = 40; - data.name = "T2P Data Uploading"; + data.name = getString(R.string.t2p_data_uploading); publishProgress(data); //Image Upload @@ -1069,6 +1072,7 @@ public class UploadActivity extends AppCompatActivity { protected void onResume() { super.onResume(); updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); + toolbar.setTitle(getString(R.string.title_activity_upload)); } diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 0acbfa3..cd8faa3 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -216,6 +216,16 @@ Seçiniz + //text for uploading screen + + Kapsam yükleniyor + Bulunurluk verisi paylaşılıyor + Stok verisi paylaşılıyor + Kalıcı teşhir verisi paylaşılıyor + Ek teşhir verisi paylaşılıyor + Promosyon verisi paylaşılıyor + Yükleme İçin Veri Yok + Çıkış yapmak diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 20e6089..f216113 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -209,7 +209,7 @@ Hello blank fragment - CheckoutActivity + Checkout Activity Checkout Success Network Error , @@ -251,5 +251,13 @@ Select + + //text for uploading screen + Coverage Uploading + Availability Data Uploading + Stock Data Uploading + T2P Data Uploading + Additional Visibility Data Uploading + Promo Data Uploading