AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
This commit is contained in:
yadavendras
2017-01-24 17:28:56 +05:30
parent 38166663dd
commit c5efee08d6
5 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/build.gradle
+2 -2
View File
@@ -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 {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java
+1 -1
View File
@@ -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);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+13 -9
View File
@@ -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));
}
GSKMTOrange/src/main/res/values-tr/string.xml
+10
View File
@@ -216,6 +216,16 @@
<string name="select_promo">Seçiniz</string>
<!--Gagan end code 3-->
//text for uploading screen
<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>
</resources>
GSKMTOrange/src/main/res/values/strings.xml
+9 -1
View File
@@ -209,7 +209,7 @@
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="title_activity_checkout">CheckoutActivity</string>
<string name="title_activity_checkout">Checkout Activity</string>
<string name="checkout_successful">Checkout Success</string>
<string name="NetworkError">Network Error ,</string>
@@ -252,4 +252,12 @@
<!--Gagan end code 3-->
//text for uploading screen
<string name="coverage_data_uploading">Coverage Uploading</string>
<string name="availability_data_uploading">Availability Data Uploading</string>
<string name="stock_data_uploading">Stock Data Uploading</string>
<string name="t2p_data_uploading">T2P Data Uploading</string>
<string name="additional_data_uploading">Additional Visibility Data Uploading</string>
<string name="promo_data_uploading">Promo Data Uploading</string>
</resources>