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

Merge branch 'master' into GG_MappingPlanogram_DialogDisplay

Browse Source
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-13 16:02:04 +05:30
committed by GitHub
parent c10d401354 8f9c86d368
commit cb53b7acf5
52 changed files with 1433 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/drawable/toggle_green.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

GSKMTOrange/src/main/res/drawable/toggle_grey.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

GSKMTOrange/src/main/res/drawable/toggle_selector_background.xml
+2 -2
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="false" android:drawable="@color/grey_background" />
<item android:state_checked="true" android:drawable="@color/green" />
<item android:state_checked="false" android:drawable="@drawable/toggle_grey" />
<item android:state_checked="true" android:drawable="@drawable/toggle_green" />
</selector>
GSKMTOrange/src/main/res/layout/activity_login.xml
+5 -82
View File
@@ -1,80 +1,3 @@
<!--<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="cpm.com.gskmtorange.LoginActivity">
&lt;!&ndash; Login progress &ndash;&gt;
<ProgressBar
android:id="@+id/login_progress"
style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:visibility="gone" />
<ScrollView
android:id="@+id/login_form"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/email_login_form"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<AutoCompleteTextView
android:id="@+id/userid"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_userid"
android:inputType="textEmailAddress"
android:maxLines="1"
android:singleLine="true" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_password"
android:imeActionId="@+id/login"
android:imeActionLabel="@string/action_sign_in_short"
android:imeOptions="actionUnspecified"
android:inputType="textPassword"
android:maxLines="1"
android:singleLine="true" />
</android.support.design.widget.TextInputLayout>
<Button
android:id="@+id/user_login_button"
style="?android:textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/action_sign_in"
android:textStyle="bold" />
</LinearLayout>
</ScrollView>
</LinearLayout>-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
@@ -119,7 +42,7 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_height="45dp"
android:layout_centerInParent="true"
android:layout_gravity="center_vertical"
@@ -207,11 +130,11 @@
<ImageView
android:id="@+id/gsklogo"
android:layout_width="167dp"
android:layout_height="113dp"
android:layout_width="115dp"
android:layout_height="100dp"
android:layout_centerInParent="true"
android:background="@drawable/gsk_logo"></ImageView>
android:background="@drawable/gsklogo"></ImageView>
</RelativeLayout>
@@ -226,7 +149,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="Version"
android:text="Version/Versiyon"
android:textSize="@dimen/text_size_normal" />
</RelativeLayout>
GSKMTOrange/src/main/res/layout/activity_splash_screen.xml
+3 -3
View File
@@ -34,10 +34,10 @@
<ImageView
android:id="@+id/logo"
android:layout_width="300dp"
android:layout_height="204dp"
android:layout_width="153dp"
android:layout_height="133dp"
android:layout_centerHorizontal="true"
android:background="@drawable/gsk_logo" />
android:background="@drawable/gsklogo" />
</RelativeLayout>
GSKMTOrange/src/main/res/layout/activity_storeimage.xml
-1
View File
@@ -24,5 +24,4 @@
<include layout="@layout/contentstoreimage" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/content_daily_main_menu.xml
+1 -1
View File
@@ -21,7 +21,7 @@
android:paddingBottom="10dp"
android:paddingLeft="20dp"
android:paddingTop="10dp"
android:text="Daily Data Menu"
android:text="@string/daily_activity_menu"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black"
android:visibility="gone"/>
GSKMTOrange/src/main/res/layout/content_main.xml
+4 -3
View File
@@ -49,11 +49,12 @@
<ImageView
android:id="@+id/img_main"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_width="153dp"
android:layout_height="133dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:src="@drawable/gsk_logo"
android:src="@drawable/gsklogo"
android:layout_centerInParent="true"
/>
<WebView
GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
+4 -1
View File
@@ -13,7 +13,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
<TextView
android:id="@+id/txt_promoComplianceName"
GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml
+3 -2
View File
@@ -62,7 +62,8 @@
android:id="@+id/btntoggle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textOn="Yes"
android:textOff="No"
android:layout_weight=".5" />
</LinearLayout>
@@ -219,7 +220,7 @@
<android.support.v7.widget.CardView
android:id="@+id/cardviewid"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="10dp"
GSKMTOrange/src/main/res/layout/contentstoreimage.xml
+2 -2
View File
@@ -24,7 +24,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Click Store Front Image"
android:text="@string/store_image"
android:textSize="@dimen/store_entry_text_size"
android:layout_centerInParent="true"
android:textColor="@color/white"
@@ -79,7 +79,7 @@
android:id="@+id/img_cam_selfie"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/camera_icon_done"
android:background="@mipmap/camera_orange"
android:layout_centerInParent="true"
/>
GSKMTOrange/src/main/res/layout/custom_dialog_progress.xml
+1 -1
View File
@@ -28,7 +28,7 @@
android:layout_alignParentLeft="true"
android:layout_marginTop="15dp"
android:paddingLeft="5dp"
android:text="Downloading Data"
android:text="@string/download_data"
android:textSize="@dimen/text_size_normal"
android:paddingBottom="20dp"
android:textColor="@color/white"
GSKMTOrange/src/main/res/layout/dialogbox.xml
+3 -3
View File
@@ -9,7 +9,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Store Visited"
android:text="@string/store_visited"
android:textColor="@color/black"
android:textSize="25sp" />
@@ -28,7 +28,7 @@
android:id="@+id/yes"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Yes"
android:text="@string/yes"
android:textColor="#000000"
android:background="@color/colorPrimary"/>
@@ -42,7 +42,7 @@
android:id="@+id/no"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="No"
android:text="@string/no"
android:textColor="#000000"
android:background="@color/colorPrimary"/>
</RadioGroup>
GSKMTOrange/src/main/res/layout/gap_checklist_item.xml
+2 -2
View File
@@ -46,8 +46,8 @@
android:id="@+id/btn_is_present"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textOn="Yes"
android:textOff="No"
android:textOn="@string/yes"
android:textOff="@string/no"
android:background="@drawable/toggle_selector_background"
android:layout_centerInParent="true"/>
GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml
+1 -1
View File
@@ -91,7 +91,7 @@
<ToggleButton
android:id="@+id/toggle_available"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="70dp"
android:layout_gravity="center"
android:background="@drawable/toggle_selector_background"
android:textOff="@string/no"
GSKMTOrange/src/main/res/layout/nav_header_main.xml
+1 -1
View File
@@ -24,7 +24,7 @@
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="5dp"
android:src="@drawable/gsk_logo" />
android:src="@drawable/gsklogo" />
<TextView
android:id="@+id/nav_user_name"
GSKMTOrange/src/main/res/layout/nonworking.xml
+1 -1
View File
@@ -41,7 +41,7 @@
android:layout_alignParentLeft="true"
android:layout_marginLeft="3sp"
android:layout_marginTop="20dp"
android:text="Reason"
android:text=""
android:textColor="@color/colorPrimary"
android:textSize="18sp"
android:textStyle="bold" />
GSKMTOrange/src/main/res/layout/t2p_item_layout.xml
+8 -6
View File
@@ -91,8 +91,8 @@
android:id="@+id/toggle_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textOn="Yes"
android:textOff="No"
android:textOn="@string/yes"
android:textOff="@string/no"
android:background="@drawable/toggle_selector_background"
android:layout_centerInParent="true"/>
@@ -127,9 +127,10 @@
android:layout_height="50dp"
android:text="@string/image"
android:layout_weight="1"
android:layout_centerInParent="true"
android:background="@drawable/cam_active"
android:padding="@dimen/custom_margin"/>
android:background="@mipmap/camera_orange"
android:padding="@dimen/custom_margin"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />
</RelativeLayout>
@@ -137,7 +138,8 @@
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
android:layout_weight="1"
android:visibility="gone">
<ImageView
android:id="@+id/img_remark"
GSKMTOrange/src/main/res/layout/t2p_sku_dialog_layout.xml
+27 -27
View File
@@ -147,34 +147,34 @@
</android.support.v7.widget.CardView>
<!-- <android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:padding="10dp"
card_view:cardBackgroundColor="@color/colorOrange"
card_view:cardCornerRadius="20dp"
<!-- <android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:padding="10dp"
card_view:cardBackgroundColor="@color/colorOrange"
card_view:cardCornerRadius="20dp"
>
<LinearLayout
android:id="@+id/list_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="95"
android:visibility="gone"
>
>
<LinearLayout
android:id="@+id/list_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="95"
android:visibility="gone"
>
<ListView
android:id="@+id/lv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:cacheColorHint="#00000000"
<ListView
android:id="@+id/lv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:cacheColorHint="#00000000"
android:choiceMode="singleChoice"
android:divider="#ff9933"
android:dividerHeight="2dp"
android:fastScrollEnabled="true"
android:smoothScrollbar="true"></ListView>
</LinearLayout>
</android.support.v7.widget.CardView>-->
android:choiceMode="singleChoice"
android:divider="#ff9933"
android:dividerHeight="2dp"
android:fastScrollEnabled="true"
android:smoothScrollbar="true"></ListView>
</LinearLayout>
</android.support.v7.widget.CardView>-->
</LinearLayout>
GSKMTOrange/src/main/res/menu/activity_main_drawer.xml
+7 -11
View File
@@ -4,28 +4,24 @@
<group android:checkableBehavior="single">
<item
android:id="@+id/nav_route_plan"
android:icon="@drawable/ic_menu_gallery"
android:icon="@mipmap/entry_grey"
android:title="@string/menu_daily_route_plan" />
<item
android:id="@+id/nav_download"
android:icon="@drawable/ic_menu_slideshow"
android:icon="@mipmap/download_grey"
android:title="@string/menu_daily_download" />
<item
android:id="@+id/nav_upload"
android:icon="@drawable/ic_menu_manage"
android:icon="@mipmap/upload_grey"
android:title="@string/menu_upload_data" />
<item
android:id="@+id/nav_geotag"
android:icon="@drawable/ic_menu_manage"
android:icon="@mipmap/geotag_grey"
android:title="@string/menu_geotag" />
<item
android:id="@+id/nav_export"
android:icon="@drawable/ic_menu_share"
android:title="@string/menu_export" />
<item
android:id="@+id/nav_exit"
android:icon="@drawable/ic_menu_send"
android:icon="@mipmap/exit_grey"
android:title="@string/menu_exit" />
</group>
@@ -33,11 +29,11 @@
<menu>
<item
android:id="@+id/nav_setting"
android:icon="@drawable/ic_menu_manage"
android:icon="@mipmap/settings_grey"
android:title="@string/menu_setting" />
<item
android:id="@+id/nav_services"
android:icon="@drawable/ic_menu_send"
android:icon="@mipmap/services_grey"
android:title="@string/menu_services" />
</menu>
</item>
GSKMTOrange/src/main/res/mipmap-hdpi/download_grey.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/entry_grey.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/exit_grey.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/geotag_grey.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/services_grey.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/settings_grey.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/upload_grey.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

GSKMTOrange/src/main/res/values-tr/string.xml
+24 -6
View File
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="prompt_email">E-posta</string>
<string name="prompt_password">Şifre (isteğe bağlı)</string>
<string name="action_sign_in">Giriş yapın veya kayıt olun</string>
<string name="action_sign_in_short">oturum aç</string>
<string name="error_invalid_email">Bu e-posta adresi geçersiz</string>
<string name="error_invalid_password">Bu şifre çok kısa</string>
@@ -26,6 +24,7 @@
<string name="title_geo_tag_activity_upload_data">Store Uploaded</string>
<string name="title_geo_tag_activity_geo_data">Store Geo Data Uploaded</string>
<string name="title_geo_tag_activity_geo_already_done">Store Already Geotagged</string>
<string name="main_menu_activity_name">GSK Turuncu Mağaza</string>
<string name="save">Sakla</string>
@@ -38,7 +37,7 @@
<string name="present">Teşhir var mı?</string>
<string name="add">Ekle</string>
<string name="select">Seç</string>
<string name="select">Seçiniz</string>
<string name="title_activity_t2_pcompliance">Kalıcı Teşhir</string>
@@ -46,6 +45,17 @@
<string name="no">Hayır</string>
<string name="title_activity_upload">Veri Paylaş</string>
<string name="download_data">Veri Indir</string>
<string name="store_visited">Mağaza ziyaret edildi mi?</string>
<string name="store_image">Mağaza girişinin fotoğrafını çekiniz</string>
<string name="title_activity_store_image">Mağaza Girişi Fotoğrafı</string>
<string name="title_activity_Non_Work">Çalışmama Sebebi</string>
<string name="reason">Sebep</string>
<string name="select_reason">Bir sebep seçiniz</string>
<string name="daily_activity_menu">Günlük Veri Menüsü</string>
<string name="closed">kapalı</string>
<!--Gagan Start Code -->
<string name="title_activity_category_list">Kategoriler</string>
@@ -63,12 +73,12 @@
<string name="daily_data_menu_additional_promotions">Promosyon</string>
<string name="msl_availability_sku">Ürün Adı</string>
<string name="msl_availability_mbq">X</string>
<string name="msl_availability_mbq">MBQ</string>
<string name="msl_availability_availability">Bulunurluk</string>
<string name="stock_facing_reference_image">Örnek Fotoğraf</string>
<string name="stock_facing_sku_name">Ürün Adı</string>
<string name="stock_facing_stock">X</string>
<string name="stock_facing_stock">Stock</string>
<string name="stock_facing_faceup">Önyüz</string>
<string name="stock_facing_sos_target">Raf Payı Hedefi</string>
<string name="stock_facing_sos">Raf Payi</string>
@@ -101,4 +111,12 @@
<!--Gagan start new code 2-->
<string name="stock_facing_planogram_dialog_title">Planogram</string>
<!--Gagan end new code 2-->
</resources>
<string name="stock">Stock</string>
<string name="AdditionalDisplay">Ek Teşhir</string>
<string name="Display">Teşhir Türü</string>
<string name="Photo">Fotoğraf</string>
<string name="title_activity_Additional_visibility">Ek Teşhir</string>
</resources>
GSKMTOrange/src/main/res/values/strings.xml
+15 -5
View File
@@ -1,5 +1,6 @@
<resources>
<string name="app_name">GSKMTOrange</string>
<string name="app_name">GSK MT Orange</string>
<string name="main_menu_activity_name">GSK Orange Stores</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
@@ -9,9 +10,9 @@
<!-- Strings related to login -->
<string name="prompt_email">E Mail</string>
<string name="prompt_userid">User Id</string>
<string name="prompt_password">Password</string>
<string name="action_sign_in">Login</string>
<string name="prompt_userid">Username/Kullanıcı Adı</string>
<string name="prompt_password">Password/Şifre</string>
<string name="action_sign_in">Login/Giriş Yap</string>
<string name="action_sign_in_short">Sign in</string>
<string name="error_invalid_email">This email address is invalid</string>
<string name="error_invalid_password">This password is too short</string>
@@ -140,7 +141,7 @@
<string name="Display">Display</string>
<string name="Photo">Photo</string>
<string name="title_activity_Additional_visibility">Additional Visibility</string>
<string name="title_activity_Non_Work">Non-Work Reason</string>
<string name="title_activity_Non_Work">Non Working Reason</string>
<string name="closed">Close</string>
<string name="click_image">Please click image</string>
@@ -148,6 +149,15 @@
<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="download_data">Downloading Data</string>
<string name="store_visited">Store Visited</string>
<string name="store_image">Click Store Front Image</string>
<string name="title_activity_store_image">Store Front Image</string>
<string name="reason">Reason</string>
<string name="select_reason">Select Reason</string>
<string name="daily_activity_menu">Daily Data Menu</string>
<!--Gagan start new code 2-->
<string name="stock_facing_planogram_dialog_title">Planogram</string>