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

Merge branch 'master' into ysy_camera

Browse Source
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-21 14:57:38 +05:30
committed by GitHub
parent f42be9e473 5311a76b6d
commit e286234be1
26 changed files with 359 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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/item_stock_facing_child.xml
+2 -2
View File
@@ -77,12 +77,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:hint="@string/stock_facing_stock"
android:inputType="number"
android:maxLength="7"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222"
android:textColorHint="#666" />
<!--android:hint="@string/stock_facing_stock"-->
</LinearLayout>
<LinearLayout
@@ -106,12 +106,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:hint="@string/stock_facing_faceup"
android:inputType="number"
android:maxLength="7"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222"
android:textColorHint="#666" />
<!--android:hint="@string/stock_facing_faceup"-->
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/item_stock_facing_header.xml
+1 -1
View File
@@ -46,7 +46,7 @@
android:layout_height="match_parent"
android:layout_weight=".6"
android:paddingRight="5dp"
android:text="@string/stock_facing_sos"
android:text="-"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
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
+21 -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,9 +195,28 @@
<string name="error">Hata! paylaşılıyor</string>
<string name="data_will_be_lost">Veri kaydedilmedi. İlerlemek</string>
<string name="gallery">Galeri</string>
<string name="camera">kamera</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>
<string name="check_faceup">Raf Payı, stoktan daha az veya eşit olmalıdır</string>
<string name="fill_stock_value">Önce stok değerini doldurun</string>
<string name="want_add">Verileri eklemek istiyor musunuz?</string>
<string name="promo_add">Promosyon eklendi</string>
<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
+20 -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,7 +233,23 @@
<string name="error">Error Uploading</string>
<string name="gallery">Gallery</string>
<string name="camera">Camera</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>
<string name="fill_stock_value">First fill the stock value</string>
<string name="want_add">Are you sure you want to add</string>
<string name="promo_add">promo is added</string>
<string name="select_promo_value">Select the promo value</string>
<string name="select_promo">Select</string>
<!--Gagan end code 3-->
</resources>