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 GG_Update_Manifest

Browse Source 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
This commit is contained in:
Gagan290
2017-01-12 17:04:24 +05:30
parent 11455f7702
commit 1c48f2f8ad
12 changed files with 559 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml
+3 -1
View File
@@ -93,7 +93,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/toggle_selector_background" />
android:background="@drawable/toggle_selector_background"
android:textOff="@string/no"
android:textOn="@string/yes" />
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/item_stock_facing_header.xml
+27 -13
View File
@@ -23,35 +23,48 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingRight="10dp">
android:layout_weight="1.5"
android:orientation="horizontal"
android:paddingTop="5dp"
android:weightSum="2">
<!--android:gravity="center_vertical"-->
<TextView
android:id="@+id/txt_stockFaceupHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="25dp"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1.4"
android:paddingLeft="20dp"
android:paddingRight="5dp"
android:text="Brand Name "
android:text="Brand Name"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
<TextView
android:id="@+id/txt_sosHeader"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".6"
android:paddingRight="5dp"
android:text="@string/stock_facing_sos"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
<!--Camera Images-->
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_weight=".5"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
<!--<ImageView
android:id="@+id/img_reference"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp"
android:src="@mipmap/star" />
android:src="@mipmap/star" />-->
<ImageView
android:id="@+id/img_camera1"
@@ -67,13 +80,14 @@
android:layout_marginRight="10dp" />
<!--android:src="@drawable/ic_menu_camera"-->
<ImageView
<!--<ImageView
android:id="@+id/img_edit"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginRight="20dp"
android:src="@mipmap/no_camera" />
android:src="@mipmap/no_camera" />-->
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/planogram_dialog_layout.xml
+66
View File
@@ -0,0 +1,66 @@
<?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="match_parent"
android:orientation="vertical">
<!-- <android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
card_view:cardCornerRadius="20dp">-->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<!--Title and Image-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#90888888"
android:orientation="vertical">
<TextView
android:id="@+id/tv_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorPrimary"
android:padding="10dp"
android:text="@string/stock_facing_planogram_dialog_title"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/white" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<ImageView
android:id="@+id/img_planogram"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="10dp"
android:src="@drawable/sad_cloud"/>
</LinearLayout>
</LinearLayout>
<!--Cancel Image-->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_margin="5dp"
android:orientation="vertical">
<ImageView
android:id="@+id/img_cancel"
android:layout_width="35dp"
android:layout_height="35dp"
android:src="@mipmap/cancel" />
</LinearLayout>
</FrameLayout>
<!--</android.support.v7.widget.CardView>-->
</LinearLayout>
GSKMTOrange/src/main/res/menu/planogram.xml
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_planogram"
android:icon="@mipmap/star"
android:orderInCategory="100"
android:title="planogram"
app:showAsAction="always" />
</menu>
GSKMTOrange/src/main/res/mipmap-hdpi/cancel.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 995 B

GSKMTOrange/src/main/res/values-tr/string.xml
+5 -1
View File
@@ -71,6 +71,7 @@
<string name="stock_facing_stock">X</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>
<string name="title_activity_promo_compliance">Promosyon</string>
@@ -95,6 +96,9 @@
<string name="category_performance_lsv">Son Ziyaret</string>
<string name="title_activity_store_wise_performance">Mağaza Performansı</string>
<!--Gagan End Code -->
<!--Gagan start new code 2-->
<string name="stock_facing_planogram_dialog_title">Planogram</string>
<!--Gagan end new code 2-->
</resources>
GSKMTOrange/src/main/res/values/strings.xml
+4
View File
@@ -80,6 +80,7 @@
<string name="stock_facing_stock">Stock</string>
<string name="stock_facing_faceup">Facing</string>
<string name="stock_facing_sos_target">SOS Target</string>
<string name="stock_facing_sos">SOS</string>
<!--Gagan end code-->
@@ -147,5 +148,8 @@
<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>
<!--Gagan start new code 2-->
<string name="stock_facing_planogram_dialog_title">Planogram</string>
<!--Gagan end new code 2-->
</resources>