From 87f30fa116d982ec0586450cb7c62330a8253b50 Mon Sep 17 00:00:00 2001 From: yadavendras Date: Tue, 24 Jan 2017 12:23:35 +0530 Subject: [PATCH 1/3] turkish --- .idea/misc.xml | 2 +- .idea/modules.xml | 2 ++ .../main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java | 2 +- .../gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java | 6 +++--- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index b8dc4d6..b15ecee 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -41,7 +41,7 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index ad566b9..a329b11 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,6 +3,8 @@ + + diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index 080b8cb..f6a861b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -3319,7 +3319,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return filled; } - public boolean isMappingT2PData() { + public boolean isMappingT2PData(String store_id, String categoryId) { boolean filled = false; Cursor dbcursor = null; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java index 622d558..e5d7227 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java @@ -135,7 +135,7 @@ public class DailyDataMenuActivity extends AppCompatActivity { data = new DailyDataMenuGetterSetter(); data.setCategory_name(getResources().getString(R.string.daily_data_menu_t2p)); - if (db.isMappingT2PData()) { + if (db.isMappingT2PData(store_id, categoryId)) { if (db.isFilledT2P(store_id, categoryId)) { data.setCategory_img(R.mipmap.t2p_compliance_done); } else { @@ -266,7 +266,7 @@ public class DailyDataMenuActivity extends AppCompatActivity { holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background)); } } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_t2p)))) { - if (db.isMappingT2PData()) { + if (db.isMappingT2PData(store_id, categoryId)) { holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); } else { holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background)); @@ -299,7 +299,7 @@ public class DailyDataMenuActivity extends AppCompatActivity { startActivity(intent); } } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_t2p)))) { - if (db.isMappingT2PData()) { + if (db.isMappingT2PData(store_id, categoryId)) { Intent intent = new Intent(DailyDataMenuActivity.this, T2PComplianceActivity.class); intent.putExtra("categoryName", dailyData.getCategory_name()); intent.putExtra("categoryId", categoryId); From c5efee08d64702d0bb6654836f820e2330013a9a Mon Sep 17 00:00:00 2001 From: yadavendras Date: Tue, 24 Jan 2017 17:28:56 +0530 Subject: [PATCH 2/3] 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 | 4 ++-- .../dailyentry/CheckoutActivity.java | 2 +- .../gskmtorange/upload/UploadActivity.java | 22 +++++++++++-------- GSKMTOrange/src/main/res/values-tr/string.xml | 10 +++++++++ GSKMTOrange/src/main/res/values/strings.xml | 10 ++++++++- 5 files changed, 35 insertions(+), 13 deletions(-) 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 From 16bdac6be1f57c8e8f5118732b9458c41d7f6394 Mon Sep 17 00:00:00 2001 From: yadavendras Date: Wed, 25 Jan 2017 10:47:58 +0530 Subject: [PATCH 3/3] 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 --- .idea/modules.xml | 2 -- GSKMTOrange/src/main/AndroidManifest.xml | 1 + .../src/main/java/cpm/com/gskmtorange/MainActivity.java | 6 ++++-- .../com/gskmtorange/upload/PreviousDataUploadActivity.java | 3 +-- .../java/cpm/com/gskmtorange/upload/UploadActivity.java | 3 +-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.idea/modules.xml b/.idea/modules.xml index a329b11..ad566b9 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,8 +3,6 @@ - - diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index d63a2dd..9a6bced 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -150,6 +150,7 @@ android:name=".upload.UploadActivity" android:configChanges="screenSize|orientation|keyboardHidden" android:label="@string/title_activity_upload" + android:theme="@style/AppTheme.NoActionBar" android:screenOrientation="portrait" />