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

Merge pull request #87 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/saturdayNEWAC

Browse Source 
Saturday newac
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-21 13:40:15 +05:30
committed by GitHub
parent 25343167d4 12ef109266
commit 5311a76b6d
15 changed files with 56 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
+3 -3
View File
@@ -473,7 +473,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
break;
}
} else {
if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) {
if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) {
defaultCameraPackage = list.get(n).packageName;
break;
}
@@ -565,7 +565,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
dialog = new Dialog(context);
dialog.setContentView(R.layout.custom);
dialog.setTitle(getResources().getString(R.string.uploaddata));
dialog.setTitle(getResources().getString(R.string.dialog_title));
dialog.setCancelable(false);
dialog.show();
pb = (ProgressBar) dialog.findViewById(R.id.progressBar1);
@@ -776,7 +776,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
dialog = new Dialog(context);
dialog.setContentView(R.layout.custom);
dialog.setTitle(getResources().getString(R.string.uploadimge));
dialog.setTitle(getResources().getString(R.string.dialog_title));
dialog.setCancelable(false);
dialog.show();
pb = (ProgressBar) dialog.findViewById(R.id.progressBar1);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/SplashScreenActivity.java
+1 -1
View File
@@ -24,7 +24,7 @@ public class SplashScreenActivity extends AppCompatActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_splash_screen);
setContentView(R.layout.activity_splash_main_layout);
StartAnimations();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+1 -1
View File
@@ -952,7 +952,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
break;
}
} else {
if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) {
if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) {
defaultCameraPackage = list.get(n).packageName;
break;
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
+1 -1
View File
@@ -215,7 +215,7 @@ public class NonWorkingReason extends AppCompatActivity implements
break;
}
} else {
if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) {
if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) {
defaultCameraPackage = list.get(n).packageName;
break;
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+5 -2
View File
@@ -430,7 +430,10 @@ public class StoreListActivity extends AppCompatActivity {
address = (TextView) itemView.findViewById(R.id.storelistviewxml_storeaddress);
relativelayout = (RelativeLayout) itemView.findViewById(R.id.storenamelistview_layout);
imageview = (ImageView) itemView.findViewById(R.id.imageView2);
//imageview = (ImageView) itemView.findViewById(R.id.imageView2);
imageview = (ImageView) itemView.findViewById(R.id.storelistviewxml_storeico);
chkbtn = (Button) itemView.findViewById(R.id.chkout);
Cardbtn = (CardView) itemView.findViewById(R.id.card_view);
@@ -482,7 +485,7 @@ public class StoreListActivity extends AppCompatActivity {
if (checkout_status.equals(CommonString.KEY_INVALID) || checkout_status.equals(CommonString.KEY_VALID)) {
AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this);
builder.setMessage(CommonString.DATA_DELETE_ALERT_MESSAGE)
builder.setMessage(R.string.DELETE_ALERT_MESSAGE)
.setCancelable(false)
.setPositiveButton(getResources().getString(R.string.yes),
new DialogInterface.OnClickListener() {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
+1 -1
View File
@@ -262,7 +262,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
break;
}
} else {
if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) {
if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) {
defaultCameraPackage = list.get(n).packageName;
break;
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+1 -1
View File
@@ -956,7 +956,7 @@ public class DownloadActivity extends AppCompatActivity {
AlertDialog.Builder builder = new AlertDialog.Builder(DownloadActivity.this);
builder.setTitle("Parinaam");
builder.setMessage(str).setCancelable(false)
.setPositiveButton("OK", new DialogInterface.OnClickListener() {
.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
/* Intent i = new Intent(activity, StorelistActivity.class);
GSKMTOrange/src/main/res/layout/activity_geo_tag.xml
+2 -2
View File
@@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_menu_save"
app:srcCompat="@drawable/save_icon"
app:backgroundTint="@color/colorAccent"
/>
@@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|left"
android:layout_margin="@dimen/fab_margin"
android:src="@android:drawable/ic_menu_camera"
android:src="@mipmap/camera_orange"
app:backgroundTint="@color/colorAccent"
/>
GSKMTOrange/src/main/res/layout/activity_splash_main_layout.xml
+18
View File
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="cpm.com.gskmtorange.SplashScreenActivity">
<include layout="@layout/activity_splash_screen" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml
+1 -1
View File
@@ -15,7 +15,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_menu_save"
app:srcCompat="@drawable/save_icon"
app:backgroundTint="@color/colorAccent"
/>
GSKMTOrange/src/main/res/layout/custom.xml
+1 -1
View File
@@ -35,7 +35,7 @@
android:layout_marginTop="15dp"
android:paddingBottom="20dp"
android:paddingLeft="5dp"
android:text="Uploading Data"
android:text="@string/uploaddata"
android:textSize="@dimen/text_size_small" />
<ProgressBar
GSKMTOrange/src/main/res/layout/storelist.xml
+3 -2
View File
@@ -50,6 +50,7 @@
android:weightSum="10"
android:visibility="gone"
>
<android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
@@ -67,7 +68,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="No data available"
android:text="@string/NodataAvailable"
android:textSize="25sp"
android:textStyle="bold" />
</android.support.v7.widget.CardView>
@@ -107,7 +108,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="Please download data"
android:text="@string/Pleasedownaloaddata"
android:textSize="25sp"
android:textStyle="bold" />
</android.support.v7.widget.CardView>
GSKMTOrange/src/main/res/layout/storeviewlist.xml
+1 -1
View File
@@ -34,7 +34,7 @@
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginRight="6sp"
android:background="@mipmap/store"
android:layout_marginTop="10dp"
android:paddingTop="25sp" />
GSKMTOrange/src/main/res/values-tr/string.xml
+8 -2
View File
@@ -118,9 +118,9 @@
<string name="select_language_item">Dil Seçimi</string>
<string name="title_activity_Want_save">Veriyi saklamak istiyor musunuz?</string>
<string name="title_activity_Want_save">Kaydetmek İstediğinizden Emin misiniz?</string>
<string name="title_activity_Want_add">Tüm alanlari doldurunuz</string>
<string name="title_activity_Want_to_add">Veri eklemek istiyor musun</string>
<string name="title_activity_Want_to_add">Eklemek İstediğinden Emin misin</string>
<string name="title_activity_Want_to_delete"> Verileri silmek istiyor musun</string>
<string name="store"> Mağazalar</string>
<string name="title_activity_Want_to_delete1"> Verileri silmek istiyor musun</string>
@@ -195,6 +195,11 @@
<string name="error">Hata! paylaşılıyor</string>
<string name="data_will_be_lost">Veri kaydedilmedi. İlerlemek</string>
<string name="data_downloaded_successfully">Veri başarıyla indirildi</string>
<string name="DELETE_ALERT_MESSAGE">Kaydedilen veriler kaybolacak - Devam etmek istiyor musunuz?</string>
<string name="NodataAvailable">Veri yok</string>
<string name="Pleasedownaloaddata">Lütfen verileri indirin</string>
<!--Gagan start code 3-->
<string name="cancel">İptal etmek</string>
<string name="empty">Boş</string>
@@ -206,6 +211,7 @@
<string name="select_promo_value">Promosyon değerini seçin</string>
<string name="select_promo">Seçiniz</string>
<!--Gagan end code 3-->
</resources>
GSKMTOrange/src/main/res/values/strings.xml
+9 -4
View File
@@ -101,7 +101,7 @@
<string name="title_store_list_activity_store_already_done">Store Already Uploaded</string>
<string name="title_store_list_activity_store_data_uploaded">Store Data Uploaded</string>
<string name="title_store_list_activity_store_already_checkout">Store Already Checkout</string>
<string name="title_store_list_activity_store_again_uploaded">Please Store data again Uploaded</string>
<string name="title_store_list_activity_store_again_uploaded">Please Upload data again</string>
<string name="title_store_list_activity_store_closed">Store Closed</string>
<string name="title_store_list_activity_already_store_closed">Store Already Closed</string>
@@ -148,9 +148,9 @@
<string name="Photo">Photo</string>
<string name="title_activity_Additional_visibility">Additional Visibility</string>
<string name="title_activity_Want_save"> Do You Want To Save</string>
<string name="title_activity_Want_save"> Are you sure You Want To Save</string>
<string name="title_activity_Want_add"> Please Add Data</string>
<string name="title_activity_Want_to_add">Do You Want To Add</string>
<string name="title_activity_Want_to_add">Are you sure You Want To Add</string>
<string name="title_activity_Want_to_delete"> Do You Want To Delete Data</string>
<string name="store"> store</string>
<string name="title_activity_Want_to_delete1"> Do You Want To Delete</string>
@@ -181,7 +181,7 @@
<string name="click_image">Please click image</string>
<string name="fill_sku_data">Please fill SKU data</string>
<string name="fill_gaps_data">Please fill GAP data</string>
<string name="data_will_be_lost">Want to proceed usaved data will be deleted</string>
<string name="data_will_be_lost">Want to proceed unsaved data will be deleted</string>
<string name="download_data">Downloading Data</string>
<string name="store_visited">Store Visited</string>
@@ -233,6 +233,10 @@
<string name="error">Error Uploading</string>
<string name="DELETE_ALERT_MESSAGE">Saved data will be lost - Do you want to continue?</string>
<string name="NodataAvailable">No data available</string>
<string name="Pleasedownaloaddata">Please download data</string>
<!--Gagan start code 3-->
<string name="empty">Empty</string>
<string name="check_faceup">Faceup can not be greater than stock value</string>
@@ -244,4 +248,5 @@
<!--Gagan end code 3-->
</resources>