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

Deepak_commit_31_05_2018

Browse Source
This commit is contained in:
yadavendras
2018-05-31 16:55:34 +05:30
parent 01df43b2b8
commit 2d25c22137
63 changed files with 3894 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/drawable/baseline_map_white_36dp.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 505 B

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

After

Width:  |  Height:  |  Size: 168 B

GSKMTOrange/src/main/res/layout/activity_pogquestions.xml
+34
View File
@@ -0,0 +1,34 @@
<?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=".dailyentry.POGQuestionsActivity">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_pogquestions" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@drawable/save_icon" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_store_list_map.xml
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<fragment xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:map="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/map"
android:name="com.google.android.gms.maps.SupportMapFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".storeinmap.StoreListMapActivity" />
GSKMTOrange/src/main/res/layout/activity_store_list_route.xml
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<fragment xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:map="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/map"
android:name="com.google.android.gms.maps.SupportMapFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".storeinmap.StoreListRouteActivity" />
GSKMTOrange/src/main/res/layout/activity_store_route.xml
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<fragment xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:map="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/map"
android:name="com.google.android.gms.maps.SupportMapFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".storeinmap.StoreRouteActivity" />
GSKMTOrange/src/main/res/layout/add_facing_custom_dialog.xml
+34 -1
View File
@@ -58,12 +58,45 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/placement"
android:padding="2dp"
android:textColor="@color/white"
android:textSize="@dimen/text_size_normal"
/>
<CheckBox
android:id="@+id/cb_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/vertical"
android:textColor="@color/white"
android:padding="1dp"
android:layout_marginLeft="10dp"/>
<CheckBox
android:id="@+id/cb_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/horizontal"
android:textColor="@color/white"
android:padding="1dp"
android:layout_marginLeft="10dp"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="5dp">
android:layout_marginBottom="5dp"
android:layout_marginTop="4dp">
<RelativeLayout
GSKMTOrange/src/main/res/layout/audit_question_list_item.xml
+24 -7
View File
@@ -66,13 +66,30 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/parent_cam_layout">
<ImageView
android:id="@+id/img_cam"
android:layout_width="50dp"
android:layout_height="50dp"
android:background="@mipmap/camera_orange"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
android:layout_alignParentRight="true">
<ImageView
android:id="@+id/img_cam2"
android:layout_width="50dp"
android:layout_height="50dp"
android:background="@mipmap/camera_orange"
android:visibility="gone"
android:layout_marginRight="10dp"/>
<ImageView
android:id="@+id/img_cam"
android:layout_width="50dp"
android:layout_height="50dp"
android:background="@mipmap/camera_orange"
android:layout_marginRight="10dp"/>
</LinearLayout>
</RelativeLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/brand_item.xml
+3 -3
View File
@@ -17,7 +17,7 @@
<LinearLayout
android:id="@+id/lin_child"
android:layout_width="80dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@@ -45,8 +45,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:textSize="14sp"
android:text="kdfkdfjk"
android:textSize="12sp"
android:text="kdfkdfjkhfdvhdgf"
android:gravity="center"
/>
GSKMTOrange/src/main/res/layout/content_no_camera_individual.xml
+2 -2
View File
@@ -14,7 +14,7 @@
android:id="@+id/rvTop"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="3.5" />
android:layout_weight="4" />
<View
android:layout_width="match_parent"
@@ -28,7 +28,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="6.5">
android:layout_weight="6">
<ScrollView
android:id="@+id/scroll_no_camera"
GSKMTOrange/src/main/res/layout/content_pogquestions.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context=".dailyentry.POGQuestionsActivity"
tools:showIn="@layout/activity_pogquestions">
<ExpandableListView
android:id="@+id/expandableListView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:cacheColorHint="#00000000"
android:divider="@null"
android:dividerHeight="0dp"
android:scrollingCache="false" />
</LinearLayout>
GSKMTOrange/src/main/res/layout/custom_spinner_item.xml
+3 -3
View File
@@ -7,12 +7,12 @@
android:background="@android:color/transparent"
>
<android.support.v7.widget.CardView
<!-- <android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
card_view:cardBackgroundColor="@color/white"
card_view:cardCornerRadius="10dp"
>
>-->
<LinearLayout
android:id="@+id/parent_layout"
@@ -38,7 +38,7 @@
</LinearLayout>
</android.support.v7.widget.CardView>
<!-- </android.support.v7.widget.CardView>-->
</LinearLayout>
GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_header.xml
+2 -1
View File
@@ -25,6 +25,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="25dp"
android:text="Brand Name "
android:padding="7dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
@@ -36,7 +37,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="30dp"
android:src="@drawable/ic_menu_camera"
android:visibility="invisible" />
android:visibility="gone" />
</RelativeLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/marker_view.xml
+31
View File
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="100dp"
android:layout_height="100dp"
android:orientation="vertical"
android:background="#00ffffff"
>
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:elevation="5dp"
android:layout_marginLeft="20dp">
<TextView
android:id="@+id/tv_desc"
android:text="test"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="2dp"
android:textColor="#000000"/>
</android.support.v7.widget.CardView>
<ImageView
android:src="@drawable/baseline_store_black_18dp"
android:layout_width="30dp"
android:layout_height="30dp"
/>
</LinearLayout>
GSKMTOrange/src/main/res/layout/pog_question.xml
+63
View File
@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="5dp"
android:layout_marginTop="5dp"
card_view:cardBackgroundColor="#ffffff"
card_view:cardCornerRadius="5dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:orientation="horizontal">
<TextView
android:id="@+id/txt_question"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingRight="20dp"
android:paddingTop="5dp"
android:text="Question"
android:textColor="@color/black"
android:textSize="16dip" />
</LinearLayout>
<LinearLayout
android:id="@+id/editTextlayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:orientation="horizontal"
>
<Spinner
android:id="@+id/sp_auditAnswer"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/storelist_child.xml
+124
View File
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/storenamelistview_layout">
<android.support.v7.widget.CardView
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_marginTop="2dp"
android:layout_weight="35"
card_view:cardBackgroundColor="@color/colorOrange"
card_view:cardCornerRadius="10dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="10">
<RelativeLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<ImageView
android:id="@+id/storelistviewxml_storeico"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:padding="10dp" />
</RelativeLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:layout_weight="6.8"
android:orientation="vertical">
<TextView
android:id="@+id/storelistviewxml_storename"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/storelistviewxml_storeico"
android:layout_toRightOf="@+id/storelistviewxml_storeico"
android:text="@string/GSKMT"
android:textColor="#1F3A6C"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/storelistviewxml_storeaddress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/storelistviewxml_storename"
android:layout_below="@+id/storelistviewxml_storename"
android:text="@string/address"
android:textColor="#666666"
android:textSize="10sp"
android:textStyle="normal" />
</LinearLayout>
<RelativeLayout
android:id="@+id/navgation_layout"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<ImageView
android:id="@+id/navigate"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerInParent="true"
android:background="@mipmap/baseline_directions_black_48"
android:visibility="invisible"/>
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1.2">
<Button
android:id="@+id/chkout"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerInParent="true"
android:layout_marginRight="5dp"
android:background="@mipmap/checkout"
android:focusable="false"
android:visibility="gone"/>
<Button
android:id="@+id/btn_cancel"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerInParent="true"
android:layout_marginRight="5dp"
android:background="@mipmap/cancel_icon"
android:focusable="false"
android:visibility="gone"
/>
</RelativeLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/storeviewlist.xml
-8
View File
@@ -68,14 +68,6 @@
android:focusable="false"
android:visibility="gone" />
<ImageView
android:id="@+id/imageView2"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:layout_alignBottom="@+id/storelistviewxml_storeico"
android:layout_alignParentRight="true"
android:visibility="gone" />
</RelativeLayout>
</android.support.v7.widget.CardView>
GSKMTOrange/src/main/res/menu/sorelist_menu.xml
+11
View File
@@ -0,0 +1,11 @@
<menu 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"
tools:context="cpm.com.gskmtorange.dailyentry.StoreListActivity">
<item
android:id="@+id/iconMap"
android:orderInCategory="100"
android:title="@string/action_settings"
android:icon="@drawable/baseline_map_white_36dp"
app:showAsAction="always" />
</menu>
GSKMTOrange/src/main/res/mipmap-xxhdpi/baseline_directions_black_36dp.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 387 B

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

After

Width:  |  Height:  |  Size: 883 B

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

After

Width:  |  Height:  |  Size: 16 KiB

GSKMTOrange/src/main/res/values-ar/string.xml
+15
View File
@@ -238,4 +238,19 @@
<string name="no_route_plan_for_day">لا يوجد خط سير لليوم</string>
<string name="check_faceup_not_zero">لا يمكن ان يكون عدد أوجه الأصناف صفر علي الرف اذا كانت الأصناف متوفره</string>
<string name="audit">التقارير</string>
<string name="databasexported">تم استخراج قاعدة البيانات ورفعها بنجاح</string>
<string name="pls_answer_all_qns">الرجاء الرد على جميع الأسئلة</string>
<string name="please_add_subgroup_for_empty">الرجاء اضافة مجموعة فرعية لاضافة مساحة</string>
<string name="no_app_found_for_pdf">لا يوجد تطبيق لفتح ملف الPDF</string>
<string name="Download_pdf_Error">لم يتم تحميل الملف</string>
<string name="please_add_subgroup_facing">الرجاء اضافة مجموعة فرعية واحدة على الأقل لكل صف</string>
<string name="sub_category">صنف فرعي</string>
<string name="no_of_rows_on_shelf">عدد الصفوف على الرف</string>
<string name="title_activity_create_self">لا يوجد خيار تصوير</string>
<string name="create_self">انشاء رف</string>
<string name="enter_facing">ادخل عدد الوجوه</string>
<string name="please_facing">ادخل عدد الوجوه</string>
<string name="msg_select_present">Please select present</string>
</resources>
GSKMTOrange/src/main/res/values-tr/string.xml
+14
View File
@@ -275,6 +275,20 @@
<string name="check_faceing">Önyüz miktarı minimum stok miktarından daha fazla veya eşit olamaz</string>
<string name="audit">Kontrol</string>
<string name="databasexported">Veritabanı başarılı bir şekilde aktarıldı ve güncellendi</string>
<string name="pls_answer_all_qns">Lütfen tüm soruları cevaplayınız</string>
<string name="please_add_subgroup_for_empty">Lütfen boş alanlara Alt Grup ekleyiniz</string>
<string name="no_app_found_for_pdf">PDF’i açmak için uygulama bulunamadı</string>
<string name="Download_pdf_Error">Dosya indirilmedi</string>
<string name="please_add_subgroup_facing">Lütfen her satıra en az bir Alt Grup ekleyin</string>
<string name="sub_category">Alt Kategori</string>
<string name="no_of_rows_on_shelf">Raftaki sıra sayısı</string>
<string name="title_activity_create_self">Kamera Seçeneği Yok</string>
<string name="create_self">Raf Yarat</string>
<string name="enter_facing">Ön Yüz Gir</string>
<string name="please_facing">Lütfen ön yüzü doldurun</string>
<string name="msg_select_present">Mevcut olanı seç</string>
<string name="future_route_plan">Rut Planı Arama</string>
</resources>
GSKMTOrange/src/main/res/values/strings.xml
+12 -2
View File
@@ -308,7 +308,7 @@
<string name="msl_availability_new_stock_value">Please first fill the stock value </string>
<string name="check_faceing">Faceup can not be greater than or equal to MBQ value</string>
<string name="title_activity_future_jcp">FutureJ CP</string>
<string name="title_activity_future_jcp">Future JCP</string>
<string name="future_route_plan"> Route Plan Lookup</string>
@@ -325,7 +325,7 @@
<string name="sub_category">Sub Category</string>
<string name="enter_facing">Enter Facing</string>
<string name="please_facing">Please fill Facing</string>
<string name="please_add_subgroup_facing">Please add atleast one Sub Group to every row</string>
<string name="please_add_subgroup_facing">Please add at least one Sub Group to every row</string>
<string name="edit">Edit</string>
<string name="select_option">Select an option</string>
<string name="title_activity_planogram_pdf">Planogram Document</string>
@@ -346,5 +346,15 @@
It should describe the category of notifications that will be sent through this channel
-->
<string name="default_notification_channel_name" translatable="true">News</string>
<string name="pog">POG</string>
<string name="title_activity_pogquestions">POG</string>
<string name="placement">Placement</string>
<string name="vertical">Vertical</string>
<string name="horizontal">Horizontal</string>
<string name="invalid_facing">Invalid facing</string>
<string name="title_activity_store_list_map">Map</string>
<string name="title_activity_store_list_route">Map</string>
<string name="title_activity_store_route">Map</string>
</resources>